diff options
| author | Rob Austein <sra@hactrn.net> | 2015-09-22 17:10:36 -0400 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2015-09-22 17:10:36 -0400 |
| commit | e19872e5de60f76639eac6aa3ce42ba17e007f79 (patch) | |
| tree | 1e6faec3e5a94430a1d1ca6e21e386bf70f00034 | |
| parent | e03fb20510467fbe1c94c89b66e747b1b27a8249 (diff) | |
| parent | 653d783e3567187b1d0090e047972e4171da3f68 (diff) | |
Merge branch 'modexps6'
| -rw-r--r-- | .gitmodules | 7 | ||||
| -rw-r--r-- | core/Makefile | 1 | ||||
| m--------- | core/math/modexps6 | 0 | ||||
| m--------- | core/platform/common | 0 | ||||
| m--------- | core/platform/novena | 0 | ||||
| m--------- | sw/libhal | 0 |
6 files changed, 8 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index b22ca9b..7c1a9e1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,7 @@ [submodule "sw/libhal"] path = sw/libhal url = git@git.cryptech.is:sw/libhal.git + branch = modexps6 [submodule "sw/pkcs11"] path = sw/pkcs11 url = git@git.cryptech.is:sw/pkcs11.git @@ -28,9 +29,11 @@ [submodule "core/platform/common"] path = core/platform/common url = git@git.cryptech.is:core/platform/common.git + branch = modexps6 [submodule "core/platform/novena"] path = core/platform/novena url = git@git.cryptech.is:core/platform/novena.git + branch = modexps6 [submodule "core/rng/avalanche_entropy"] path = core/rng/avalanche_entropy url = git@git.cryptech.is:core/rng/avalanche_entropy.git @@ -46,3 +49,7 @@ [submodule "sw/thirdparty/sqlite3"] path = sw/thirdparty/sqlite3 url = git@git.cryptech.is:sw/thirdparty/sqlite3.git +[submodule "core/math/modexps6"] + path = core/math/modexps6 + url = git@git.cryptech.is:core/math/modexps6.git + branch = modexps6 diff --git a/core/Makefile b/core/Makefile index f8c8c5b..55ce0ea 100644 --- a/core/Makefile +++ b/core/Makefile @@ -39,6 +39,7 @@ BUILD_DIR := platform/novena/eim/build all: patch -p1 --forward <patches/01-config-cores.patch + touch platform/novena/common/rtl/ipcore/clkmgr_dcm.v cd ${BUILD_DIR}; $(MAKE) patch -p1 --reverse <patches/01-config-cores.patch diff --git a/core/math/modexps6 b/core/math/modexps6 new file mode 160000 +Subproject 514bb28200a0d71a7a99cbfb017d1ca3d2250fe diff --git a/core/platform/common b/core/platform/common -Subproject f05a3c65ec65004b097cb63d5ac6d463a7a9dc2 +Subproject a8e0651bd3ae3a8e579547753cbb51dc0b87525 diff --git a/core/platform/novena b/core/platform/novena -Subproject 33cc55adaf9ff31473802414f9c0d6e4a553cdd +Subproject f5cfe0b5d45f627877d8829b25f9ff637749cf9 diff --git a/sw/libhal b/sw/libhal -Subproject 53bff0b94832da75e37bea3e94e051f24fdec56 +Subproject 0915302b7ffa0757be1859d73f14037f338c025 |