diff --git a/.gitmodules b/.gitmodules index 10c581d..b0142ee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,12 +9,12 @@ [submodule "linux"] path = linux url = https://github.com/DC-DeepComputing/fml13v01-linux.git - branch = JH7110_VisionFive2_6.6.y_devel + branch = fm7110-6.6 [submodule "opensbi"] path = opensbi url = https://github.com/DC-DeepComputing/fml13v01-opensbi.git branch = fm7110-6.6 [submodule "soft_3rdpart"] path = soft_3rdpart - url = https://github.com/DC-DeepComputing/fml13v01-soft_3rdpart.git - branch = fm7110-6.6 + url = https://github.com/starfive-tech/soft_3rdpart.git + branch = JH7110_VisionFive2_devel diff --git a/README.md b/README.md index 679857d..1a06af9 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,11 @@ This will take some time and require around 12GB of disk space. Some modules may For developer, need to switch the 5 submodules `buildroot`, `u-boot`, `linux`, `opensbi`, `soft_3rdpart` to correct branch manually, or refer to `.gitmodule` - $ git submodule foreach --recursive "git checkout origin/fm7110-6.6 -B fm7110-6.6" + $ cd buildroot && git checkout -B fm7110-6.6 origin/fm7110-6.6 && cd .. + $ cd u-boot && git checkout -B fm7110-6.6 origin/fm7110-6.6 && cd .. + $ cd linux && git checkout -B fm7110-6.6 origin/fm7110-6.6 && cd .. + $ cd opensbi && git checkout -B fm7110-6.6 origin/fm7110-6.6 && cd .. + $ cd soft_3rdpart && git checkout -B fm7110-6.6 JH7110_VF2_6.6_v5.12.0 && cd .. ## Quick Build Instructions diff --git a/linux b/linux index 22919f9..760a8db 160000 --- a/linux +++ b/linux @@ -1 +1 @@ -Subproject commit 22919f9dcd75788d1a38d0884e060bc6f4389937 +Subproject commit 760a8dbc30ebcf1d67174632a957b2706fb23046 diff --git a/u-boot b/u-boot index 7572e01..d6b5515 160000 --- a/u-boot +++ b/u-boot @@ -1 +1 @@ -Subproject commit 7572e010f531c4aea2c8d6fd9ad0bd626028b464 +Subproject commit d6b5515db6c973036fa0702e9f1e98be130afa2c