diff --git a/.gitmodules b/.gitmodules index 39b27d4..3c84177 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,20 +1,20 @@ [submodule "buildroot"] path = buildroot - url = git@192.168.110.45:sdk/buildroot.git - branch = jh7110-master + url = https://github.com/starfive-tech/buildroot.git + branch = JH7110_VisionFive2_devel [submodule "u-boot"] path = u-boot - url = git@192.168.110.45:sdk/u-boot.git - branch = jh7110-master + url = https://github.com/starfive-tech/u-boot.git + branch = JH7110_VisionFive2_devel [submodule "linux"] path = linux - url = git@192.168.110.45:sbc/linux.git - branch = vf2-6.6.y-devel + url = https://github.com/starfive-tech/linux.git + branch = JH7110_VisionFive2_6.6.y_devel [submodule "opensbi"] path = opensbi - url = git@192.168.110.45:sdk/opensbi.git - branch = master + url = https://github.com/starfive-tech/opensbi.git + branch = JH7110_VisionFive2_devel [submodule "soft_3rdpart"] path = soft_3rdpart - url = git@192.168.110.45:sdk/soft_3rdpart.git - branch = jh7110-devel + url = https://github.com/starfive-tech/soft_3rdpart.git + branch = JH7110_VisionFive2_devel diff --git a/README.md b/README.md index 0f778aa..663fe45 100755 --- a/README.md +++ b/README.md @@ -26,29 +26,23 @@ $ sudo apt-get install git-lfs ## Fetch Code Instructions ## -Checkout this repository (e.g.: branch `vf2-6.6.y-devel`). Then checkout all of the linked submodules using: +Checkout this repository (e.g.: branch `JH7110_VisionFive2_6.6.y_devel`). Then checkout all of the linked submodules using: - $ git clone git@192.168.110.45:sbc/visionfive.git - $ cd visionfive - $ git checkout --track origin/vf2-6.6.y-devel + $ git clone https://github.com/starfive-tech/VisionFive2.git + $ cd VisionFive2 + $ git checkout --track origin/JH7110_VisionFive2_6.6.y_devel $ git submodule update --init --recursive -In case someone run `git clone git@gitlab.starfivetech.com:sbc/visionfive.git`, recommend to add the below at the tail of the /etc/hosts to fix the network domain issue: - -``` -192.168.110.45 gitlab.starfivetech.com -``` - This will take some time and require around 9GB of disk space. Some modules may fail because certain dependencies don't have the best git hosting. The only solution is to wait and try again later (or ask someone for a copy of that source repository). For user who build the release tag version, the above command is enough. For developer, need to switch the 5 submodules `buildroot`, `u-boot`, `linux`, `opensbi`, `soft_3rdpart` to correct branch manually, or refer to `.gitmodule` ``` -$ cd buildroot && git checkout --track origin/jh7110-master && cd .. -$ cd u-boot && git checkout --track origin/jh7110-master && cd .. -$ cd linux && git checkout --track origin/vf2-6.6.y-devel && cd .. +$ cd buildroot && git checkout --track origin/JH7110_VisionFive2_devel && cd .. +$ cd u-boot && git checkout --track origin/JH7110_VisionFive2_devel && cd .. +$ cd linux && git checkout --track origin/JH7110_VisionFive2_6.6.y_devel && cd .. $ cd opensbi && git checkout master && cd .. -$ cd soft_3rdpart && git checkout jh7110-devel && cd .. +$ cd soft_3rdpart && git checkout JH7110_VisionFive2_devel && cd .. ``` ## Quick Build Instructions @@ -192,7 +186,7 @@ StarFive # Then press any key to stop and enter uboot terminal, there are two way to boot the board -#### 1. Running image.fit with the default dtb `jh7110-visionfive-v2.dtb` +#### 1. Running image.fit with the default dtb `jh7110-starfive-visionfive-2-v1.3b.dtb` transfer image.fit through TFTP: @@ -223,7 +217,7 @@ Password: starfive #### 2. Running the other dtb with the Image.gz and initramfs.cpio.gz -If we want to load the other dtb, e.g. `jh7110-visionfive-v2-wm8960.dtb`, follow the below +If we want to load the other dtb, e.g. `jh7110-starfive-visionfive-2-wm8960.dtb`, follow the below Step1: set environment parameters: @@ -234,7 +228,7 @@ setenv ipaddr 192.168.xxx.xxx; setenv serverip 192.168.xxx.xxx; Step2: upload files to ddr: ``` -tftpboot ${fdt_addr_r} jh7110-visionfive-v2-wm8960.dtb; +tftpboot ${fdt_addr_r} jh7110-starfive-visionfive-2-wm8960.dtb; tftpboot ${kernel_addr_r} Image.gz; tftpboot ${ramdisk_addr_r} initramfs.cpio.gz; run chipa_set_linux;run cpu_vol_set; diff --git a/conf/buildroot_initramfs_config b/conf/buildroot_initramfs_config index 579707b..4729aec 100755 --- a/conf/buildroot_initramfs_config +++ b/conf/buildroot_initramfs_config @@ -6,8 +6,8 @@ BR2_RISCV_ISA_CUSTOM_RVD=y BR2_RISCV_ISA_CUSTOM_RVC=y BR2_STRIP_EXCLUDE_FILES="ipa_starfive.so* libcamera-base.so* libcamera.so* libgstlibcamera.so v4l2-compat.so starfive_ipa_proxy" BR2_KERNEL_HEADERS_CUSTOM_GIT=y -BR2_KERNEL_HEADERS_CUSTOM_REPO_URL="git@192.168.110.45:sbc/linux.git" -BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="vf2-6.6.y-devel" +BR2_KERNEL_HEADERS_CUSTOM_REPO_URL="https://github.com/starfive-tech/linux.git" +BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="JH7110_VisionFive2_6.6.y_devel" BR2_PACKAGE_GLIBC_UTILS=y BR2_BINUTILS_VERSION_2_39_X=y BR2_GCC_VERSION_12_X=y diff --git a/conf/buildroot_rootfs_config b/conf/buildroot_rootfs_config index 6556cda..8105223 100644 --- a/conf/buildroot_rootfs_config +++ b/conf/buildroot_rootfs_config @@ -6,8 +6,8 @@ BR2_RISCV_ISA_CUSTOM_RVD=y BR2_RISCV_ISA_CUSTOM_RVC=y BR2_STRIP_EXCLUDE_FILES="ipa_starfive.so* libcamera-base.so* libcamera.so* libgstlibcamera.so v4l2-compat.so starfive_ipa_proxy" BR2_KERNEL_HEADERS_CUSTOM_GIT=y -BR2_KERNEL_HEADERS_CUSTOM_REPO_URL="git@192.168.110.45:sbc/linux.git" -BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="vf2-6.6.y-devel" +BR2_KERNEL_HEADERS_CUSTOM_REPO_URL="https://github.com/starfive-tech/linux.git" +BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="JH7110_VisionFive2_6.6.y_devel" BR2_PACKAGE_GLIBC_UTILS=y BR2_BINUTILS_VERSION_2_39_X=y BR2_GCC_VERSION_12_X=y