[Cryptech-Commits] [sw/stm32] 02/05: 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.

fredrik at thulin.net pushed a commit to branch master
in repository sw/stm32.

commit dcc6cf1b97935bc3a663714f596cacba619a8b3d
Merge: 3ea10bf df9e82b
Author: Fredrik Thulin <fredrik at thulin.net>
AuthorDate: Sat Jul 9 20:26:57 2016 +0200

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

 libraries/libcli/Makefile                          |  12 +-
 libraries/libhal/Makefile                          |  12 +-
 libraries/libhal/tests/Makefile                    |  12 +-
 libraries/libhal/utils/Makefile                    |  12 +-
 libraries/libtfm/Makefile                          |  16 +-
 libraries/libtfm/tomsfastmath/Makefile             |  10 +-
 .../TARGET_STM/TARGET_STM32F4/stm32f4xx_ll_fmc.c   | 101 +++++-----
 projects/hsm/cryptech_miniterm                     |  45 +++++
 projects/hsm/cryptech_probe                        | 145 ++++++++++++++
 projects/hsm/cryptech_upload                       | 213 ++++++++++++++-------
 projects/hsm/hsm.c                                 | 148 +++++++-------
 projects/hsm/mgmt-fpga.c                           |  27 +++
 projects/hsm/mgmt-misc.c                           |  19 --
 stm-fmc.c                                          | 109 +++++------
 stm-uart.c                                         |  15 +-
 stm-uart.h                                         |   2 +
 16 files changed, 585 insertions(+), 313 deletions(-)