Updated branch reference for nanosoc

flist/mem/fpga_mem.flist

@@ -16,7 +16,7 @@
 +libext+.v+.vlib
 
 // =============    NanoSoC Testbench search path    =============
--incdir $(SOCLABS_FPGA_LIB_TECH_DIR)/sram/verilog/
+// -incdir $(SOCLABS_FPGA_LIB_TECH_DIR)/sram/verilog/
 
 // - Top-level testbench
 $(SOCLABS_FPGA_LIB_TECH_DIR)/sram/verilog/sl_ahb_sram.v
\ No newline at end of file

flist/project/system.flist

@@ -42,15 +42,9 @@
 // - Generic Pad Library
 -f $(SOCLABS_PROJECT_DIR)/flist/generic_lib/generic_lib_ip.flist
 
-// - CMSDK VIP
--f $(SOCLABS_NANOSOC_TECH_DIR)/flist/corstone101_vip.flist
-
 // - NanoSoC Custom Expansion Region
 //$(SOCLABS_PROJECT_DIR)/system/src/nanosoc_exp.v
 
-// - Top level
--f $(SOCLABS_PROJECT_DIR)/flist/nanosoc/nanosoc_tb.flist
-
 // - FPGA sram
 -f $(SOCLABS_PROJECT_DIR)/flist/mem/fpga_mem.flist
 

flist/project/system_tb.flist

+//-----------------------------------------------------------------------------
+// Accelerator System 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 Top-level Accelerator System
+//-----------------------------------------------------------------------------
+
+// DESIGN_TOP nanosoc_tb
+
+// ============= Verilog library extensions ===========
++libext+.v+.vlib
+
+// =============    System Component Filelist      ================
+
+// - CMSDK VIP
+-f $(SOCLABS_NANOSOC_TECH_DIR)/flist/corstone101_vip.flist
+
+// - Design
+-f $(SOCLABS_PROJECT_DIR)/flist/project/system.flist
+
+// - Top level
+-f $(SOCLABS_PROJECT_DIR)/flist/nanosoc/nanosoc_tb.flist
+

fpga_lib_tech @ 4344fb71

-Subproject commit 3e6eea8f70104378841ddb7032399cebcf43686f
+Subproject commit 4344fb7198daaae6d40f95b58587af5f869263a2

nanosoc_tech @ 6baa3fca

-Subproject commit cb7b26aa5a553766cc90e513d146f6cfd7ac9142
+Subproject commit 6baa3fcaed83d29214b97c74d5c92627e152a41a

proj-branch

@@ -12,7 +12,7 @@
 # Project Repository Subrepository Branch Index
 # Add your Accelerator Repository here
 # accelerator_repo: main
-nanosoc_tech: main
+nanosoc_tech: feat_nanosoc_regions
 accelerator_wrapper_tech: main
 fpga_lib_tech: main
 generic_lib_tech: main

soctools_flow @ 1c706759

-Subproject commit ce9edaa78fac0d09ad9466e4bc159e999483fd12
+Subproject commit 1c706759aebfbd539a9f035e94737975e00dd5dd