[Buildroot] [git commit] configs/amarula_vyasa_rk3288: bump to Linux kernel 5.14.13 and u-boot 2021.10
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Date: 2021-10-24 14:05:49
Subsystem:
the rest · Maintainer:
Linus Torvalds
commit: https://git.buildroot.net/buildroot/commit/?id=e0ee4f4152e6d4f38b8ad32ae341d01bcdc3ad80 branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master This bumps to linux 5.14.13, linux-headers 5.14 and u-boot version 2021.10 and drop local uboot patch where CONFIG_SYS_BOOTM_LEN was set to 16MB because on u-boot 2021.10 it's now set to 64MB as default to make room for Linux images. Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> --- ...figs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch | 35 ---------------------- configs/amarula_vyasa_rk3288_defconfig | 9 +++--- 2 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/board/amarula/vyasa/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch b/board/amarula/vyasa/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch
deleted file mode 100644
index 64a147c09e..0000000000
--- a/board/amarula/vyasa/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch
+++ /dev/null@@ -1,35 +0,0 @@ -From 8ee2b03039cccf64402a72dea2185d7fe1972729 Mon Sep 17 00:00:00 2001 -From: Shyam Saini <shyam.saini@amarulasolutions.com> -Date: Mon, 15 Apr 2019 16:16:16 +0530 -Subject: [PATCH] include: configs: Increase CONFIG_SYS_BOOTM_LEN to 16MB - -The default value of CONFIG_SYS_BOOTM_LEN is 0x800000 i.e, 8MB which -causes board reset because of larger uImage size. - -Error log snippet: - Booting using the fdt blob at 0x1f00000 - Loading Kernel Image ... Image too large: increase CONFIG_SYS_BOOTM_LEN -Must RESET board to recover -resetting ... - -Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com> ---- - include/configs/rk3288_common.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h -index 72a54bc0ab..eab7cf4d86 100644 ---- a/include/configs/rk3288_common.h -+++ b/include/configs/rk3288_common.h -@@ -9,6 +9,8 @@ - #include <asm/arch/hardware.h> - #include "rockchip-common.h" - -+#define CONFIG_SYS_BOOTM_LEN (16 << 20) /* 16MB */ -+ - #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY - #define CONFIG_SYS_MALLOC_LEN (32 << 20) - #define CONFIG_SYS_CBSIZE 1024 --- -2.11.0 -
diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig
index 3b12da077c..916a639387 100644
--- a/configs/amarula_vyasa_rk3288_defconfig
+++ b/configs/amarula_vyasa_rk3288_defconfig@@ -3,14 +3,14 @@ BR2_arm=y BR2_cortex_a17=y BR2_ARM_FPU_NEON_VFPV4=y -# Linux headers same as kernel, a 5.11 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_11=y +# Linux headers same as kernel, a 5.14 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_14=y # Bootloader BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
@@ -22,7 +22,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin tpl/u-boot-tpl.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.11" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.14.13" BR2_LINUX_KERNEL_DEFCONFIG="multi_v7" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000"
@@ -44,4 +44,3 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/amarula/vyasa/genimage.cfg" BR2_ROOTFS_POST_BUILD_SCRIPT="board/amarula/vyasa/post-build.sh" -BR2_GLOBAL_PATCH_DIR="board/amarula/vyasa/patches/"
_______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot