[Buildroot] [PATCH 1/2] configs: asus_tinker_rk3288: Fix booting larger uImage

[Buildroot] [PATCH 1/2] configs: asus_tinker_rk3288: Fix booting larger uImage

[Shyam Saini]

Default value of CONFIG_SYS_BOOTM_LEN in u-boot causes board reset for
larger uImage files, so add u-boot patch to increase its size

Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
---
 ...figs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch | 35 ++++++++++++++++++++++
 configs/asus_tinker_rk3288_defconfig               |  1 +
 2 files changed, 36 insertions(+)
 create 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
new file mode 100644
index 0000000000..64a147c09e
--- /dev/null
+++ b/board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch
@@ -0,0 +1,35 @@
+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/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig
index a0df3de8a1..b14cb0a2c2 100644
--- a/configs/asus_tinker_rk3288_defconfig
+++ b/configs/asus_tinker_rk3288_defconfig
@@ -43,3 +43,4 @@ 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/"
-- 
2.11.0

[Buildroot] [PATCH 2/2] configs: asus_tinker_rk3288: Bump to the linux kernel 5.0 and u-boot 2019.01

[Shyam Saini]

This bumps to linux/linux-headers 5.0 and u-boot version 2019.01

Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
---
 configs/asus_tinker_rk3288_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/asus_tinker_rk3288_defconfig b/configs/asus_tinker_rk3288_defconfig
index b14cb0a2c2..e95a19a757 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 4.12 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_12=y
+# Linux headers same as kernel, a 5.0 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=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="2018.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01"
 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="4.12"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0"
 BR2_LINUX_KERNEL_DEFCONFIG="multi_v7"
 BR2_LINUX_KERNEL_UIMAGE=y
 BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x02000000"
-- 
2.11.0

[Buildroot] [PATCH 1/2] configs: asus_tinker_rk3288: Fix booting larger uImage

[Thomas Petazzoni]

Hello,

On Mon, 15 Apr 2019 20:04:08 +0530
Shyam Saini <shyam.saini@amarulasolutions.com> wrote:

> Default value of CONFIG_SYS_BOOTM_LEN in u-boot causes board reset for
> larger uImage files, so add u-boot patch to increase its size
> 
> Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
> ---
>  ...figs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch | 35 ++++++++++++++++++++++
>  configs/asus_tinker_rk3288_defconfig               |  1 +
>  2 files changed, 36 insertions(+)
>  create mode 100644 board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch

Both applied, thanks. Please send the U-Boot patch to U-Boot upstream.

Thanks,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [PATCH 1/2] configs: asus_tinker_rk3288: Fix booting larger uImage

[Shyam Saini]

> Hello,

Hi Thomas,
>
> On Mon, 15 Apr 2019 20:04:08 +0530
> Shyam Saini <shyam.saini@amarulasolutions.com> wrote:
>
> > Default value of CONFIG_SYS_BOOTM_LEN in u-boot causes board reset for
> > larger uImage files, so add u-boot patch to increase its size
> >
> > Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
> > ---
> >  ...figs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch | 35 ++++++++++++++++++++++
> >  configs/asus_tinker_rk3288_defconfig               |  1 +
> >  2 files changed, 36 insertions(+)
> >  create mode 100644 board/asus/tinker/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch
>
> Both applied, thanks. Please send the U-Boot patch to U-Boot upstream.

Thanks for the quick merge.

I've already sent the u-boot patch to the mailing.

[Buildroot] [PATCH 1/2] configs: asus_tinker_rk3288: Fix booting larger uImage

[Peter Korsgaard]

>>>>> "Shyam" == Shyam Saini <shyam.saini@amarulasolutions.com> writes:

 > Default value of CONFIG_SYS_BOOTM_LEN in u-boot causes board reset for
 > larger uImage files, so add u-boot patch to increase its size

 > Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>

Committed to 2019.02.x, thanks.

-- 
Bye, Peter Korsgaard