From 9de5348c82a7a0756e1fb1f27779de4c4a921c2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Artur=20N=C3=B3brega?= Date: Tue, 23 Jan 2024 01:01:57 +0000 Subject: [PATCH 1/6] chore(IOBSOC): Update IOBSOC submodule and IS_FPGA accordingly --- software/sw_build.mk | 6 +++--- submodules/IOBSOC | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/software/sw_build.mk b/software/sw_build.mk index 28f5191a..26f6f8c1 100644 --- a/software/sw_build.mk +++ b/software/sw_build.mk @@ -46,12 +46,12 @@ iob_soc_opencryptolinux_firmware.bin: ../../software/iob_soc_opencryptolinux_fir Image rootfs.cpio.gz: cp $(OS_DIR)/$@ . -ifeq ($(IS_FPGA),1) fw_jump.bin iob_soc.dtb: - cp $(FPGA_TOOL)/$(BOARD)/$@ . + if [ "$(FPGA_TOOL)" != "" ]; then\ + cp $(FPGA_TOOL)/$(BOARD)/$@ .;\ + fi # Set targets as PHONY to ensure that they are copied even if $(BOARD) is changed .PHONY: fw_jump.bin iob_soc.dtb -endif ../../software/%.bin: make -C ../../ fw-build diff --git a/submodules/IOBSOC b/submodules/IOBSOC index 0bbf6176..893d066c 160000 --- a/submodules/IOBSOC +++ b/submodules/IOBSOC @@ -1 +1 @@ -Subproject commit 0bbf6176a3e5cbee6f3696c9589f96e56568c4a5 +Subproject commit 893d066cbc12af5196c45640198d3a328db8a3f0 From 331d6c06bdb4173474cd37cd57f7498f8553f24a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Artur=20N=C3=B3brega?= Date: Tue, 23 Jan 2024 01:14:25 +0000 Subject: [PATCH 2/6] chore(IOBSOC): Update IOBSOC --- submodules/IOBSOC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/IOBSOC b/submodules/IOBSOC index 893d066c..259bfcbc 160000 --- a/submodules/IOBSOC +++ b/submodules/IOBSOC @@ -1 +1 @@ -Subproject commit 893d066cbc12af5196c45640198d3a328db8a3f0 +Subproject commit 259bfcbca69703f12d3da6c2ba82d6b7f0081cb4 From 9b5caba2b6a6f8778b6889cbf1a730fdceae8e19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Artur=20N=C3=B3brega?= Date: Tue, 23 Jan 2024 02:07:16 +0000 Subject: [PATCH 3/6] chore(IOBSOC): Update IOBSOC --- submodules/IOBSOC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/IOBSOC b/submodules/IOBSOC index 259bfcbc..14874e59 160000 --- a/submodules/IOBSOC +++ b/submodules/IOBSOC @@ -1 +1 @@ -Subproject commit 259bfcbca69703f12d3da6c2ba82d6b7f0081cb4 +Subproject commit 14874e591871482d90ee2f1e37853f991433184c From 8762c858e0dd69b74890cb5a0c9736023a8b343a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Artur=20N=C3=B3brega?= Date: Tue, 23 Jan 2024 02:40:50 +0000 Subject: [PATCH 4/6] chore(submodules): Update IOBSOC --- submodules/IOBSOC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/IOBSOC b/submodules/IOBSOC index 14874e59..aa9ed8c2 160000 --- a/submodules/IOBSOC +++ b/submodules/IOBSOC @@ -1 +1 @@ -Subproject commit 14874e591871482d90ee2f1e37853f991433184c +Subproject commit aa9ed8c2a5fd3d95f942d848e7ce25695c720f5d From fc37fa83dbb4b36a74f3797be8ef5587c5927cd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Artur=20N=C3=B3brega?= Date: Tue, 23 Jan 2024 15:49:53 +0000 Subject: [PATCH 5/6] feat(iob_soc_opencryptolinux.py): Fix `*_mem.config` filename. --- iob_soc_opencryptolinux.py | 4 ++-- submodules/IOBSOC | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/iob_soc_opencryptolinux.py b/iob_soc_opencryptolinux.py index a99a3dc8..95a30e8f 100755 --- a/iob_soc_opencryptolinux.py +++ b/iob_soc_opencryptolinux.py @@ -153,9 +153,9 @@ def _post_setup(cls): ) # Set custom ethernet CONSOLE_CMD contents.append( - """ + f""" ### Launch minicom if running Linux -ifeq ($(shell grep -o rootfs.cpio.gz ../iob_soc_opencryptolinux_mem.config),rootfs.cpio.gz) +ifeq ($(shell grep -o rootfs.cpio.gz ../{cls.name}_mem.config),rootfs.cpio.gz) ifneq ($(wildcard minicom_linux_script.txt),) SCRIPT_STR:=-S minicom_linux_script.txt # Set TERM variable to linux-c-nc (needed to run in non-interactive mode https://stackoverflow.com/a/49077622) diff --git a/submodules/IOBSOC b/submodules/IOBSOC index aa9ed8c2..98fa6513 160000 --- a/submodules/IOBSOC +++ b/submodules/IOBSOC @@ -1 +1 @@ -Subproject commit aa9ed8c2a5fd3d95f942d848e7ce25695c720f5d +Subproject commit 98fa65138c29d45bee067969c4abe0bab50092c0 From 5de949c939439ea8b904eb07b4f5755881df78a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Artur=20N=C3=B3brega?= Date: Thu, 25 Jan 2024 06:00:35 +0000 Subject: [PATCH 6/6] feat(minicom): Always create capture file for logging; Update OS submodule --- iob_soc_opencryptolinux.py | 2 +- submodules/OS | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/iob_soc_opencryptolinux.py b/iob_soc_opencryptolinux.py index 95a30e8f..601606b9 100755 --- a/iob_soc_opencryptolinux.py +++ b/iob_soc_opencryptolinux.py @@ -160,9 +160,9 @@ def _post_setup(cls): SCRIPT_STR:=-S minicom_linux_script.txt # Set TERM variable to linux-c-nc (needed to run in non-interactive mode https://stackoverflow.com/a/49077622) TERM_STR:=TERM=linux-c-nc +endif # Set a capture file and print its contents (to work around minicom clearing the screen) LOG_STR:=-C minicom_out.log || cat minicom_out.log -endif # Set HOME to current (fpga) directory (needed because minicom always reads the '.minirc.*' config file from HOME) HOME_STR:=HOME=$$(pwd) # Always exit with code 0 (since linux is terminated with CTRL-C) diff --git a/submodules/OS b/submodules/OS index c48e3fad..0286e42a 160000 --- a/submodules/OS +++ b/submodules/OS @@ -1 +1 @@ -Subproject commit c48e3fad10a576613c85ec64eb26e59338f60fef +Subproject commit 0286e42aba02019125903478cceaaa339a372375