diff --git a/nanosoc_tech b/nanosoc_tech index c04ad57b008e85421dcb4a0a69b54a54e386c3a7..65ff336af970c2b183bb971966ec444c181ccd70 160000 --- a/nanosoc_tech +++ b/nanosoc_tech @@ -1 +1 @@ -Subproject commit c04ad57b008e85421dcb4a0a69b54a54e386c3a7 +Subproject commit 65ff336af970c2b183bb971966ec444c181ccd70 diff --git a/proj-branch b/proj-branch index 0d1d9361982b63d5c448622fc4bd9218c6495190..9444c65d167e8ee1ce1e8bb1aade3a77c022e693 100644 --- a/proj-branch +++ b/proj-branch @@ -12,7 +12,7 @@ # Project Repository Subrepository Branch Index # Add your Accelerator Repository here # accelerator_repo: main -nanosoc_tech: feat_accel_decouple +nanosoc_tech: main chipkit_flow: main accelerator_wrapper_tech: main fpga_lib_tech: main diff --git a/set_env.sh b/set_env.sh index 102f446418b8c0b2af04000db63fa557ea3757d0..f93060c136df0673e310117659e5f612b8904f0c 100755 --- a/set_env.sh +++ b/set_env.sh @@ -64,7 +64,7 @@ if [ ! -f $PROJECT_DIR/.socinit ]; then git submodule update --remote --recursive git submodule foreach --recursive git checkout main # Read proj-branch file to find out which branch each subrepo needs to be on - git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | while read line; do cd $PROJECT_DIR/$line && git checkout `grep $line $PROJECT_DIR/proj-branch | awk '{ print $2 }'`; done + git config --file .gitmodules --get-regexp path | awk '{ print $2 }' | while read line; do cd $PROJECT_DIR/$line && git checkout `grep $line $PROJECT_DIR/proj-branch | awk '{ print $2 }'` && git pull; done git restore $DESIGN_ROOT/.gitmodules touch $PROJECT_DIR/.socinit fi \ No newline at end of file diff --git a/system/README.md b/system/README.md new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391