From f01c10a6828907fa5c3e1dc8842766c8d2659d10 Mon Sep 17 00:00:00 2001 From: dam1n19 <dam1n19@soton.ac.uk> Date: Thu, 22 Jun 2023 09:37:59 +0100 Subject: [PATCH] Updated Filelists and added environment variables to dependency_env --- env/dependency_env.sh | 7 ++++-- flist/nanosoc/nanosoc_chip_ip.flist | 34 --------------------------- flist/nanosoc/nanosoc_matrix_ip.flist | 21 ----------------- flist/project/system.flist | 4 ++-- nanosoc_tech | 2 +- 5 files changed, 8 insertions(+), 60 deletions(-) delete mode 100644 flist/nanosoc/nanosoc_chip_ip.flist delete mode 100644 flist/nanosoc/nanosoc_matrix_ip.flist diff --git a/env/dependency_env.sh b/env/dependency_env.sh index 0b274cd..776901b 100755 --- a/env/dependency_env.sh +++ b/env/dependency_env.sh @@ -26,8 +26,11 @@ export SOCLABS_NANOSOC_TECH_DIR="$SOCLABS_PROJECT_DIR/nanosoc_tech" # SoCDebug export SOCLABS_SOCDEBUG_TECH_DIR="$SOCLABS_PROJECT_DIR/nanosoc_tech/system/socdebug_tech" -# SLCore M0 -export SOCLABS_SLCOREM0_TECH_DIR="$SOCLABS_PROJECT_DIR/nanosoc_tech/system/slcore_m0_tech" +# SLCore-M0 +export SOCLABS_SLCOREM0_TECH_DIR="$SOCLABS_PROJECT_DIR/nanosoc_tech/system/slcorem0_tech" + +# SLDMA-230 +export SOCLABS_SLDMA230_TECH_DIR="$SOCLABS_PROJECT_DIR/nanosoc_tech/system/sldma230_tech" # Primtives export SOCLABS_PRIMITIVES_TECH_DIR="$SOCLABS_PROJECT_DIR/rtl_primitives_tech" diff --git a/flist/nanosoc/nanosoc_chip_ip.flist b/flist/nanosoc/nanosoc_chip_ip.flist deleted file mode 100644 index fc7bb4a..0000000 --- a/flist/nanosoc/nanosoc_chip_ip.flist +++ /dev/null @@ -1,34 +0,0 @@ -//----------------------------------------------------------------------------- -// NanoSoC Chip Related IP Filelist -// A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license. -// -// Contributors -// -// David Mapstone (d.a.mapstone@soton.ac.uk) -// -// Copyright � 2021-3, SoC Labs (www.soclabs.org) -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -// Abstract : Verilog Command File for NanoSoC Bus Matrix IP -//----------------------------------------------------------------------------- - -// ============= Verilog library extensions =========== -+libext+.v+.vlib - -// ============= NanoSoC Bus Matrix IP search path ============= -$(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_chip.v -$(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_chip_pads.v - -$(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_cpu.v -$(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_sysio.v -$(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_sys_ahb_decode.v -$(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_apb_subsystem.v - -$(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_ahb_cs_rom_table.v -$(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_mcu_pin_mux.v -$(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_mcu_stclkctrl.v -$(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_mcu_clkctrl.v -$(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_mcu_sysctrl.v - -$(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_apb_usrt.v -$(SOCLABS_NANOSOC_TECH_DIR)/system/src/verilog/nanosoc_ahb_bootrom.v \ No newline at end of file diff --git a/flist/nanosoc/nanosoc_matrix_ip.flist b/flist/nanosoc/nanosoc_matrix_ip.flist deleted file mode 100644 index 00a82ce..0000000 --- a/flist/nanosoc/nanosoc_matrix_ip.flist +++ /dev/null @@ -1,21 +0,0 @@ -//----------------------------------------------------------------------------- -// NanoSoC Bus Matrix IP Filelist -// A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license. -// -// Contributors -// -// David Mapstone (d.a.mapstone@soton.ac.uk) -// -// Copyright � 2021-3, SoC Labs (www.soclabs.org) -//----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- -// Abstract : Verilog Command File for NanoSoC Bus Matrix IP -//----------------------------------------------------------------------------- - -// ============= Verilog library extensions =========== -+libext+.v+.vlib - -// ============= NanoSoC Bus Matrix IP search path ============= -+incdir+$(SOCLABS_NANOSOC_TECH_DIR)/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix - --y $(SOCLABS_NANOSOC_TECH_DIR)/system/src/nanosoc_ahb_busmatrix/verilog/nanosoc_ahb32_4x7_busmatrix \ No newline at end of file diff --git a/flist/project/system.flist b/flist/project/system.flist index ec9d812..10765af 100644 --- a/flist/project/system.flist +++ b/flist/project/system.flist @@ -34,7 +34,7 @@ -f $(SOCLABS_PROJECT_DIR)/flist/apb/apb_ip.flist // - NanoSoC Chip IP --f $(SOCLABS_NANOSOC_TECH_DIR)/flist/nanosoc.flist +-f $(SOCLABS_NANOSOC_TECH_DIR)/flist/nanosoc_ip.flist // - NanoSoc Test Interface IP -f $(SOCLABS_PROJECT_DIR)/flist/nanosoc/nanosoc_test_io_ip.flist @@ -55,7 +55,7 @@ -f $(SOCLABS_PROJECT_DIR)/flist/cortex-m0/cortex-m0_ip.flist // - NanoSoC Custom Expansion Region -$(SOCLABS_PROJECT_DIR)/system/src/nanosoc_exp.v +//$(SOCLABS_PROJECT_DIR)/system/src/nanosoc_exp.v // - Top level -f $(SOCLABS_PROJECT_DIR)/flist/nanosoc/nanosoc_tb.flist diff --git a/nanosoc_tech b/nanosoc_tech index be8c513..226b723 160000 --- a/nanosoc_tech +++ b/nanosoc_tech @@ -1 +1 @@ -Subproject commit be8c5137ae9d04a798e6d6bdfa42b522397a1457 +Subproject commit 226b723d27c500624446478a2303588500b3eddd -- GitLab