diff --git a/board/friendlyarm/nanopi-r3s/patches/arm-trusted-firmware/arm-trusted-firmware.hash b/board/friendlyarm/nanopi-r3s/patches/arm-trusted-firmware/arm-trusted-firmware.hash deleted file mode 100644 index b5898cba3f..0000000000 --- a/board/friendlyarm/nanopi-r3s/patches/arm-trusted-firmware/arm-trusted-firmware.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 06b35a3596b8417bf66f7bfdd7acd181bcb53fc36dc13216227b5cae154e0219 arm-trusted-firmware-v2.12-git4.tar.gz diff --git a/board/friendlyarm/nanopi-r3s/patches/linux/linux.hash b/board/friendlyarm/nanopi-r3s/patches/linux/linux.hash index b2e8ee602b..451159a6dc 100644 --- a/board/friendlyarm/nanopi-r3s/patches/linux/linux.hash +++ b/board/friendlyarm/nanopi-r3s/patches/linux/linux.hash @@ -1,2 +1,2 @@ # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc -sha256 b80e0bc8efbc31e9ce5a84d1084dcccfa40e01bea8cc25afd06648b93d61339e linux-6.13.4.tar.xz +sha256 21817f1998e2230f81f7e4f605fa6fdcb040e14fa27d99c27ddb16ce749797a9 linux-6.14.6.tar.xz diff --git a/board/friendlyarm/nanopi-r3s/patches/uboot/uboot.hash b/board/friendlyarm/nanopi-r3s/patches/uboot/uboot.hash index f9bb6166d1..b550824126 100644 --- a/board/friendlyarm/nanopi-r3s/patches/uboot/uboot.hash +++ b/board/friendlyarm/nanopi-r3s/patches/uboot/uboot.hash @@ -1,2 +1,2 @@ # Locally computed: -sha256 e54102f17328397d5d63b00865e9108d5806d18018509fc24ce6e7e3fe6a12f1 u-boot-2025.04-rc2.tar.bz2 +sha256 439d3bef296effd54130be6a731c5b118be7fddd7fcc663ccbc5fb18294d8718 u-boot-2025.04.tar.bz2 diff --git a/configs/friendlyarm_nanopi_r3s_defconfig b/configs/friendlyarm_nanopi_r3s_defconfig index 5844c5bb4c..beeab11c5e 100644 --- a/configs/friendlyarm_nanopi_r3s_defconfig +++ b/configs/friendlyarm_nanopi_r3s_defconfig @@ -13,7 +13,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c $(BINARIES_DIR)/genimage.cfg" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.13.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.14.6" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/friendlyarm/nanopi-r3s/kernel.config" BR2_LINUX_KERNEL_DTS_SUPPORT=y @@ -29,14 +29,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_ROOTFS_EXT2_SIZE="32M" # 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.12" +BR2_TARGET_ARM_TRUSTED_FIRMWARE_LATEST_LTS_2_12_VERSION=y BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3568" BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES="bl31/bl31.elf" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.04-rc2" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2025.04" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r3s-rk3566" BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y BR2_TARGET_UBOOT_NEEDS_PYELFTOOLS=y