[Cryptech-Commits] [sw/stm32] 01/03: Merge branch 'master' into ft-ks_flash

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

fredrik at thulin.net pushed a commit to branch ft-ks_flash
in repository sw/stm32.

commit b61dc669d8b01b49b3a5eb5b494d4270bb4c1b0b
Merge: bba436d e961e98
Author: Fredrik Thulin <fredrik at thulin.net>
AuthorDate: Thu Jun 16 16:17:20 2016 +0200

    Merge branch 'master' into ft-ks_flash

 Makefile                                           |  31 ++-
 bin/debug                                          |   6 +-
 bin/flash-target                                   |  14 +-
 bin/reset                                          |   6 +-
 libraries/libcli                                   |   2 +-
 libraries/libhal                                   |   2 +-
 .../TOOLCHAIN_GCC_ARM/STM32F429BI.ld               |  52 ++++-
 .../TOOLCHAIN_GCC_ARM/startup_stm32f429xx.S        |   9 +-
 ...up_stm32f429xx.S => startup_stm32f429xx_rtos.S} |   0
 .../TARGET_CRYPTECH_ALPHA/stm32f4xx_hal_msp.c      |   1 +
 .../TARGET_CRYPTECH_ALPHA/stm32f4xx_it.c           |   6 +-
 .../TARGET_CRYPTECH_ALPHA/stm32f4xx_it_rtos.c      |  17 +-
 libraries/thirdparty/libtfm                        |   2 +-
 projects/bootloader/Makefile                       |   4 +-
 projects/cli-test/Makefile                         |  25 ++-
 projects/cli-test/cli-test.c                       |   1 +
 projects/hsm/Makefile                              |  33 +++-
 projects/hsm/crc32.c                               |  62 ++++++
 projects/hsm/{main.c => hsm.c}                     | 166 +++++++++-------
 projects/hsm/mgmt-cli.c                            | 214 +++++++++++++++++++++
 projects/hsm/mgmt-cli.h                            |  80 ++++++++
 projects/hsm/mgmt-dfu.c                            | 123 ++++++++++++
 stm-init.h => projects/hsm/mgmt-dfu.h              |  45 ++---
 projects/hsm/mgmt-fpga.c                           | 136 +++++++++++++
 stm-init.h => projects/hsm/mgmt-fpga.h             |  43 ++---
 projects/hsm/mgmt-misc.c                           | 138 +++++++++++++
 stm-init.h => projects/hsm/mgmt-misc.h             |  42 ++--
 projects/hsm/mgmt-show.c                           | 133 +++++++++++++
 stm-init.h => projects/hsm/mgmt-show.h             |  42 +---
 projects/rtos-test/Makefile                        |   4 +
 stm-init.c                                         |   4 +-
 stm-init.h                                         |  44 +++--
 stm-sdram.c                                        |  31 ++-
 stm-sdram.h                                        |  17 --
 34 files changed, 1252 insertions(+), 283 deletions(-)

diff --cc Makefile
index 0cf1c4e,1bdb5fa..7c98e2b
--- a/Makefile
+++ b/Makefile
@@@ -128,7 -128,7 +127,7 @@@ $(LIBTFM_DIR)/libtfm.a
  	$(MAKE) -C $(LIBTFM_DIR) PREFIX=$(PREFIX)
  
  $(LIBHAL_DIR)/libhal.a: $(LIBTFM_DIR)/libtfm.a
- 	$(MAKE) -C $(LIBHAL_DIR) IO_BUS=fmc RPC_SERVER=yes RPC_TRANSPORT=serial KS=flash libhal.a
 -	$(MAKE) -C $(LIBHAL_DIR) IO_BUS=fmc RPC_MODE=server RPC_TRANSPORT=serial KS=volatile libhal.a
++	$(MAKE) -C $(LIBHAL_DIR) IO_BUS=fmc RPC_MODE=server RPC_TRANSPORT=serial KS=flash libhal.a
  
  $(LIBCLI_DIR)/libcli.a:
  	$(MAKE) -C $(LIBCLI_DIR)
diff --cc projects/cli-test/cli-test.c
index a387751,7bac84e..10b31a4
--- a/projects/cli-test/cli-test.c
+++ b/projects/cli-test/cli-test.c
@@@ -40,9 -40,9 +40,10 @@@
  #include "mgmt-misc.h"
  #include "mgmt-show.h"
  #include "mgmt-test.h"
 +#include "mgmt-keystore.h"
  
  #include <string.h>
+ #include <strings.h>
  
  
  /* MGMT UART interrupt receive buffer (data will be put in a larger ring buffer) */