diff mbox series

[1/1] configs/imx23evk: bump Linux and U-Boot

Message ID 20240309212346.1642309-1-ju.o@free.fr
State New
Headers show
Series [1/1] configs/imx23evk: bump Linux and U-Boot | expand

Commit Message

Julien Olivain March 9, 2024, 9:23 p.m. UTC 
The imx23evk_defconfig fail to build the Kernel with message:

    arch/arm/mm/proc-arm926.S: Assembler messages:
    arch/arm/mm/proc-arm926.S:477: Error: junk at end of line, first unrecognized character is '#'

The upstream fix is [1] introduced in Kernel v5.5.

This commit fixes this issue by updating the Kernel. While at it,
U-Boot is also updated. The Kernel DTS name is also updated, to follow
the reorganization in [2], first included in v6.5.

Fixes:
- https://gitlab.com/buildroot.org/buildroot/-/jobs/6338079204

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=790756c7e0229dedc83bf058ac69633045b1000e
[2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=724ba6751532055db75992fc6ae21c3e322e94a7

Signed-off-by: Julien Olivain <ju.o@free.fr>
---
 configs/imx23evk_defconfig | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/configs/imx23evk_defconfig b/configs/imx23evk_defconfig
index 94d159cf9e5..b54af418eb1 100644
--- a/configs/imx23evk_defconfig
+++ b/configs/imx23evk_defconfig
@@ -2,8 +2,8 @@ 
 BR2_arm=y
 BR2_arm926t=y
 
-# Linux headers same as kernel, a 4.8 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_8=y
+# Linux headers same as kernel, a 6.6 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_6=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
@@ -11,16 +11,16 @@  BR2_TARGET_GENERIC_GETTY_PORT="ttyAMA0"
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.8.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.6.21"
 BR2_LINUX_KERNEL_DEFCONFIG="mxs"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-evk"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="nxp/mxs/imx23-evk"
 
 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="mx23evk"
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2024.01"
 BR2_TARGET_UBOOT_FORMAT_SD=y
 
 # Filesystem