diff --git a/.checkpackageignore b/.checkpackageignore index 2554347bd7..9ef65e8724 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -149,7 +149,6 @@ configs/orangepi_pc2_defconfig lib_defconfig.ForceCheckHash configs/orangepi_zero_plus_defconfig lib_defconfig.ForceCheckHash configs/pine64_defconfig lib_defconfig.ForceCheckHash configs/pine64_pinecube_defconfig lib_defconfig.ForceCheckHash -configs/pine64_star64_defconfig lib_defconfig.ForceCheckHash configs/s6lx9_microboard_defconfig lib_defconfig.ForceCheckHash configs/sipeed_lichee_rv_defconfig lib_defconfig.ForceCheckHash configs/sipeed_lichee_rv_dock_defconfig lib_defconfig.ForceCheckHash diff --git a/board/pine64/star64/genimage.cfg b/board/pine64/star64/genimage.cfg index 74940016f4..20326710c5 100644 --- a/board/pine64/star64/genimage.cfg +++ b/board/pine64/star64/genimage.cfg @@ -12,8 +12,8 @@ image sdcard.img { } partition uboot { - image = "opensbi_uboot_payload.img" - partition-type-uuid = 5B193300-FC78-40CD-8002-E86C45580B47 + image = "u-boot.itb" + partition-type-uuid = xbootldr offset = 4M } diff --git a/board/pine64/star64/overlay/boot/extlinux/extlinux.conf b/board/pine64/star64/overlay/boot/extlinux/extlinux.conf index db7cfb7b8b..4a76fc1624 100644 --- a/board/pine64/star64/overlay/boot/extlinux/extlinux.conf +++ b/board/pine64/star64/overlay/boot/extlinux/extlinux.conf @@ -1,4 +1,4 @@ label star64 kernel /boot/Image devicetree /boot/jh7110-pine64-star64.dtb - append root=/dev/mmcblk1p3 earlycon=sbi + append root=/dev/mmcblk1p3 rootwait earlycon=sbi diff --git a/board/pine64/star64/patches/linux/linux.hash b/board/pine64/star64/patches/linux/linux.hash new file mode 100644 index 0000000000..8549cf1037 --- /dev/null +++ b/board/pine64/star64/patches/linux/linux.hash @@ -0,0 +1,2 @@ +# From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc +sha256 165ca1c37c4607b90e731996b7c1e3311285167d13deeedf08f3f1f0b9d2541a linux-6.12.57.tar.xz diff --git a/board/pine64/star64/patches/uboot/uboot.hash b/board/pine64/star64/patches/uboot/uboot.hash new file mode 100644 index 0000000000..98a5c53aaf --- /dev/null +++ b/board/pine64/star64/patches/uboot/uboot.hash @@ -0,0 +1,2 @@ +# Locally calculated +sha256 b4f032848e56cc8f213ad59f9132c084dbbb632bc29176d024e58220e0efdf4a u-boot-2025.10.tar.bz2 diff --git a/board/pine64/star64/post-build.sh b/board/pine64/star64/post-build.sh deleted file mode 100755 index ed0a6ebd52..0000000000 --- a/board/pine64/star64/post-build.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -BOARD_DIR="$CONFIG_DIR"/board/pine64/star64 - -# Add header to the SPL -"$HOST_DIR"/bin/spl_tool -c -f "$BINARIES_DIR"/u-boot-spl.bin - -# Create the u-boot FIT image -cp "$BOARD_DIR"/star64-uboot-fit-image.its "$BINARIES_DIR" -mkimage -f "$BINARIES_DIR"/star64-uboot-fit-image.its -A riscv -O u-boot -T firmware "$BINARIES_DIR"/opensbi_uboot_payload.img diff --git a/board/pine64/star64/star64-uboot-fit-image.its b/board/pine64/star64/star64-uboot-fit-image.its deleted file mode 100644 index 08f603163a..0000000000 --- a/board/pine64/star64/star64-uboot-fit-image.its +++ /dev/null @@ -1,29 +0,0 @@ -/dts-v1/; - -/ { - description = "U-boot-spl FIT image for JH7110 Pine64 Star64"; - #address-cells = <2>; - - images { - firmware { - description = "u-boot"; - data = /incbin/("fw_payload.bin"); - type = "firmware"; - arch = "riscv"; - os = "u-boot"; - load = <0x0 0x40000000>; - entry = <0x0 0x40000000>; - compression = "none"; - }; - }; - - configurations { - default = "config-1"; - - config-1 { - description = "U-boot-spl FIT config for JH7110 Pine64 Star64"; - firmware = "firmware"; - }; - }; -}; - diff --git a/configs/pine64_star64_defconfig b/configs/pine64_star64_defconfig index 33c5826a4a..a0356447d5 100644 --- a/configs/pine64_star64_defconfig +++ b/configs/pine64_star64_defconfig @@ -1,13 +1,14 @@ BR2_riscv=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_GLOBAL_PATCH_DIR="board/pine64/star64/patches" +BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_ROOTFS_OVERLAY="board/pine64/star64/overlay/" -BR2_ROOTFS_POST_BUILD_SCRIPT="board/pine64/star64/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/star64/genimage.cfg" BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,Fishwaldo,Star64_linux,1456c984f15e21e28fb8a9ce96d0ca10e61a71c4)/linux-1456c984f15e21e28fb8a9ce96d0ca10e61a71c4.tar.gz" -BR2_LINUX_KERNEL_DEFCONFIG="pine64_star64" +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.12.57" +BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="starfive/jh7110-pine64-star64" BR2_LINUX_KERNEL_INSTALL_TARGET=y @@ -17,15 +18,18 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="100M" BR2_TARGET_OPENSBI=y BR2_TARGET_OPENSBI_PLAT="generic" -BR2_TARGET_OPENSBI_UBOOT_PAYLOAD=y +# BR2_TARGET_OPENSBI_INSTALL_JUMP_IMG is not set BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL=y -BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="$(call github,Fishwaldo,u-boot,172b47f62039605d6806fa96bd403c21cda28996)/u-boot-172b47f62039605d6806fa96bd403c21cda28996.tar.gz" -BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_star64" +BR2_TARGET_UBOOT_CUSTOM_VERSION=y +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.10" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="starfive_visionfive2" BR2_TARGET_UBOOT_NEEDS_OPENSSL=y +BR2_TARGET_UBOOT_NEEDS_GNUTLS=y +BR2_TARGET_UBOOT_NEEDS_OPENSBI=y +BR2_TARGET_UBOOT_USE_BINMAN=y +# BR2_TARGET_UBOOT_FORMAT_BIN is not set +BR2_TARGET_UBOOT_FORMAT_ITB=y BR2_TARGET_UBOOT_SPL=y +BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin.normal.out" BR2_PACKAGE_HOST_GENIMAGE=y -BR2_PACKAGE_HOST_STARFIVE_SPLTOOL=y -BR2_PACKAGE_HOST_UBOOT_TOOLS=y -BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y