Merge pull request #894 from ucb-bar/bumpTutorialSW

Bump tutorial sw
ucb-bar · Jun 12, 2021 · 022e973 · 022e973
2 parents 9b9b890 + 9c80b66
commit 022e973
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.circleci/run-tests.sh b/.circleci/run-tests.sh
@@ -69,7 +69,7 @@ case $1 in
         export LD_LIBRARY_PATH=$LOCAL_ESP_DIR/lib
         export PATH=$RISCV/bin:$PATH
         (cd $LOCAL_CHIPYARD_DIR/generators/sha3/software && ./build.sh)
-        $LOCAL_SIM_DIR/simulator-chipyard-Sha3RocketConfig $LOCAL_CHIPYARD_DIR/generators/sha3/software/benchmarks/bare/sha3-rocc.riscv
+        $LOCAL_SIM_DIR/simulator-chipyard-Sha3RocketConfig $LOCAL_CHIPYARD_DIR/generators/sha3/software/tests/bare/sha3-rocc.riscv
         ;;
     chipyard-streaming-passthrough)
         make -C $LOCAL_CHIPYARD_DIR/tests

diff --git a/generators/sha3 b/generators/sha3
diff --git a/software/firemarshal b/software/firemarshal
+0 −3		.gitmodules
+2 −2		software/build.sh
+0 −1		software/jtr/JohnTheRipper
+0 −29		software/jtr/build.sh
+1 −0		software/jtr/buildroot-config
+1 −0		software/jtr/buildroot-external/Config.in
+1 −0		software/jtr/buildroot-external/external.desc
+1 −0		software/jtr/buildroot-external/external.mk
+8 −0		software/jtr/buildroot-external/package/john/Config.in
+39 −0		software/jtr/buildroot-external/package/john/john.mk
+1 −1		software/marshal-configs/sha3-bare-rocc.yaml
+1 −2		software/marshal-configs/sha3-bare-sw.yaml
+1 −1		software/marshal-configs/sha3-linux-jtr-crack.yaml
+1 −1		software/marshal-configs/sha3-linux-jtr-test.yaml
+0 −7		software/marshal-configs/sha3-linux-jtr.json
+15 −0		software/marshal-configs/sha3-linux-jtr.yaml
+1 −1		software/marshal-configs/sha3-linux-test.yaml
+2 −2		software/marshal-configs/sha3-linux.yaml
+0 −0		software/tests/.gitignore
+0 −0		software/tests/bare/Makefile
+0 −0		software/tests/bare/crt.S
+0 −0		software/tests/bare/link.ld
+0 −0		software/tests/bare/mmio.h
+0 −0		software/tests/bare/syscalls.c
+0 −0		software/tests/bare/util.h
+0 −0		software/tests/common.mk
+0 −0		software/tests/linux/Makefile
+0 −0		software/tests/src/compiler.h
+0 −0		software/tests/src/encoding.h
+0 −0		software/tests/src/rocc.h
+0 −0		software/tests/src/sha3-rocc.c
+0 −0		software/tests/src/sha3-sw.c
+0 −0		software/tests/src/sha3.h
+20 −0		CHANGELOG.md
+10 −1		boards/default/distros/br/br.py
+8 −0		boards/firechip/base-workloads/fedora-base/linux-config
+8 −1		docs/source/distros/Buildroot.rst
+11 −11		scripts/fullTest.py
+8 −1		test/modifyDistro.yaml
+21 −0		test/modifyDistro/README.md
+0 −0		test/modifyDistro/busyboxCfg
+1 −0		test/modifyDistro/busyboxFragment
+9 −0		test/modifyDistro/distroCfg
+6 −1		test/modifyDistro/refOutput/modifyDistro/uartlog
+38 −3		test/modifyDistro/runTest.sh
+40 −0		test/modifyDistro/test.py
+0 −0		test/sameWorkdir/sameDir.yaml
+1 −1		test/testWorkdir/testWorkdir.yaml