Create 6.6 branch and migrate to github repo

Signed-off-by: Andy Hu <andy.hu@starfivetech.com>
This commit is contained in:
Andy Hu
2024-05-09 20:00:41 +08:00
parent 85763c4f83
commit 6f9f317ddd
4 changed files with 25 additions and 31 deletions

20
.gitmodules vendored
View File

@@ -1,20 +1,20 @@
[submodule "buildroot"] [submodule "buildroot"]
path = buildroot path = buildroot
url = git@192.168.110.45:sdk/buildroot.git url = https://github.com/starfive-tech/buildroot.git
branch = jh7110-master branch = JH7110_VisionFive2_devel
[submodule "u-boot"] [submodule "u-boot"]
path = u-boot path = u-boot
url = git@192.168.110.45:sdk/u-boot.git url = https://github.com/starfive-tech/u-boot.git
branch = jh7110-master branch = JH7110_VisionFive2_devel
[submodule "linux"] [submodule "linux"]
path = linux path = linux
url = git@192.168.110.45:sbc/linux.git url = https://github.com/starfive-tech/linux.git
branch = vf2-6.6.y-devel branch = JH7110_VisionFive2_6.6.y_devel
[submodule "opensbi"] [submodule "opensbi"]
path = opensbi path = opensbi
url = git@192.168.110.45:sdk/opensbi.git url = https://github.com/starfive-tech/opensbi.git
branch = master branch = JH7110_VisionFive2_devel
[submodule "soft_3rdpart"] [submodule "soft_3rdpart"]
path = soft_3rdpart path = soft_3rdpart
url = git@192.168.110.45:sdk/soft_3rdpart.git url = https://github.com/starfive-tech/soft_3rdpart.git
branch = jh7110-devel branch = JH7110_VisionFive2_devel

View File

@@ -26,29 +26,23 @@ $ sudo apt-get install git-lfs
## Fetch Code Instructions ## ## 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 $ git clone https://github.com/starfive-tech/VisionFive2.git
$ cd visionfive $ cd VisionFive2
$ git checkout --track origin/vf2-6.6.y-devel $ git checkout --track origin/JH7110_VisionFive2_6.6.y_devel
$ git submodule update --init --recursive $ 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). 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` 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 buildroot && git checkout --track origin/JH7110_VisionFive2_devel && cd ..
$ cd u-boot && git checkout --track origin/jh7110-master && cd .. $ cd u-boot && git checkout --track origin/JH7110_VisionFive2_devel && cd ..
$ cd linux && git checkout --track origin/vf2-6.6.y-devel && cd .. $ cd linux && git checkout --track origin/JH7110_VisionFive2_6.6.y_devel && cd ..
$ cd opensbi && git checkout master && 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 ## 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 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: transfer image.fit through TFTP:
@@ -223,7 +217,7 @@ Password: starfive
#### 2. Running the other dtb with the Image.gz and initramfs.cpio.gz #### 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: 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: 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 ${kernel_addr_r} Image.gz;
tftpboot ${ramdisk_addr_r} initramfs.cpio.gz; tftpboot ${ramdisk_addr_r} initramfs.cpio.gz;
run chipa_set_linux;run cpu_vol_set; run chipa_set_linux;run cpu_vol_set;

View File

@@ -6,8 +6,8 @@ BR2_RISCV_ISA_CUSTOM_RVD=y
BR2_RISCV_ISA_CUSTOM_RVC=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_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_GIT=y
BR2_KERNEL_HEADERS_CUSTOM_REPO_URL="git@192.168.110.45:sbc/linux.git" BR2_KERNEL_HEADERS_CUSTOM_REPO_URL="https://github.com/starfive-tech/linux.git"
BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="vf2-6.6.y-devel" BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="JH7110_VisionFive2_6.6.y_devel"
BR2_PACKAGE_GLIBC_UTILS=y BR2_PACKAGE_GLIBC_UTILS=y
BR2_BINUTILS_VERSION_2_39_X=y BR2_BINUTILS_VERSION_2_39_X=y
BR2_GCC_VERSION_12_X=y BR2_GCC_VERSION_12_X=y

View File

@@ -6,8 +6,8 @@ BR2_RISCV_ISA_CUSTOM_RVD=y
BR2_RISCV_ISA_CUSTOM_RVC=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_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_GIT=y
BR2_KERNEL_HEADERS_CUSTOM_REPO_URL="git@192.168.110.45:sbc/linux.git" BR2_KERNEL_HEADERS_CUSTOM_REPO_URL="https://github.com/starfive-tech/linux.git"
BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="vf2-6.6.y-devel" BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="JH7110_VisionFive2_6.6.y_devel"
BR2_PACKAGE_GLIBC_UTILS=y BR2_PACKAGE_GLIBC_UTILS=y
BR2_BINUTILS_VERSION_2_39_X=y BR2_BINUTILS_VERSION_2_39_X=y
BR2_GCC_VERSION_12_X=y BR2_GCC_VERSION_12_X=y