From cb3b484505d6e12766980aa7d83454460682c1e2 Mon Sep 17 00:00:00 2001 From: Giulio Benetti Date: Thu, 21 Oct 2021 19:07:26 +0200 Subject: [PATCH] configs/asus_tinker_rk3288: bump to Linux kernel 5.14.13 and u-boot 2021.10 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 Signed-off-by: Thomas Petazzoni --- ...Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch | 35 ------------------- configs/asus_tinker_rk3288_defconfig | 9 +++-- 2 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch diff --git a/board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch b/board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch deleted file mode 100644 index 64a147c09e..0000000000 --- a/board/asus/tinker/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 -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 ---- - 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 - #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/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig index e95a19a757..609d061b61 100644 --- a/configs/asus_tinker_rk3288_defconfig +++ b/configs/asus_tinker_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.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=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="2019.01" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="tinker-rk3288" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_NEEDS_OPENSSL=y @@ -22,7 +22,7 @@ BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl-dtb.bin" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0" +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" @@ -43,4 +43,3 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh" BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/asus/tinker/genimage.cfg" BR2_ROOTFS_POST_BUILD_SCRIPT="board/asus/tinker/post-build.sh" -BR2_GLOBAL_PATCH_DIR="board/asus/tinker/patches/"