From 779bb381e25023af7411c5badf27a28f4cc1b8d2 Mon Sep 17 00:00:00 2001
From: Daniel Newbrook <dwn1c21@soton.ac.uk>
Date: Mon, 14 Aug 2023 16:00:11 +0100
Subject: [PATCH] update asic flow

---
 .gitignore                   | 2 ++
 .gitmodules                  | 4 ++++
 env/dependency_env.sh        | 3 +++
 flist/project/top_ASIC.flist | 6 ++++--
 nanosoc_tech                 | 2 +-
 soctools_flow                | 2 +-
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 62e6899..36c16f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ system/src/bootrom/*
 system/src/defines/*
 system/html/*
 flist/tmp
+memories/*
 
 # Compile Test Code Removal
 /system/testcodes/*/*.elf
@@ -21,4 +22,5 @@ flist/tmp
 
 # Remove Implementation Files
 imp/fpga/*
+imp/ASIC/*
 html
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index 0f2cd40..b9b9e67 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,7 @@
 [submodule "secworks-aes"]
 	path = secworks-aes
 	url = https://github.com/secworks/aes.git
+[submodule "asic_lib_tech"]
+	path = asic_lib_tech
+	url = https://git.soton.ac.uk/soclabs/asic_library_tech
+	branch = main
diff --git a/env/dependency_env.sh b/env/dependency_env.sh
index ffe841d..85bb93e 100755
--- a/env/dependency_env.sh
+++ b/env/dependency_env.sh
@@ -38,6 +38,9 @@ export SOCLABS_PRIMITIVES_TECH_DIR="$SOCLABS_PROJECT_DIR/rtl_primitives_tech"
 # FPGA Libraries
 export SOCLABS_FPGA_LIB_TECH_DIR="$SOCLABS_PROJECT_DIR/fpga_lib_tech"
 
+# ASIC Libraries
+export SOCLABS_ASIC_LIB_TECH_DIR="$SOCLABS_PROJECT_DIR/asic_lib_tech"
+
 # Generic Libraries
 export SOCLABS_GENERIC_LIB_TECH_DIR="$SOCLABS_PROJECT_DIR/generic_lib_tech"
 
diff --git a/flist/project/top_ASIC.flist b/flist/project/top_ASIC.flist
index b39d667..7b9d4f9 100644
--- a/flist/project/top_ASIC.flist
+++ b/flist/project/top_ASIC.flist
@@ -25,8 +25,10 @@
 
 // =============    Arm-IP Specific Filelists      =========================
 // - NanoSoC Chip IP
--f $(SOCLABS_NANOSOC_TECH_DIR)/flist/nanosoc.flist
+-f $(SOCLABS_NANOSOC_TECH_DIR)/flist/nanosoc_ASIC.flist
 
 // - CMSDK IP
 -f $(SOCLABS_PROJECT_DIR)/flist/ahb/ahb_ip.flist
--f $(SOCLABS_PROJECT_DIR)/flist/apb/apb_ip.flist
\ No newline at end of file
+-f $(SOCLABS_PROJECT_DIR)/flist/apb/apb_ip.flist
+
+$(SOCLABS_PROJECT_DIR)/system/src/defines/gen_defines.v
\ No newline at end of file
diff --git a/nanosoc_tech b/nanosoc_tech
index 714bca6..a83e8c9 160000
--- a/nanosoc_tech
+++ b/nanosoc_tech
@@ -1 +1 @@
-Subproject commit 714bca67dcb1c6442d123dc48ad97c5d832c9c83
+Subproject commit a83e8c97ec6c79b4bea7ee8a1132dfd767ba5cbe
diff --git a/soctools_flow b/soctools_flow
index fbbc1c2..7e49a11 160000
--- a/soctools_flow
+++ b/soctools_flow
@@ -1 +1 @@
-Subproject commit fbbc1c2bf2a8fa1ee4731f5368aba37fce20d2f9
+Subproject commit 7e49a11b40b02c7879275a95c0b174cffa5f413d
-- 
GitLab