From 350bddf7efa17f5cc67023d2f4537b7f6d65fb41 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 10 Jan 2022 17:18:10 -0300 Subject: [PATCH] configs/mx6sx_udoo: bump U-Boot and kernel Bump U-Boot to 2022.01 and kernel to 5.15.13. After the conversion to U-Boot device model, the SD card is device '1', so change the boot script accordingly. Signed-off-by: Fabio Estevam Signed-off-by: Thomas Petazzoni --- board/udoo/common/boot.scr.txt | 6 +++--- configs/mx6sx_udoo_neo_defconfig | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/board/udoo/common/boot.scr.txt b/board/udoo/common/boot.scr.txt index 7acceed0fb..7a7d756c3c 100644 --- a/board/udoo/common/boot.scr.txt +++ b/board/udoo/common/boot.scr.txt @@ -1,7 +1,7 @@ -setenv finduuid "part uuid mmc 0:1 uuid" +setenv finduuid "part uuid mmc 1:1 uuid" run finduuid run findfdt setenv bootargs "console=${console} root=PARTUUID=${uuid} rootwait rootfstype=ext4" -load mmc 0:1 ${fdt_addr} boot/${fdtfile} -load mmc 0:1 ${loadaddr} boot/zImage +load mmc 1:1 ${fdt_addr} boot/${fdtfile} +load mmc 1:1 ${loadaddr} boot/zImage bootz ${loadaddr} - ${fdt_addr} diff --git a/configs/mx6sx_udoo_neo_defconfig b/configs/mx6sx_udoo_neo_defconfig index 2bdcade252..3e1dc33bd4 100644 --- a/configs/mx6sx_udoo_neo_defconfig +++ b/configs/mx6sx_udoo_neo_defconfig @@ -3,8 +3,8 @@ BR2_cortex_a9=y BR2_ARM_ENABLE_NEON=y BR2_ARM_ENABLE_VFP=y BR2_ARM_FPU_VFPV3=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 5.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y BR2_ROOTFS_POST_BUILD_SCRIPT="board/udoo/common/post-build.sh" BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/post-image.sh" BR2_TARGET_ROOTFS_EXT2=y @@ -12,13 +12,13 @@ BR2_TARGET_ROOTFS_EXT2_4=y BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="udoo_neo" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2022.01" BR2_TARGET_UBOOT_FORMAT_IMG=y BR2_TARGET_UBOOT_SPL=y BR2_TARGET_UBOOT_SPL_NAME="SPL" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.8.13" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.15.13" BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6sx-udoo-neo-basic imx6sx-udoo-neo-full imx6sx-udoo-neo-extended"