From c28a7ab9268517a2799cb2af810cd4cdc8a217a0 Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Tue, 4 Jul 2023 18:33:48 +0100
Subject: [PATCH] IMEM preload define and updated copy_to directory for fpga
flow
---
fpga/makefile | 2 +-
makefile | 2 +-
nanosoc/nanosoc_regions/imem_0/verilog/nanosoc_region_imem_0.v | 2 +-
nanosoc/socdebug_tech | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/fpga/makefile b/fpga/makefile
index f0eb719..62ea7d8 100644
--- a/fpga/makefile
+++ b/fpga/makefile
@@ -89,7 +89,7 @@ defs_nanosoc:
flist_nanosoc: defs_nanosoc
@mkdir -p $(TCL_FLIST_DIR)
@(cd $(TCL_FLIST_DIR); \
- $(SOCLABS_SOCTOOLS_FLOW_DIR)/bin/filelist_compile.py -t -f $(DESIGN_VC) -o $(TCL_OUTPUT_FILELIST) -r $(IMP_NANOSOC_DIR) -d $(NANOSOC_DEFINES);)
+ $(SOCLABS_SOCTOOLS_FLOW_DIR)/bin/filelist_compile.py -t -f $(DESIGN_VC) -o $(TCL_OUTPUT_FILELIST) -r $(IMP_NANOSOC_DIR)/src -d $(NANOSOC_DEFINES);)
# Package NanoSoC Socket Components
package_socket:
diff --git a/makefile b/makefile
index 856f9e0..bd508e2 100644
--- a/makefile
+++ b/makefile
@@ -95,7 +95,7 @@ ifeq ($(ACCELERATOR),yes)
NANOSOC_DEFINES += ACCELERATOR_SUBSYSTEM
endif
-NANOSOC_DEFINES += IMEM_0_ROM
+NANOSOC_DEFINES += IMEM_0_RAM_PRELOAD
# Is the Arm QuickStart being used?
QUICKSTART ?= no
diff --git a/nanosoc/nanosoc_regions/imem_0/verilog/nanosoc_region_imem_0.v b/nanosoc/nanosoc_regions/imem_0/verilog/nanosoc_region_imem_0.v
index 7229818..245ba1f 100644
--- a/nanosoc/nanosoc_regions/imem_0/verilog/nanosoc_region_imem_0.v
+++ b/nanosoc/nanosoc_regions/imem_0/verilog/nanosoc_region_imem_0.v
@@ -36,7 +36,7 @@ module nanosoc_region_imem_0 #(
output wire [SYS_DATA_W-1:0] HRDATA
);
-`ifdef IMEM_0_ROM
+`ifdef IMEM_0_RAM_PRELOAD
// ROM Instantiation
sl_ahb_rom #(
.SYS_DATA_W (SYS_DATA_W),
diff --git a/nanosoc/socdebug_tech b/nanosoc/socdebug_tech
index e3c85ab..04639f9 160000
--- a/nanosoc/socdebug_tech
+++ b/nanosoc/socdebug_tech
@@ -1 +1 @@
-Subproject commit e3c85ab6c67113ad8547a129cac01dae494c4c15
+Subproject commit 04639f9ccf3717e38e741dadd5027453f6856a37
--
GitLab