SOC1-203: Moved Chipkit within soctools

.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

chipkit_flow @ 67241692

-Subproject commit 672416929813708f48e5376c8de00a4f7a69aa9a

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"
+export SOCTOOLS_FLOW_DIR="$PROJECT_DIR/soctools_flow"
\ No newline at end of file
+
+# CHIPKIT - Register Generation
+export CHIPKIT_FLOW_DIR="$SOCTOOLS_FLOW_DIR/tools/chipkit_flow"

soctools_flow @ 7118711f

-Subproject commit 0ddd48965bfa1dd643a62021cdaef975da0f2154
+Subproject commit 7118711fe3f7fc93ad65bcd46203de73358b0545