diff options
| -rw-r--r-- | .gitmodules | 72 | ||||
| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | core/Makefile (renamed from rtl/Makefile) | 6 | ||||
| m--------- | core/cipher/aes (renamed from rtl/core/cipher/aes) | 0 | ||||
| m--------- | core/cipher/chacha (renamed from rtl/core/cipher/chacha) | 0 | ||||
| m--------- | core/comm/eim (renamed from rtl/core/comm/eim) | 0 | ||||
| -rw-r--r-- | core/debian/compat (renamed from rtl/debian/compat) | 0 | ||||
| -rw-r--r-- | core/debian/control (renamed from rtl/debian/control) | 0 | ||||
| -rw-r--r-- | core/debian/copyright (renamed from rtl/debian/copyright) | 0 | ||||
| -rwxr-xr-x | core/debian/rules (renamed from rtl/debian/rules) | 0 | ||||
| -rw-r--r-- | core/debian/source/format (renamed from rtl/debian/source/format) | 0 | ||||
| m--------- | core/hash/sha1 (renamed from rtl/core/hash/sha1) | 0 | ||||
| m--------- | core/hash/sha256 (renamed from rtl/core/hash/sha256) | 0 | ||||
| m--------- | core/hash/sha512 (renamed from rtl/core/hash/sha512) | 0 | ||||
| m--------- | core/math/modexp (renamed from rtl/core/math/modexp) | 0 | ||||
| -rw-r--r-- | core/patches/01-config-cores.patch (renamed from rtl/patches/01-config-cores.patch) | 0 | ||||
| m--------- | core/platform/common (renamed from rtl/core/platform/common) | 0 | ||||
| m--------- | core/platform/novena (renamed from rtl/core/platform/novena) | 0 | ||||
| m--------- | core/rng/avalanche_entropy (renamed from rtl/core/rng/avalanche_entropy) | 0 | ||||
| m--------- | core/rng/rosc_entropy (renamed from rtl/core/rng/rosc_entropy) | 0 | ||||
| m--------- | core/rng/trng (renamed from rtl/core/rng/trng) | 0 | ||||
| -rw-r--r-- | sw/Makefile | 16 | ||||
| m--------- | sw/libhal (renamed from sw/sw/libhal) | 0 | ||||
| m--------- | sw/libtfm (renamed from sw/sw/libtfm) | 0 | ||||
| m--------- | sw/pkcs11 (renamed from sw/sw/pkcs11) | 0 | ||||
| m--------- | sw/sqlite3 (renamed from sw/sw/sqlite3) | 0 |
26 files changed, 50 insertions, 51 deletions
diff --git a/.gitmodules b/.gitmodules index 8e21521..50e106a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,48 +1,48 @@ -[submodule "sw/sw/libhal"] - path = sw/sw/libhal - url = git@git.cryptech.is:user/sra/libhal -[submodule "sw/sw/libtfm"] - path = sw/sw/libtfm - url = git@git.cryptech.is:user/sra/libtfm -[submodule "sw/sw/pkcs11"] - path = sw/sw/pkcs11 - url = git@git.cryptech.is:user/sra/pkcs11 -[submodule "sw/sw/sqlite3"] - path = sw/sw/sqlite3 - url = git@git.cryptech.is:user/sra/sqlite3 -[submodule "rtl/core/cipher/aes"] - path = rtl/core/cipher/aes +[submodule "sw/libhal"] + path = sw/libhal + url = git@git.cryptech.is:user/sra/libhal.git +[submodule "sw/libtfm"] + path = sw/libtfm + url = git@git.cryptech.is:user/sra/libtfm.git +[submodule "sw/pkcs11"] + path = sw/pkcs11 + url = git@git.cryptech.is:user/sra/pkcs11.git +[submodule "sw/sqlite3"] + path = sw/sqlite3 + url = git@git.cryptech.is:user/sra/sqlite3.git +[submodule "core/cipher/aes"] + path = core/cipher/aes url = git@git.cryptech.is:core/cipher/aes.git -[submodule "rtl/core/cipher/chacha"] - path = rtl/core/cipher/chacha +[submodule "core/cipher/chacha"] + path = core/cipher/chacha url = git@git.cryptech.is:core/cipher/chacha.git -[submodule "rtl/core/comm/eim"] - path = rtl/core/comm/eim +[submodule "core/comm/eim"] + path = core/comm/eim url = git@git.cryptech.is:core/comm/eim.git -[submodule "rtl/core/hash/sha1"] - path = rtl/core/hash/sha1 +[submodule "core/hash/sha1"] + path = core/hash/sha1 url = git@git.cryptech.is:core/hash/sha1.git -[submodule "rtl/core/hash/sha256"] - path = rtl/core/hash/sha256 +[submodule "core/hash/sha256"] + path = core/hash/sha256 url = git@git.cryptech.is:core/hash/sha256.git -[submodule "rtl/core/hash/sha512"] - path = rtl/core/hash/sha512 +[submodule "core/hash/sha512"] + path = core/hash/sha512 url = git@git.cryptech.is:core/hash/sha512.git -[submodule "rtl/core/math/modexp"] - path = rtl/core/math/modexp +[submodule "core/math/modexp"] + path = core/math/modexp url = git@git.cryptech.is:core/math/modexp.git -[submodule "rtl/core/platform/common"] - path = rtl/core/platform/common +[submodule "core/platform/common"] + path = core/platform/common url = git@git.cryptech.is:core/platform/common.git -[submodule "rtl/core/platform/novena"] - path = rtl/core/platform/novena +[submodule "core/platform/novena"] + path = core/platform/novena url = git@git.cryptech.is:core/platform/novena.git -[submodule "rtl/core/rng/avalanche_entropy"] - path = rtl/core/rng/avalanche_entropy +[submodule "core/rng/avalanche_entropy"] + path = core/rng/avalanche_entropy url = git@git.cryptech.is:core/rng/avalanche_entropy.git -[submodule "rtl/core/rng/rosc_entropy"] - path = rtl/core/rng/rosc_entropy +[submodule "core/rng/rosc_entropy"] + path = core/rng/rosc_entropy url = git@git.cryptech.is:core/rng/rosc_entropy.git -[submodule "rtl/core/rng/trng"] - path = rtl/core/rng/trng +[submodule "core/rng/trng"] + path = core/rng/trng url = git@git.cryptech.is:core/rng/trng.git @@ -87,13 +87,12 @@ sw: cd sw; debuild -b -uc -us -aarmhf rtl: - cd rtl; $(call DCH,rtl,RTL bitstream) - cd rtl; debuild -S -uc -us - cd rtl; debuild -b -uc -us -aarmhf + cd core; $(call DCH,rtl,RTL bitstream) + cd core; debuild -S -uc -us + cd core; debuild -b -uc -us -aarmhf reprepro: ${REPOSITORY}/conf/distributions ${REPOSITORY}/conf/options for f in *.changes; do reprepro -b ${REPOSITORY} --ignore=wrongdistribution include ${CODENAME} $$f; done - for f in *.dsc; do reprepro -b ${REPOSITORY} --ignore=wrongdistribution includedsc ${CODENAME} $$f; done ${REPOSITORY}/conf/distributions ${REPOSITORY}/conf/options: install -D reprepro-conf/$(notdir $@) ${REPOSITORY}/conf/$(notdir $@) diff --git a/rtl/Makefile b/core/Makefile index bc7c9f4..9dadbcd 100644 --- a/rtl/Makefile +++ b/core/Makefile @@ -31,16 +31,16 @@ # Directory where we run Verilog synthesis -BUILD_DIR := core/platform/novena/eim/build +BUILD_DIR := platform/novena/eim/build # This business of patching files that are under revision control # because we can't be bothered to generate a proper configuration file # is kind of nasty. all: - patch -p0 --forward <patches/01-config-cores.patch + patch -p1 --forward <patches/01-config-cores.patch cd ${BUILD_DIR}; $(MAKE) - patch -p0 --reverse <patches/01-config-cores.patch + patch -p1 --reverse <patches/01-config-cores.patch clean: cd ${BUILD_DIR}; $(MAKE) clean diff --git a/rtl/core/cipher/aes b/core/cipher/aes -Subproject fc8c9324320af3fc258df33f176583506ea5de3 +Subproject fc8c9324320af3fc258df33f176583506ea5de3 diff --git a/rtl/core/cipher/chacha b/core/cipher/chacha -Subproject 549b75a635817ce263c368c9b8b5b0b07f90ec2 +Subproject 549b75a635817ce263c368c9b8b5b0b07f90ec2 diff --git a/rtl/core/comm/eim b/core/comm/eim -Subproject 9ed8ee7596023a6f4e43d8468bbdd0473c6570e +Subproject 9ed8ee7596023a6f4e43d8468bbdd0473c6570e diff --git a/rtl/debian/compat b/core/debian/compat index ec63514..ec63514 100644 --- a/rtl/debian/compat +++ b/core/debian/compat diff --git a/rtl/debian/control b/core/debian/control index 84a4e91..84a4e91 100644 --- a/rtl/debian/control +++ b/core/debian/control diff --git a/rtl/debian/copyright b/core/debian/copyright index fd7518e..fd7518e 100644 --- a/rtl/debian/copyright +++ b/core/debian/copyright diff --git a/rtl/debian/rules b/core/debian/rules index 2d33f6a..2d33f6a 100755 --- a/rtl/debian/rules +++ b/core/debian/rules diff --git a/rtl/debian/source/format b/core/debian/source/format index 89ae9db..89ae9db 100644 --- a/rtl/debian/source/format +++ b/core/debian/source/format diff --git a/rtl/core/hash/sha1 b/core/hash/sha1 -Subproject febb27562431216a080cb980fdcda09454e72c3 +Subproject febb27562431216a080cb980fdcda09454e72c3 diff --git a/rtl/core/hash/sha256 b/core/hash/sha256 -Subproject ce56b11187b92572193fa9327841ad2ef2e792f +Subproject ce56b11187b92572193fa9327841ad2ef2e792f diff --git a/rtl/core/hash/sha512 b/core/hash/sha512 -Subproject 51ad57c37bb4a0f59e4af4ee069ac18f8fb9284 +Subproject 51ad57c37bb4a0f59e4af4ee069ac18f8fb9284 diff --git a/rtl/core/math/modexp b/core/math/modexp -Subproject e61c65059054df407206e58b88a1b203f5ad3c3 +Subproject e61c65059054df407206e58b88a1b203f5ad3c3 diff --git a/rtl/patches/01-config-cores.patch b/core/patches/01-config-cores.patch index 245e8a3..245e8a3 100644 --- a/rtl/patches/01-config-cores.patch +++ b/core/patches/01-config-cores.patch diff --git a/rtl/core/platform/common b/core/platform/common -Subproject f05a3c65ec65004b097cb63d5ac6d463a7a9dc2 +Subproject f05a3c65ec65004b097cb63d5ac6d463a7a9dc2 diff --git a/rtl/core/platform/novena b/core/platform/novena -Subproject 33cc55adaf9ff31473802414f9c0d6e4a553cdd +Subproject 33cc55adaf9ff31473802414f9c0d6e4a553cdd diff --git a/rtl/core/rng/avalanche_entropy b/core/rng/avalanche_entropy -Subproject 4a0c59617c582ef3f0e558067f913309db772f7 +Subproject 4a0c59617c582ef3f0e558067f913309db772f7 diff --git a/rtl/core/rng/rosc_entropy b/core/rng/rosc_entropy -Subproject 4c3b76c5b8d2809b236d2396ed6a8b36be4587e +Subproject 4c3b76c5b8d2809b236d2396ed6a8b36be4587e diff --git a/rtl/core/rng/trng b/core/rng/trng -Subproject d5974ed0d389f8953b23d98bb69b1576adad27b +Subproject d5974ed0d389f8953b23d98bb69b1576adad27b diff --git a/sw/Makefile b/sw/Makefile index 9dd7dc9..17a7d9b 100644 --- a/sw/Makefile +++ b/sw/Makefile @@ -39,16 +39,16 @@ export OBJCOPY := arm-linux-gnueabihf-objcopy # Using autoconf was probably a mistake, but hack around it for now. all: - cd sw/libtfm; ${MAKE} - cd sw/libhal; ./configure CFLAGS='-g3 -Wall -fPIC -std=c99 -I$${TFMDIR}' LDFLAGS='-g3 -L$${TFMDIR} -ltfm' - cd sw/libhal; ${MAKE} - cd sw/sqlite3; ${MAKE} CROSS_COMPILE=arm-unknown-linux-gnueabi - cd sw/pkcs11; ${MAKE} + cd libtfm; ${MAKE} + cd libhal; ./configure CFLAGS='-g3 -Wall -fPIC -std=c99 -I$${TFMDIR}' LDFLAGS='-g3 -L$${TFMDIR} -ltfm' + cd libhal; ${MAKE} + cd sqlite3; ${MAKE} CROSS_COMPILE=arm-unknown-linux-gnueabi + cd pkcs11; ${MAKE} clean distclean: - for d in libtfm libhal sqlite3 pkcs11; do (cd sw/$$d && ${MAKE} $@); done + for d in libtfm libhal sqlite3 pkcs11; do (cd $$d && ${MAKE} $@); done install: all - install -D sw/pkcs11/libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so - install -D sw/pkcs11/p11util ${DESTDIR}/usr/sbin/p11util + install -D pkcs11/libpkcs11.so ${DESTDIR}/usr/lib/libpkcs11.so + install -D pkcs11/p11util ${DESTDIR}/usr/sbin/p11util diff --git a/sw/sw/libhal b/sw/libhal -Subproject e80f25d31235628f2d9cfb410d48bcc83b4487d +Subproject e80f25d31235628f2d9cfb410d48bcc83b4487d diff --git a/sw/sw/libtfm b/sw/libtfm -Subproject 108e78987bc39f11d0abbba7dbfe80704cbf028 +Subproject 108e78987bc39f11d0abbba7dbfe80704cbf028 diff --git a/sw/sw/pkcs11 b/sw/pkcs11 -Subproject 5f0d1c2ecfde778a164dd4cfc362f7bd29ebe24 +Subproject 5f0d1c2ecfde778a164dd4cfc362f7bd29ebe24 diff --git a/sw/sw/sqlite3 b/sw/sqlite3 -Subproject 7bdeab315c5fdaf6d1b087423b98e80e80fefec +Subproject 7bdeab315c5fdaf6d1b087423b98e80e80fefec |