From 9363b2ef63de506498621e95d98f1ba42c3545eb Mon Sep 17 00:00:00 2001
From: dam1n19 <dam1n19@soton.ac.uk>
Date: Wed, 5 Jul 2023 10:45:54 +0100
Subject: [PATCH] Added recursive projbranch files
---
nanosoc_tech | 2 +-
proj-branch => projbranch | 4 ----
set_env.sh | 2 +-
soctools_flow | 2 +-
4 files changed, 3 insertions(+), 7 deletions(-)
rename proj-branch => projbranch (79%)
diff --git a/nanosoc_tech b/nanosoc_tech
index 0315832..4a29fd4 160000
--- a/nanosoc_tech
+++ b/nanosoc_tech
@@ -1 +1 @@
-Subproject commit 0315832607362db8baea3ae1e0c56d4260867877
+Subproject commit 4a29fd4d7d6349c973b8dab7e89b069883fff2ff
diff --git a/proj-branch b/projbranch
similarity index 79%
rename from proj-branch
rename to projbranch
index eb990ff..9d52f58 100644
--- a/proj-branch
+++ b/projbranch
@@ -14,10 +14,6 @@
secworks-aes: master
nanosoc_tech: feat_nanosoc_regions
-nanosoc_tech/nanosoc/slcorem0_tech: main
-nanosoc_tech/nanosoc/sldma230_tech: main
-nanosoc_tech/nanosoc/socdebug_tech: main
-nanosoc_tech/nanosoc/socdebug_tech/socket/uart_axi_master/core_dbg_bridge: master
accelerator_wrapper_tech: main
fpga_lib_tech: main
generic_lib_tech: main
diff --git a/set_env.sh b/set_env.sh
index 55e9765..04b46ad 100755
--- a/set_env.sh
+++ b/set_env.sh
@@ -65,7 +65,7 @@ if [ ! -f $SOCLABS_PROJECT_DIR/.socinit ]; then
cd $SOCLABS_DESIGN_ROOT
echo $SOCLABS_DESIGN_ROOT
git submodule update --recursive
- python3 $SOCLABS_SOCTOOLS_FLOW_DIR/bin/subrepo_checkout.py -b proj-branch -t $SOCLABS_DESIGN_ROOT
+ python3 $SOCLABS_SOCTOOLS_FLOW_DIR/bin/subrepo_checkout.py -b projbranch -t $SOCLABS_DESIGN_ROOT
git restore $SOCLABS_DESIGN_ROOT/.gitmodules
touch $SOCLABS_PROJECT_DIR/.socinit
fi
diff --git a/soctools_flow b/soctools_flow
index 5059890..8ac6b15 160000
--- a/soctools_flow
+++ b/soctools_flow
@@ -1 +1 @@
-Subproject commit 50598902c235934936cb18eab42e4a6c67004f1a
+Subproject commit 8ac6b154a6a8f98a5b0fe314182aaaddce1cd0f9
--
GitLab