aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2018-07-14 18:36:03 -0400
committerRob Austein <sra@hactrn.net>2018-07-14 18:36:03 -0400
commit31fd08d364e5c6d1a7d27a408cdf3368f63d1424 (patch)
treeda697bfe64e387ae5cebdfbdd517336c46e15b4e
parent38b90453bc26e73b827104219f1cfd014ea5f6ca (diff)
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.
-rw-r--r--.gitmodules3
m---------source/core/cipher/aes0
m---------source/core/comm/fmc0
m---------source/core/platform/alpha0
m---------source/sw/libhal0
m---------source/sw/stm320
6 files changed, 3 insertions, 0 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
-Subproject 2caa4d54188338226494daa53d024a52572bd3a
+Subproject 98cc06bdeccbd30da21a0439c1cbbf59f9a75f3
diff --git a/source/core/comm/fmc b/source/core/comm/fmc
-Subproject 61c16de8beb8deaadd2ffedfabfb3ce96e8699f
+Subproject ee2f6aa62c1bee23c61861b59dfde99911d2d56
diff --git a/source/core/platform/alpha b/source/core/platform/alpha
-Subproject a4e91b6221f75045dd1d97362e9d12c590ebc15
+Subproject ff1faf971a87362f9e0664dcfcf6bb447b043ae
diff --git a/source/sw/libhal b/source/sw/libhal
-Subproject 0d17fd984e6ed486d6cd622edee226e263aab51
+Subproject af18760ea95c1f247cafe54262b79f73e8b904d
diff --git a/source/sw/stm32 b/source/sw/stm32
-Subproject 33ac5751d8e56b8cbec0cc5ac41a18f2692e4bf
+Subproject 0f8c20fe0658082c044443d0c8a51b773c45719