Bug fix for configure

This commit is contained in:
NIIBE Yutaka
2010-12-14 17:42:38 +09:00
parent 6a0b6983bd
commit 5b6a20aa9d
2 changed files with 10 additions and 5 deletions

View File

@@ -1,3 +1,7 @@
2010-12-14 NIIBE Yutaka <gniibe@fsij.org>
* src/configure (FLASH_PAGE_SIZE): Always set.
2010-12-13 NIIBE Yutaka <gniibe@fsij.org> 2010-12-13 NIIBE Yutaka <gniibe@fsij.org>
* Version 0.5. * Version 0.5.

11
src/configure vendored
View File

@@ -141,11 +141,6 @@ if test "$with_dfu" = "yes"; then
else else
echo "Configured for bare system (no-DFU)" echo "Configured for bare system (no-DFU)"
ORIGIN=0x08000000 ORIGIN=0x08000000
if test "$target" = "STM32_PRIMER2"; then
FLASH_PAGE_SIZE=2048
else
FLASH_PAGE_SIZE=1024
fi
if test "$target" = "STM8S_DISCOVERY"; then if test "$target" = "STM8S_DISCOVERY"; then
FLASH_SIZE=64k FLASH_SIZE=64k
else else
@@ -154,6 +149,12 @@ else
DFU_DEFINE="#undef DFU_SUPPORT" DFU_DEFINE="#undef DFU_SUPPORT"
fi fi
if test "$target" = "STM32_PRIMER2"; then
FLASH_PAGE_SIZE=2048
else
FLASH_PAGE_SIZE=1024
fi
sed -e "s%@BOARD_MAKEFILE@%$BOARD_MAKEFILE%" \ sed -e "s%@BOARD_MAKEFILE@%$BOARD_MAKEFILE%" \
-e "s%@DEBUG_MAKE_OPTION@%$DEBUG_MAKE_OPTION%" \ -e "s%@DEBUG_MAKE_OPTION@%$DEBUG_MAKE_OPTION%" \
< Makefile.in > Makefile < Makefile.in > Makefile