diff --git a/board/pine64/rockpro64/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/pine64/rockpro64/patches/arm-trusted-firmware/arm-trusted-firmware.hash index 8b77e1f165..0bf70b5542 100644 --- a/board/pine64/rockpro64/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ b/board/pine64/rockpro64/patches/arm-trusted-firmware/arm-trusted-firmware.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 c0f23ccc71c49989e9ad238acf334473c17b7c88f79a20c829c3d443e3794a22 arm-trusted-firmware-v2.11-git4.tar.gz +sha256 6fd749e53c455aec3418288630544e7552bbffab4442ddc48b20ebef9aee87ff arm-trusted-firmware-v2.14-git4.tar.gz diff --git a/board/pine64/rockpro64/patches/linux-headers/linux-headers.hash b/board/pine64/rockpro64/patches/linux-headers/linux-headers.hash deleted file mode 120000 index 5808d92afe..0000000000 --- a/board/pine64/rockpro64/patches/linux-headers/linux-headers.hash +++ /dev/null @@ -1 +0,0 @@ -../linux/linux.hash \ No newline at end of file diff --git a/board/pine64/rockpro64/patches/linux/linux.hash b/board/pine64/rockpro64/patches/linux/linux.hash index 396c18dd5c..5810d3d580 100644 --- a/board/pine64/rockpro64/patches/linux/linux.hash +++ b/board/pine64/rockpro64/patches/linux/linux.hash @@ -1,2 +1,2 @@ # From https://cdn.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 55e5bcbc68d66776fc46896291f0a24844beb57817345a854d65e3d055fa423e linux-6.10.14.tar.xz +sha256 f850139ca5f79c1bf6bb8b32f92e212aadca97bdaef8a83a7cf4ac4d6a525fab linux-6.18.4.tar.xz diff --git a/board/pine64/rockpro64/patches/uboot/uboot.hash b/board/pine64/rockpro64/patches/uboot/uboot.hash index 904fa56c02..b6a925ea4e 100644 --- a/board/pine64/rockpro64/patches/uboot/uboot.hash +++ b/board/pine64/rockpro64/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally calculated -sha256 b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 u-boot-2024.10.tar.bz2 +sha256 b60d5865cefdbc75da8da4156c56c458e00de75a49b80c1a2e58a96e30ad0d54 u-boot-2026.01.tar.bz2 diff --git a/board/pine64/rockpro64/readme.txt b/board/pine64/rockpro64/readme.txt index de86970104..d2a865670a 100644 --- a/board/pine64/rockpro64/readme.txt +++ b/board/pine64/rockpro64/readme.txt @@ -20,7 +20,6 @@ output/images ├── rk3399-rockpro64.dtb ├── rootfs.ext2 ├── rootfs.ext4 -> rootfs.ext2 -├── rootfs.tar ├── sdcard.img ├── u-boot.bin └── u-boot.itb diff --git a/configs/rockpro64_defconfig b/configs/rockpro64_defconfig index d6c217e946..c31365ca6b 100644 --- a/configs/rockpro64_defconfig +++ b/configs/rockpro64_defconfig @@ -1,6 +1,8 @@ BR2_aarch64=y BR2_cortex_a72_a53=y -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_10=y +BR2_TOOLCHAIN_EXTERNAL=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN=y +BR2_TOOLCHAIN_EXTERNAL_BOOTLIN_AARCH64_GLIBC_STABLE=y BR2_GLOBAL_PATCH_DIR="board/pine64/rockpro64/patches" BR2_DOWNLOAD_FORCE_CHECK_HASHES=y BR2_TARGET_GENERIC_HOSTNAME="rockpro64" @@ -10,7 +12,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/pine64/rockpro64/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.10.14" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.4" BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/pine64/rockpro64/linux.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -19,17 +21,18 @@ BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y BR2_LINUX_KERNEL_NEEDS_HOST_PYTHON3=y BR2_TARGET_ROOTFS_EXT2=y BR2_TARGET_ROOTFS_EXT2_4=y -BR2_TARGET_ROOTFS_EXT2_SIZE="120M" +BR2_TARGET_ROOTFS_EXT2_SIZE="128M" +# BR2_TARGET_ROOTFS_TAR is not set BR2_TARGET_ARM_TRUSTED_FIRMWARE=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.11" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.14" BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="" BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2026.01" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rockpro64-rk3399" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y