diff --git a/nanosoc_tech b/nanosoc_tech index 0315832607362db8baea3ae1e0c56d4260867877..4a29fd4d7d6349c973b8dab7e89b069883fff2ff 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 eb990ffa60822bb1cb66584686b1babed1642861..9d52f58e41b69e0e12734537051c281b5f5eb6de 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 55e9765bb3e19b73604032a9eedb59a2947d8796..04b46ad46b0af70030b5dc9bbece4e71510621bf 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 50598902c235934936cb18eab42e4a6c67004f1a..8ac6b154a6a8f98a5b0fe314182aaaddce1cd0f9 160000 --- a/soctools_flow +++ b/soctools_flow @@ -1 +1 @@ -Subproject commit 50598902c235934936cb18eab42e4a6c67004f1a +Subproject commit 8ac6b154a6a8f98a5b0fe314182aaaddce1cd0f9