Updated top-repo init flow

.gitmodules

 [submodule "accelerator-wrapper"]
-	path = accelerator-wrapper
-	url = git@git.soton.ac.uk:soclabs/accelerator-wrapper.git
-	[submodule "nanosoc"]
-	path = nanosoc
-	url = git@git.soton.ac.uk:soclabs/nanosoc.git
-	[submodule "socsim"]
-	path = socsim
-	url = git@git.soton.ac.uk:soclabs/socsim.git
-	[submodule "CHIPKIT"]
-	path = CHIPKIT
-	url = git@git.soton.ac.uk:soclabs/CHIPKIT.git
-	[submodule "secworks-sha256"]
-	path = secworks-sha256
-	url = git@git.soton.ac.uk:soclabs/secworks-sha256.git
-	branch = main
-[submodule "secworks-sha-256-system-top/accelerator-wrapper"]
-	branch = main
-[submodule "secworks-sha-256-system-top/CHIPKIT"]
-	branch = main
-[submodule "secworks-sha-256-system-top/nanosoc"]
-	branch = main
-[submodule "secworks-sha-256-system-top/socsim"]
-	branch = main
+path = accelerator-wrapper
+url = git@git.soton.ac.uk:soclabs/accelerator-wrapper.git
+[submodule "nanosoc"]
+path = nanosoc
+url = git@git.soton.ac.uk:soclabs/nanosoc.git
+[submodule "socsim"]
+path = socsim
+url = git@git.soton.ac.uk:soclabs/socsim.git
+[submodule "CHIPKIT"]
+path = CHIPKIT
+url = git@git.soton.ac.uk:soclabs/CHIPKIT.git
+[submodule "secworks-sha256"]
+path = secworks-sha256
+url = git@git.soton.ac.uk:soclabs/secworks-sha256.git

flow/socrepo-init

@@ -18,9 +18,11 @@ for d in $SOC_TOP_DIR/* ; do
         echo $d
         if [ -f "$d/set_env.sh" ]; then
         # If .git file exists - submodule
-            git config -f .gitmodules submodule.$d.branch main
+            # git config -f .gitmodules submodule.$d.branch main
+            git submodule set-branch --branch main $d
         fi
     fi
 done
 git submodule update --remote --recursive
-git submodule foreach --recursive git checkout main
\ No newline at end of file
+git submodule foreach --recursive git checkout main
+git restore $DESIGN_ROOT/.gitmodules
\ No newline at end of file