add preparation for other boards
authorNIIBE Yutaka <gniibe@fsij.org>
Mon, 25 Nov 2013 08:21:50 +0000 (17:21 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Mon, 25 Nov 2013 08:21:50 +0000 (17:21 +0900)
src/Makefile.in
src/configure
src/main.c
src/stm32f103.h

index 641d3a6..a884f99 100644 (file)
@@ -27,6 +27,7 @@ INCDIR += $(CRYPTINCDIR)
 
 @PINPAD_MAKE_OPTION@
 @DEBUG_MAKE_OPTION@
+@HEXOUTPUT_MAKE_OPTION@
 
 USE_EVENTFLAG = yes
 
index 0e9c47e..b76409d 100755 (executable)
@@ -168,11 +168,13 @@ if test "$with_dfu" = "yes"; then
   ORIGIN=0x08003000
   FLASH_SIZE=`expr $FLASH_SIZE - 12`
   DFU_DEFINE="#define DFU_SUPPORT 1"
+  HEXOUTPUT_MAKE_OPTION="ENABLE_OUTPUT_HEX=yes"
 else
   with_dfu=no
   echo "Configured for bare system (no-DFU)"
   ORIGIN=0x08000000
   DFU_DEFINE="#undef DFU_SUPPORT"
+  HEXOUTPUT_MAKE_OPTION=""
 fi
 
 # --enable-pinpad option
@@ -297,6 +299,7 @@ sed -e "s%@HAVE_SYS_H@%$have_sys_h%" \
     -e "s%@DEBUG_MAKE_OPTION@%$DEBUG_MAKE_OPTION%" \
     -e "s%@PINPAD_MAKE_OPTION@%$PINPAD_MAKE_OPTION%" \
     -e "s%@KEYGEN_SUPPORT@%$KEYGEN_SUPPORT%" \
+    -e "s%@HEXOUTPUT_MAKE_OPTION@%$HEXOUTPUT_MAKE_OPTION%" \
        < Makefile.in > Makefile
 if test "$certdo" = "yes"; then
   sed -e "/^@CERTDO_SUPPORT_START@$/ d" -e "/^@CERTDO_SUPPORT_END@$/ d" \
index 1e9051f..0950f75 100644 (file)
@@ -27,6 +27,7 @@
 #include <eventflag.h>
 
 #include "config.h"
+#include "board.h"
 
 #include "sys.h"
 #include "adc.h"
index d611bd0..069e815 100644 (file)
@@ -632,6 +632,8 @@ static struct EXTI *const EXTI = (struct EXTI *const)EXTI_BASE;
 #define  EXTI_PR_PR18       0x00040000
 #define  EXTI_PR_PR19       0x00080000
 \f
+#define EXTI0_IRQ    6
+#define EXTI1_IRQ    7
 #define EXTI2_IRQ    8
 #define EXTI9_5_IRQ 23
 #define TIM2_IRQ    28