src/config.mk generation.

ChangeLog

@@ -1,3 +1,12 @@
+2017-08-11  NIIBE Yutaka  <gniibe@fsij.org>
+
+	* src/configure: Define STM32F103_OVERRIDE_FLASH_SIZE_KB for
+	BULE_PILL.
+
+	* src/configure: Let generate src/config.mk.
+	* src/Makefile: Rename from src/Makefile.in.
+	* regnual/Makefile: Use src/config.mk.
+
 2017-08-03  NIIBE Yutaka  <gniibe@fsij.org>
 
 	* src/openpgp.c (cmd_terminate_df): Fix for admin-less mode.

regnual/Makefile

@@ -5,6 +5,8 @@ PROJECT = regnual
 OBJS = regnual.o usb-stm32f103.o reset.o
 LDSCRIPT= regnual.ld
 
+include ../src/config.mk
+
 ###################################
 MCU  = cortex-m3
 
@@ -19,7 +21,7 @@ TOPT = -mthumb -DTHUMB -mno-thumb-interwork
 # Define C warning options here
 CWARN = -Wall -Wextra -Wstrict-prototypes
 MCFLAGS= -mcpu=$(MCU)
-DEFS = -DFREE_STANDING
+DEFS += -DFREE_STANDING
 
 CFLAGS = -O2 -g
 CFLAGS += -Wa,-alms=$(notdir $(<:.c=.lst)) -fpie

src/Makefile

@@ -27,9 +27,7 @@ CRYPTSRC = $(CRYPTSRCDIR)/bignum.c $(CRYPTSRCDIR)/rsa.c $(CRYPTSRCDIR)/aes.c
 CSRC += $(CRYPTSRC)
 INCDIR += $(CRYPTINCDIR)
 
-@PINPAD_MAKE_OPTION@
-@DEBUG_MAKE_OPTION@
-@HEXOUTPUT_MAKE_OPTION@
+include config.mk
 
 USE_EVENTFLAG = yes
 
@@ -58,8 +56,6 @@ OBJCOPY   = $(CROSS)objcopy
 
 MCU   = cortex-m3
 CWARN = -Wall -Wextra -Wstrict-prototypes
-# DEFS: Add  
-DEFS  = @USE_SYS3@
 OPT   = -O3 -Os -g
 LIBS  =
 
@@ -75,5 +71,5 @@ sys.c: board.h
 build/bignum.o: OPT = -O3 -g
 
 distclean: clean
-	-rm -f gnuk.ld config.h board.h Makefile \
+	-rm -f gnuk.ld config.h board.h config.mk \
 	       usb-strings.c.inc usb-vid-pid-ver.c.inc

src/configure

@@ -43,6 +43,7 @@ pinpad=no
 certdo=no
 hid_card_change=no
 factory_reset=no
+flash_override=""
 
 # Revision number
 if test -e ../.git; then
@@ -165,6 +166,8 @@ MEMORY_SIZE=20
 
 # Settings for TARGET
 case $target in
+BLUE_PILL)
+  flash_override="-DSTM32F103_OVERRIDE_FLASH_SIZE_KB" ;;
 CQ_STARM|STBEE_MINI)
   if test "$with_dfu" = "default"; then
     with_dfu=yes;
@@ -365,11 +368,12 @@ else
 fi
 
 
-sed -e "s%@USE_SYS3@%$use_sys3%" \
-    -e "s%@DEBUG_MAKE_OPTION@%$DEBUG_MAKE_OPTION%" \
-    -e "s%@PINPAD_MAKE_OPTION@%$PINPAD_MAKE_OPTION%" \
-    -e "s%@HEXOUTPUT_MAKE_OPTION@%$HEXOUTPUT_MAKE_OPTION%" \
-	< Makefile.in > Makefile
+echo -e "DEFS=$use_sys3 $flash_override" '\n'      \
+     "$DEBUG_MAKE_OPTION" '\n'  \
+     "$PINPAD_MAKE_OPTION" '\n' \
+     "$HEXOUTPUT_MAKE_OPTION"   \
+	> config.mk
+
 if test "$certdo" = "yes"; then
   sed -e "/^@CERTDO_SUPPORT_START@$/ d" -e "/^@CERTDO_SUPPORT_END@$/ d" \
       -e "s/@ORIGIN@/$ORIGIN/" -e "s/@FLASH_SIZE@/$FLASH_SIZE/" \