From 004792a4e378693ccfdea1681f9c96a064f69b85 Mon Sep 17 00:00:00 2001 From: dam1n19 <dam1n19@soton.ac.uk> Date: Wed, 17 May 2023 10:00:49 +0100 Subject: [PATCH] SOC1-203: Moved Chipkit within soctools --- .gitmodules | 3 --- chipkit_flow | 1 - env/dependency_env.sh | 8 ++++---- soctools_flow | 2 +- 4 files changed, 5 insertions(+), 9 deletions(-) delete mode 160000 chipkit_flow diff --git a/.gitmodules b/.gitmodules index 880cce0..f5c1b16 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ url = https://git.soton.ac.uk/soclabs/nanosoc_tech.git [submodule "soctools_flow"] path = soctools_flow url = https://git.soton.ac.uk/soclabs/soctools_flow.git -[submodule "chipkit_flow"] - path = chipkit_flow -url = https://git.soton.ac.uk/soclabs/chipkit_flow.git [submodule "generic_lib_tech"] path = generic_lib_tech url = https://git.soton.ac.uk/soclabs/generic_lib_tech.git diff --git a/chipkit_flow b/chipkit_flow deleted file mode 160000 index 6724169..0000000 --- a/chipkit_flow +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 672416929813708f48e5376c8de00a4f7a69aa9a diff --git a/env/dependency_env.sh b/env/dependency_env.sh index e21a54a..bcde818 100755 --- a/env/dependency_env.sh +++ b/env/dependency_env.sh @@ -36,8 +36,8 @@ export GENERIC_LIB_TECH_DIR="$PROJECT_DIR/generic_lib_tech" # Flows #----------------------------------------------------------------------------- -# CHIPKIT - Register Generation -export CHIPKIT_FLOW_DIR="$PROJECT_DIR/chipkit_flow" - # SoCTools - Toolkit of scripts related to SoCLabs projects -export SOCTOOLS_FLOW_DIR="$PROJECT_DIR/soctools_flow" \ No newline at end of file +export SOCTOOLS_FLOW_DIR="$PROJECT_DIR/soctools_flow" + +# CHIPKIT - Register Generation +export CHIPKIT_FLOW_DIR="$SOCTOOLS_FLOW_DIR/tools/chipkit_flow" diff --git a/soctools_flow b/soctools_flow index 0ddd489..7118711 160000 --- a/soctools_flow +++ b/soctools_flow @@ -1 +1 @@ -Subproject commit 0ddd48965bfa1dd643a62021cdaef975da0f2154 +Subproject commit 7118711fe3f7fc93ad65bcd46203de73358b0545 -- GitLab