Merge branch 'master' of git.cryptech.is.:sw/stm32

5 files changed, 6 insertions, 382 deletions

diff --git a/Makefile b/Makefile
index 5166b08..57ed42c 100644
--- a/Makefile
+++ b/Makefile
@@ -100,7 +100,7 @@ export CFLAGS
 all: board-test cli-test libhal-test hsm
 
 init:
-	git submodule update --init --recursive
+	git submodule update --init --recursive --remote
 
 $(MBED_DIR)/libstmf4.a:
 	$(MAKE) -C $(MBED_DIR)
@@ -108,7 +108,7 @@ $(MBED_DIR)/libstmf4.a:
 board-test: $(BOARD_OBJS) $(LIBS)
 	$(MAKE) -C projects/board-test
 
-cli-test: $(BOARD_OBJS) $(LIBS)
+cli-test: $(BOARD_OBJS) $(LIBS) $(LIBCLI_DIR)/libcli.a
 	$(MAKE) -C projects/cli-test
 
 $(RTOS_DIR)/librtos.a:
@@ -133,9 +133,6 @@ libhal-test: $(BOARD_OBJS) $(LIBS) $(LIBHAL_DIR)/libhal.a
 hsm: $(BOARD_OBJS) $(LIBS) $(LIBHAL_DIR)/libhal.a
 	$(MAKE) -C projects/hsm
 
-cli-test: $(BOARD_OBJS) $(LIBS) $(LIBCLI_DIR)/libcli.a
-	$(MAKE) -C projects/cli-test
-
 # don't automatically delete objects, to avoid a lot of unnecessary rebuilding
 .SECONDARY: $(BOARD_OBJS)
 
@@ -144,6 +141,7 @@ cli-test: $(BOARD_OBJS) $(LIBS) $(LIBCLI_DIR)/libcli.a
 clean:
 	rm -f $(BOARD_OBJS)
 	$(MAKE) -C projects/board-test clean
+	$(MAKE) -C projects/cli-test clean
 	$(MAKE) -C projects/rtos-test clean
 	$(MAKE) -C projects/libhal-test clean
 	$(MAKE) -C projects/hsm clean
diff --git a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_CRYPTECH_ALPHA/TOOLCHAIN_GCC_ARM/stm32f429bitx.ld b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_CRYPTECH_ALPHA/TOOLCHAIN_GCC_ARM/stm32f429bitx.ld
deleted file mode 100644
index 845bb6a..0000000
--- a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_CRYPTECH_ALPHA/TOOLCHAIN_GCC_ARM/stm32f429bitx.ld
+++ /dev/null
@@ -1,186 +0,0 @@
-/*

-*****************************************************************************

-**

-**  File        : stm32_flash.ld

-**

-**  Abstract    : Linker script for STM32F429BI Device with

-**                2048KByte FLASH, 192KByte RAM

-**

-**                Set heap size, stack size and stack location according

-**                to application requirements.

-**

-**                Set memory bank area and size if external memory is used.

-**

-**  Target      : STMicroelectronics STM32

-**

-**  Environment : Atollic TrueSTUDIO(R)

-**

-**  Distribution: The file is distributed “as is,” without any warranty

-**                of any kind.

-**

-**  (c)Copyright Atollic AB.

-**  You may use this file as-is or modify it according to the needs of your

-**  project. This file may only be built (assembled or compiled and linked)

-**  using the Atollic TrueSTUDIO(R) product. The use of this file together

-**  with other tools than Atollic TrueSTUDIO(R) is not permitted.

-**

-*****************************************************************************

-*/

-

-/* Entry Point */

-ENTRY(Reset_Handler)

-

-/* Highest address of the user mode stack */

-_estack = 0x2002FFFF;    /* end of RAM */

-

-/* Generate a link error if heap and stack don't fit into RAM */

-_Min_Heap_Size = 0;      /* required amount of heap  */

-_Min_Stack_Size = 0x400; /* required amount of stack */

-

-/* Specify the memory areas */

-MEMORY

-{

- FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K

-CCMRAM (rw)      : ORIGIN = 0x10000000, LENGTH = 64K

-  RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 192K

-}

-

-/* Define output sections */

-SECTIONS

-{

-  /* The startup code goes first into FLASH */

-  .isr_vector :

-  {

-    . = ALIGN(4);

-    KEEP(*(.isr_vector)) /* Startup code */

-    . = ALIGN(4);

-  } >FLASH

-

-  /* The program code and other data goes into FLASH */

-  .text :

-  {

-    . = ALIGN(4);

-    *(.text)           /* .text sections (code) */

-    *(.text*)          /* .text* sections (code) */

-    *(.glue_7)         /* glue arm to thumb code */

-    *(.glue_7t)        /* glue thumb to arm code */

-    *(.eh_frame)

-

-    KEEP (*(.init))

-    KEEP (*(.fini))

-

-    . = ALIGN(4);

-    _etext = .;        /* define a global symbols at end of code */

-  } >FLASH

-

-  /* Constant data goes into FLASH */

-  .rodata :

-  {

-    . = ALIGN(4);

-    *(.rodata)         /* .rodata sections (constants, strings, etc.) */

-    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */

-    . = ALIGN(4);

-  } >FLASH

-

-  .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH

-  .ARM : {

-    __exidx_start = .;

-    *(.ARM.exidx*)

-    __exidx_end = .;

-  } >FLASH

-

-  .preinit_array     :

-  {

-    PROVIDE_HIDDEN (__preinit_array_start = .);

-    KEEP (*(.preinit_array*))

-    PROVIDE_HIDDEN (__preinit_array_end = .);

-  } >FLASH

-  .init_array :

-  {

-    PROVIDE_HIDDEN (__init_array_start = .);

-    KEEP (*(SORT(.init_array.*)))

-    KEEP (*(.init_array*))

-    PROVIDE_HIDDEN (__init_array_end = .);

-  } >FLASH

-  .fini_array :

-  {

-    PROVIDE_HIDDEN (__fini_array_start = .);

-    KEEP (*(SORT(.fini_array.*)))

-    KEEP (*(.fini_array*))

-    PROVIDE_HIDDEN (__fini_array_end = .);

-  } >FLASH

-

-  /* used by the startup to initialize data */

-  _sidata = LOADADDR(.data);

-

-  /* Initialized data sections goes into RAM, load LMA copy after code */

-  .data : 

-  {

-    . = ALIGN(4);

-    _sdata = .;        /* create a global symbol at data start */

-    *(.data)           /* .data sections */

-    *(.data*)          /* .data* sections */

-

-    . = ALIGN(4);

-    _edata = .;        /* define a global symbol at data end */

-  } >RAM AT> FLASH

-

-  _siccmram = LOADADDR(.ccmram);

-

-  /* CCM-RAM section 

-  * 

-  * IMPORTANT NOTE! 

-  * If initialized variables will be placed in this section, 

-  * the startup code needs to be modified to copy the init-values.  

-  */

-  .ccmram :

-  {

-    . = ALIGN(4);

-    _sccmram = .;       /* create a global symbol at ccmram start */

-    *(.ccmram)

-    *(.ccmram*)

-    

-    . = ALIGN(4);

-    _eccmram = .;       /* create a global symbol at ccmram end */

-  } >CCMRAM AT> FLASH

-

-  

-  /* Uninitialized data section */

-  . = ALIGN(4);

-  .bss :

-  {

-    /* This is used by the startup in order to initialize the .bss secion */

-    _sbss = .;         /* define a global symbol at bss start */

-    __bss_start__ = _sbss;

-    *(.bss)

-    *(.bss*)

-    *(COMMON)

-

-    . = ALIGN(4);

-    _ebss = .;         /* define a global symbol at bss end */

-    __bss_end__ = _ebss;

-  } >RAM

-

-  /* User_heap_stack section, used to check that there is enough RAM left */

-  ._user_heap_stack :

-  {

-    . = ALIGN(4);

-    PROVIDE ( end = . );

-    PROVIDE ( _end = . );

-    . = . + _Min_Heap_Size;

-    . = . + _Min_Stack_Size;

-    . = ALIGN(4);

-  } >RAM

-

-  

-

-  /* Remove information from the standard libraries */

-  /DISCARD/ :

-  {

-    libc.a ( * )

-    libm.a ( * )

-    libgcc.a ( * )

-  }

-

-  .ARM.attributes 0 : { *(.ARM.attributes) }

-}

diff --git a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_CRYPTECH_DEV_BRIDGE/TOOLCHAIN_GCC_ARM/stm32f429bitx.ld b/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_CRYPTECH_DEV_BRIDGE/TOOLCHAIN_GCC_ARM/stm32f429bitx.ld
deleted file mode 100644
index 845bb6a..0000000
--- a/libraries/mbed/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_CRYPTECH_DEV_BRIDGE/TOOLCHAIN_GCC_ARM/stm32f429bitx.ld
+++ /dev/null
@@ -1,186 +0,0 @@
-/*

-*****************************************************************************

-**

-**  File        : stm32_flash.ld

-**

-**  Abstract    : Linker script for STM32F429BI Device with

-**                2048KByte FLASH, 192KByte RAM

-**

-**                Set heap size, stack size and stack location according

-**                to application requirements.

-**

-**                Set memory bank area and size if external memory is used.

-**

-**  Target      : STMicroelectronics STM32

-**

-**  Environment : Atollic TrueSTUDIO(R)

-**

-**  Distribution: The file is distributed “as is,” without any warranty

-**                of any kind.

-**

-**  (c)Copyright Atollic AB.

-**  You may use this file as-is or modify it according to the needs of your

-**  project. This file may only be built (assembled or compiled and linked)

-**  using the Atollic TrueSTUDIO(R) product. The use of this file together

-**  with other tools than Atollic TrueSTUDIO(R) is not permitted.

-**

-*****************************************************************************

-*/

-

-/* Entry Point */

-ENTRY(Reset_Handler)

-

-/* Highest address of the user mode stack */

-_estack = 0x2002FFFF;    /* end of RAM */

-

-/* Generate a link error if heap and stack don't fit into RAM */

-_Min_Heap_Size = 0;      /* required amount of heap  */

-_Min_Stack_Size = 0x400; /* required amount of stack */

-

-/* Specify the memory areas */

-MEMORY

-{

- FLASH (rx)      : ORIGIN = 0x08000000, LENGTH = 2048K

-CCMRAM (rw)      : ORIGIN = 0x10000000, LENGTH = 64K

-  RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 192K

-}

-

-/* Define output sections */

-SECTIONS

-{

-  /* The startup code goes first into FLASH */

-  .isr_vector :

-  {

-    . = ALIGN(4);

-    KEEP(*(.isr_vector)) /* Startup code */

-    . = ALIGN(4);

-  } >FLASH

-

-  /* The program code and other data goes into FLASH */

-  .text :

-  {

-    . = ALIGN(4);

-    *(.text)           /* .text sections (code) */

-    *(.text*)          /* .text* sections (code) */

-    *(.glue_7)         /* glue arm to thumb code */

-    *(.glue_7t)        /* glue thumb to arm code */

-    *(.eh_frame)

-

-    KEEP (*(.init))

-    KEEP (*(.fini))

-

-    . = ALIGN(4);

-    _etext = .;        /* define a global symbols at end of code */

-  } >FLASH

-

-  /* Constant data goes into FLASH */

-  .rodata :

-  {

-    . = ALIGN(4);

-    *(.rodata)         /* .rodata sections (constants, strings, etc.) */

-    *(.rodata*)        /* .rodata* sections (constants, strings, etc.) */

-    . = ALIGN(4);

-  } >FLASH

-

-  .ARM.extab   : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH

-  .ARM : {

-    __exidx_start = .;

-    *(.ARM.exidx*)

-    __exidx_end = .;

-  } >FLASH

-

-  .preinit_array     :

-  {

-    PROVIDE_HIDDEN (__preinit_array_start = .);

-    KEEP (*(.preinit_array*))

-    PROVIDE_HIDDEN (__preinit_array_end = .);

-  } >FLASH

-  .init_array :

-  {

-    PROVIDE_HIDDEN (__init_array_start = .);

-    KEEP (*(SORT(.init_array.*)))

-    KEEP (*(.init_array*))

-    PROVIDE_HIDDEN (__init_array_end = .);

-  } >FLASH

-  .fini_array :

-  {

-    PROVIDE_HIDDEN (__fini_array_start = .);

-    KEEP (*(SORT(.fini_array.*)))

-    KEEP (*(.fini_array*))

-    PROVIDE_HIDDEN (__fini_array_end = .);

-  } >FLASH

-

-  /* used by the startup to initialize data */

-  _sidata = LOADADDR(.data);

-

-  /* Initialized data sections goes into RAM, load LMA copy after code */

-  .data : 

-  {

-    . = ALIGN(4);

-    _sdata = .;        /* create a global symbol at data start */

-    *(.data)           /* .data sections */

-    *(.data*)          /* .data* sections */

-

-    . = ALIGN(4);

-    _edata = .;        /* define a global symbol at data end */

-  } >RAM AT> FLASH

-

-  _siccmram = LOADADDR(.ccmram);

-

-  /* CCM-RAM section 

-  * 

-  * IMPORTANT NOTE! 

-  * If initialized variables will be placed in this section, 

-  * the startup code needs to be modified to copy the init-values.  

-  */

-  .ccmram :

-  {

-    . = ALIGN(4);

-    _sccmram = .;       /* create a global symbol at ccmram start */

-    *(.ccmram)

-    *(.ccmram*)

-    

-    . = ALIGN(4);

-    _eccmram = .;       /* create a global symbol at ccmram end */

-  } >CCMRAM AT> FLASH

-

-  

-  /* Uninitialized data section */

-  . = ALIGN(4);

-  .bss :

-  {

-    /* This is used by the startup in order to initialize the .bss secion */

-    _sbss = .;         /* define a global symbol at bss start */

-    __bss_start__ = _sbss;

-    *(.bss)

-    *(.bss*)

-    *(COMMON)

-

-    . = ALIGN(4);

-    _ebss = .;         /* define a global symbol at bss end */

-    __bss_end__ = _ebss;

-  } >RAM

-

-  /* User_heap_stack section, used to check that there is enough RAM left */

-  ._user_heap_stack :

-  {

-    . = ALIGN(4);

-    PROVIDE ( end = . );

-    PROVIDE ( _end = . );

-    . = . + _Min_Heap_Size;

-    . = . + _Min_Stack_Size;

-    . = ALIGN(4);

-  } >RAM

-

-  

-

-  /* Remove information from the standard libraries */

-  /DISCARD/ :

-  {

-    libc.a ( * )

-    libm.a ( * )

-    libgcc.a ( * )

-  }

-

-  .ARM.attributes 0 : { *(.ARM.attributes) }

-}

diff --git a/projects/libhal-test/Makefile b/projects/libhal-test/Makefile
index b0def35..a380297 100644
--- a/projects/libhal-test/Makefile
+++ b/projects/libhal-test/Makefile
@@ -1,4 +1,4 @@
-TEST = cores test-bus test-trng test-hash test-aes-key-wrap test-pbkdf2 test-ecdsa test-rsa
+TEST = cores test-bus test-trng test-hash test-aes-key-wrap test-pbkdf2 test-ecdsa test-rsa test-mkmif
 #TEST += test-rpc_hash test-rpc_pkey test-rpc_get_version test-rpc_get_random
 TEST += test-rpc_server
 
@@ -16,9 +16,7 @@ vpath %.c $(LIBHAL_DIR)/tests $(LIBHAL_DIR)/utils
 
 %.elf: %.mo main.o $(BOARD_OBJS) $(LIBC_OBJS) $(LIBS)
 	$(CC) $(CFLAGS) $^ -o $*.elf -T$(LDSCRIPT) -g -Wl,-Map=$*.map
-	$(OBJCOPY) -O ihex $*.elf $*.hex
 	$(OBJCOPY) -O binary $*.elf $*.bin
-	$(OBJDUMP) -St $*.elf >$*.lst
 	$(SIZE) $*.elf
 
 # don't automatically delete objects, to avoid a lot of unnecessary rebuilding
@@ -27,7 +25,5 @@ vpath %.c $(LIBHAL_DIR)/tests $(LIBHAL_DIR)/utils
 clean:
 	rm -f *.o *.mo
 	rm -f *.elf
-	rm -f *.hex
 	rm -f *.bin
 	rm -f *.map
-	rm -f *.lst
diff --git a/stm-fmc.h b/stm-fmc.h
index 1e6a670..8c37bd7 100644
--- a/stm-fmc.h
+++ b/stm-fmc.h
@@ -35,6 +35,8 @@
 #ifndef __STM_FMC_H
 #define __STM_FMC_H
 
+#include "stm32f4xx_hal.h"
+
 #define FMC_FPGA_BASE_ADDR              0x60000000
 #define FMC_FPGA_ADDR_MASK              0x03FFFFFC  // there are 26 physical lines, but "only" 24 usable for now
 #define FMC_FPGA_NWAIT_MAX_POLL_TICKS   10