diff --git a/.gitmodules b/.gitmodules index b46e378..39b27d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -9,7 +9,7 @@ [submodule "linux"] path = linux url = git@192.168.110.45:sbc/linux.git - branch = vf2-6.1.y-devel + branch = vf2-6.6.y-devel [submodule "opensbi"] path = opensbi url = git@192.168.110.45:sdk/opensbi.git diff --git a/Makefile b/Makefile index 161a79a..ed7f07b 100644 --- a/Makefile +++ b/Makefile @@ -238,7 +238,7 @@ $(perf_tool_wrkdir)/perf: $(linux_srcdir) $(vmlinux) ARCH=riscv \ CROSS_COMPILE=$(CROSS_COMPILE) \ WERROR=0 NO_GTK2=1 NO_LIBPERL=1 \ - NO_LIBBIONIC=1 + NO_LIBBIONIC=1 NO_LIBELF=1 NO_LIBTRACEEVENT=1 .PHONY: perf perf: $(perf_tool_wrkdir)/perf diff --git a/README.md b/README.md index cffb782..0f778aa 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # StarFiveTech VisionFive2 SDK -This builds a complete RISC-V cross-compile toolchain for the `StarFiveTech` `JH7110` SoC. It also builds U-boot SPL, U-boot and a flattened image tree (FIT) image with a Opensbi binary, linux kernel, device tree, ramdisk image and rootfs image for the `JH7110 VisionFive2` board. Note this SDK is built with the linux kernel version `6.1`. +This builds a complete RISC-V cross-compile toolchain for the `StarFiveTech` `JH7110` SoC. It also builds U-boot SPL, U-boot and a flattened image tree (FIT) image with a Opensbi binary, linux kernel, device tree, ramdisk image and rootfs image for the `JH7110 VisionFive2` board. Note this SDK is built with the linux kernel version `6.6`. ## Prerequisites @@ -26,11 +26,11 @@ $ sudo apt-get install git-lfs ## Fetch Code Instructions ## -Checkout this repository (e.g.: branch `vf2-6.1.y-devel`). Then checkout all of the linked submodules using: +Checkout this repository (e.g.: branch `vf2-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.1.y-devel + $ git checkout --track origin/vf2-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: @@ -46,7 +46,7 @@ For user who build the release tag version, the above command is enough. For dev ``` $ 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.1.y-devel && cd .. +$ cd linux && git checkout --track origin/vf2-6.6.y-devel && cd .. $ cd opensbi && git checkout master && cd .. $ cd soft_3rdpart && git checkout jh7110-devel && cd .. ``` @@ -68,11 +68,11 @@ work/ ├── linux/arch/riscv/boot ├── dts │ └── starfive - │ ├── jh7110-visionfive-v2-A10.dtb - │ ├── jh7110-visionfive-v2-A11.dtb - │ ├── jh7110-visionfive-v2-ac108.dtb - │ ├── jh7110-visionfive-v2.dtb - │ ├── jh7110-visionfive-v2-wm8960.dtb + │ ├── jh7110-starfive-visionfive-2-ac108.dtb + │ ├── jh7110-starfive-visionfive-2-tdm.dtb + │ ├── jh7110-starfive-visionfive-2-v1.2a.dtb + │ ├── jh7110-starfive-visionfive-2-v1.3b.dtb + │ ├── jh7110-starfive-visionfive-2-wm8960.dtb │ ├── vf2-overlay │ │ └── vf2-overlay-uart3-i2c.dtbo └── Image.gz diff --git a/conf/buildroot_initramfs_config b/conf/buildroot_initramfs_config index 99dfb93..579707b 100755 --- a/conf/buildroot_initramfs_config +++ b/conf/buildroot_initramfs_config @@ -7,7 +7,7 @@ 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.1.y-devel" +BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="vf2-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 0310511..6556cda 100644 --- a/conf/buildroot_rootfs_config +++ b/conf/buildroot_rootfs_config @@ -7,7 +7,7 @@ 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.1.y-devel" +BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION="vf2-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/visionfive2-fit-image.its b/conf/visionfive2-fit-image.its index 9b45145..7c01d91 100644 --- a/conf/visionfive2-fit-image.its +++ b/conf/visionfive2-fit-image.its @@ -30,7 +30,7 @@ }; fdt { - data = /incbin/("../work/linux/arch/riscv/boot/dts/starfive/jh7110-visionfive-v2.dtb"); + data = /incbin/("../work/linux/arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2-v1.3b.dtb"); type = "flat_dt"; arch = "riscv"; load = <0x0 0x46000000>;