[Cryptech-Commits] [sw/stm32] 04/04: Merge branch 'master' of git.cryptech.is:sw/stm32

[git at cryptech.is]

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

paul at psgd.org pushed a commit to branch master
in repository sw/stm32.

commit ebe70741a4771698423e4c61939e88d6db66460d
Merge: 9bb7988 6265025
Author: Paul Selkirk <paul at psgd.org>
AuthorDate: Tue May 24 18:13:26 2016 -0400

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

 Makefile                                           |   1 +
 .../TARGET_CRYPTECH_ALPHA/stm32f4xx_hal_conf.h     |   2 +-
 .../TARGET_CRYPTECH_ALPHA/stm32f4xx_hal_msp.c      |   9 +
 .../TARGET_STM/TARGET_STM32F4/stm32f4xx_ll_fmc.c   |  98 +++--
 projects/cli-test/Makefile                         |   2 +-
 projects/cli-test/cli-test.c                       |  98 +++--
 projects/cli-test/mgmt-cli.c                       |   4 -
 projects/cli-test/mgmt-cli.h                       |  33 +-
 projects/cli-test/test_sdram.c                     | 274 ++++++++++++++
 stm-fmc.h => projects/cli-test/test_sdram.h        |  25 +-
 stm-fmc.c                                          | 398 ++++++++-------------
 stm-fmc.h                                          |  22 +-
 stm-init.c                                         |  21 --
 stm-init.h                                         |  19 +
 stm-sdram.c                                        | 267 ++++++++++++++
 projects/cli-test/mgmt-cli.h => stm-sdram.h        | 116 +++---
 16 files changed, 982 insertions(+), 407 deletions(-)