diff mbox series

[1/2] configs/rockpro64_defconfig: bump ATF to 2.9, U-Boot to 2023.07 and Linux to 6.5.7

Message ID 20231014184521.87527-1-giulio.benetti@benettiengineering.com
State Accepted
Headers show
Series [1/2] configs/rockpro64_defconfig: bump ATF to 2.9, U-Boot to 2023.07 and Linux to 6.5.7 | expand

Commit Message

Giulio Benetti Oct. 14, 2023, 6:45 p.m. UTC 
Also, since wi ith Linux commit [1] it's been defined the mmc* order
making sd-card number to be 1 instead of 0. This prevent to boot from
mmc0 with Linux version 5.10+ so let's change mmcblk0p4 to mmcblk1p4 in
extlinux.conf in order to boot since we bump to Linux 6.5.7

[1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0011c6d182774fc781fb9e115ebe8baa356029ae

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
 board/pine64/rockpro64/extlinux.conf |  2 +-
 configs/rockpro64_defconfig          | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

Comments

Thomas Petazzoni Nov. 2, 2023, 5:50 p.m. UTC | #1 
On Sat, 14 Oct 2023 20:45:20 +0200
Giulio Benetti <giulio.benetti@benettiengineering.com> wrote:

> Also, since wi ith Linux commit [1] it's been defined the mmc* order
> making sd-card number to be 1 instead of 0. This prevent to boot from
> mmc0 with Linux version 5.10+ so let's change mmcblk0p4 to mmcblk1p4 in
> extlinux.conf in order to boot since we bump to Linux 6.5.7
> 
> [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0011c6d182774fc781fb9e115ebe8baa356029ae
> 
> Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
> ---
>  board/pine64/rockpro64/extlinux.conf |  2 +-
>  configs/rockpro64_defconfig          | 10 +++++-----
>  2 files changed, 6 insertions(+), 6 deletions(-)

Series applied to master, thanks!

Thomas
diff mbox series

Patch

diff --git a/board/pine64/rockpro64/extlinux.conf b/board/pine64/rockpro64/extlinux.conf
index ea081a1f0b..83467ef43c 100644
--- a/board/pine64/rockpro64/extlinux.conf
+++ b/board/pine64/rockpro64/extlinux.conf
@@ -1,4 +1,4 @@ 
 label RK3399_ROCKPRO64 linux
   kernel /Image
   devicetree /rk3399-rockpro64.dtb
-  append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk0p4 rw rootwait
+  append earlycon=uart8250,mmio32,0xff1a0000 root=/dev/mmcblk1p4 rw rootwait
diff --git a/configs/rockpro64_defconfig b/configs/rockpro64_defconfig
index d39640f855..4704ac7206 100644
--- a/configs/rockpro64_defconfig
+++ b/configs/rockpro64_defconfig
@@ -2,13 +2,13 @@ 
 BR2_aarch64=y
 BR2_cortex_a72_a53=y
 
-# Linux headers same as kernel, a 5.8 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_8=y
+# Linux headers same as kernel, a 6.5 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_5=y
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.7"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.9.0"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="rk3399"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN=y
@@ -18,7 +18,7 @@  BR2_TARGET_ARM_TRUSTED_FIRMWARE_IMAGES=""
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2023.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rockpro64-rk3399"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
@@ -32,7 +32,7 @@  BR2_TARGET_UBOOT_SPL_NAME="idbloader.img"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.2"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.5.7"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3399-rockpro64"