From 77072cce6d4baa459fe024ca61ee973d1375aeef Mon Sep 17 00:00:00 2001 From: Pedro Antunes Date: Tue, 12 Dec 2023 18:14:57 +0100 Subject: [PATCH 1/3] iob_soc_opencryptolinux.py: - remove iob_cache from submodules list, it was unnecessary. --- iob_soc_opencryptolinux.py | 1 + 1 file changed, 1 insertion(+) diff --git a/iob_soc_opencryptolinux.py b/iob_soc_opencryptolinux.py index a0056422..c1c89fc2 100755 --- a/iob_soc_opencryptolinux.py +++ b/iob_soc_opencryptolinux.py @@ -95,6 +95,7 @@ def _create_submodules_list(cls, extra_submodules=[]): if type(cls.submodule_list[i]) == type and cls.submodule_list[i].name in [ "iob_picorv32", "iob_uart", + "iob_cache", "axi_interconnect", ]: cls.submodule_list.pop(i) From 732c2a04c51279de8969ea0f85aebe7605a35f8a Mon Sep 17 00:00:00 2001 From: Pedro Antunes Date: Tue, 12 Dec 2023 18:27:42 +0100 Subject: [PATCH 2/3] Makefile (fix): - Needed to pass BOARD variable to `fpga-fw-build` as well. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a9dbd476..23baf007 100644 --- a/Makefile +++ b/Makefile @@ -39,11 +39,11 @@ sim-test: fpga-run: nix-shell --run 'make clean setup INIT_MEM=$(INIT_MEM) USE_EXTMEM=$(USE_EXTMEM)' - nix-shell --run 'RUN_LINUX=$(RUN_LINUX) make -C ../$(CORE)_V*/ fpga-fw-build' + nix-shell --run 'BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX) make -C ../$(CORE)_V*/ fpga-fw-build' BOARD=$(BOARD) GRAB_TIMEOUT=$(GRAB_TIMEOUT) make -C ../$(CORE)_V*/ fpga-run fpga-connect: - nix-shell --run 'RUN_LINUX=$(RUN_LINUX) make -C ../$(CORE)_V*/ fpga-fw-build' + nix-shell --run 'BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX) make -C ../$(CORE)_V*/ fpga-fw-build' # Should run under 'bash', running with 'fish' as a shell gives an error BOARD=$(BOARD) GRAB_TIMEOUT=$(GRAB_TIMEOUT) make -C ../$(CORE)_V*/ fpga-run From 53bd90908c37b31368a47913f4b277d58c87379c Mon Sep 17 00:00:00 2001 From: Pedro Antunes Date: Tue, 12 Dec 2023 19:28:10 +0100 Subject: [PATCH 3/3] Makefile (fix): - RUN_LINUX should also be passed to fpga-run. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 23baf007..66fbdfe6 100644 --- a/Makefile +++ b/Makefile @@ -40,12 +40,12 @@ sim-test: fpga-run: nix-shell --run 'make clean setup INIT_MEM=$(INIT_MEM) USE_EXTMEM=$(USE_EXTMEM)' nix-shell --run 'BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX) make -C ../$(CORE)_V*/ fpga-fw-build' - BOARD=$(BOARD) GRAB_TIMEOUT=$(GRAB_TIMEOUT) make -C ../$(CORE)_V*/ fpga-run + BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX) GRAB_TIMEOUT=$(GRAB_TIMEOUT) make -C ../$(CORE)_V*/ fpga-run fpga-connect: nix-shell --run 'BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX) make -C ../$(CORE)_V*/ fpga-fw-build' # Should run under 'bash', running with 'fish' as a shell gives an error - BOARD=$(BOARD) GRAB_TIMEOUT=$(GRAB_TIMEOUT) make -C ../$(CORE)_V*/ fpga-run + BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX) GRAB_TIMEOUT=$(GRAB_TIMEOUT) make -C ../$(CORE)_V*/ fpga-run fpga-test: # IOb-SoC-Opencryptolinux always uses external memory