Merge pull request #66 from PedroAntunes178/master

Makefile, iob_soc_opencryptolinux.py: pass BOARD to fpga-fw-build; remove unused iob-cache.
IObundle · Dec 13, 2023 · e0c8143 · e0c8143
2 parents a712afe + 53bd909
commit e0c8143
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -39,13 +39,13 @@ 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'
-	BOARD=$(BOARD) GRAB_TIMEOUT=$(GRAB_TIMEOUT) make -C ../$(CORE)_V*/ fpga-run 
+	nix-shell --run 'BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX) make -C ../$(CORE)_V*/ fpga-fw-build'
+	BOARD=$(BOARD) RUN_LINUX=$(RUN_LINUX) 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 
+	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

diff --git 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)