From 31fd08d364e5c6d1a7d27a408cdf3368f63d1424 Mon Sep 17 00:00:00 2001 From: Rob Austein Date: Sat, 14 Jul 2018 18:36:03 -0400 Subject: First attempt at integrating Pavel's fmc_clk (synchronous FMC bus) code. May not work out of the box, but committing this is the easiest way to let multiple people test the same build configuration. --- .gitmodules | 3 +++ source/core/cipher/aes | 2 +- source/core/comm/fmc | 2 +- source/core/platform/alpha | 2 +- source/sw/libhal | 2 +- source/sw/stm32 | 2 +- 6 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index aaab9b4..df422da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,7 @@ [submodule "source/core/comm/fmc"] path = source/core/comm/fmc url = https://git.cryptech.is/core/comm/fmc.git + branch = fmc_clk [submodule "source/core/comm/uart"] path = source/core/comm/uart url = https://git.cryptech.is/core/comm/uart.git @@ -25,6 +26,7 @@ [submodule "source/core/platform/alpha"] path = source/core/platform/alpha url = https://git.cryptech.is/core/platform/alpha.git + branch = fmc_clk [submodule "source/core/rng/avalanche_entropy"] path = source/core/rng/avalanche_entropy url = https://git.cryptech.is/core/rng/avalanche_entropy.git @@ -49,6 +51,7 @@ [submodule "source/sw/stm32"] path = source/sw/stm32 url = https://git.cryptech.is/sw/stm32.git + branch = fmc_clk [submodule "source/sw/thirdparty/libtfm"] path = source/sw/thirdparty/libtfm url = https://git.cryptech.is/sw/thirdparty/libtfm.git diff --git a/source/core/cipher/aes b/source/core/cipher/aes index 2caa4d5..98cc06b 160000 --- a/source/core/cipher/aes +++ b/source/core/cipher/aes @@ -1 +1 @@ -Subproject commit 2caa4d54188338226494daa53d024a52572bd3a4 +Subproject commit 98cc06bdeccbd30da21a0439c1cbbf59f9a75f3e diff --git a/source/core/comm/fmc b/source/core/comm/fmc index 61c16de..ee2f6aa 160000 --- a/source/core/comm/fmc +++ b/source/core/comm/fmc @@ -1 +1 @@ -Subproject commit 61c16de8beb8deaadd2ffedfabfb3ce96e8699f0 +Subproject commit ee2f6aa62c1bee23c61861b59dfde99911d2d566 diff --git a/source/core/platform/alpha b/source/core/platform/alpha index a4e91b6..ff1faf9 160000 --- a/source/core/platform/alpha +++ b/source/core/platform/alpha @@ -1 +1 @@ -Subproject commit a4e91b6221f75045dd1d97362e9d12c590ebc15a +Subproject commit ff1faf971a87362f9e0664dcfcf6bb447b043aeb diff --git a/source/sw/libhal b/source/sw/libhal index 0d17fd9..af18760 160000 --- a/source/sw/libhal +++ b/source/sw/libhal @@ -1 +1 @@ -Subproject commit 0d17fd984e6ed486d6cd622edee226e263aab510 +Subproject commit af18760ea95c1f247cafe54262b79f73e8b904d6 diff --git a/source/sw/stm32 b/source/sw/stm32 index 33ac575..0f8c20f 160000 --- a/source/sw/stm32 +++ b/source/sw/stm32 @@ -1 +1 @@ -Subproject commit 33ac5751d8e56b8cbec0cc5ac41a18f2692e4bf9 +Subproject commit 0f8c20fe0658082c044443d0c8a51b773c457191 -- cgit v1.2.3