[Buildroot] [PATCH 1/4] configs/amarula_vyasa_rk3288: adjust U-Boot config to boot larger kernel image

[Buildroot] [PATCH 1/4] configs/amarula_vyasa_rk3288: adjust U-Boot config to boot larger kernel image

[Shyam Saini]

Default value of CONFIG_SYS_BOOTM_LEN in u-boot causes board reset for
large uImage files, so add u-boot patch to increase the maximum kernel
image size.

Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
---
 ...figs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch | 35 ++++++++++++++++++++++
 configs/amarula_vyasa_rk3288_defconfig             |  3 ++
 2 files changed, 38 insertions(+)
 create mode 100644 board/amarula/vyasa/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch

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
new file mode 100644
index 0000000000..64a147c09e
--- /dev/null
+++ b/board/amarula/vyasa/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/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig
index 88fb6abbec..c70958d530 100644
--- a/configs/amarula_vyasa_rk3288_defconfig
+++ b/configs/amarula_vyasa_rk3288_defconfig
@@ -44,3 +44,6 @@ 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/"
+
+
-- 
2.11.0

[Buildroot] [PATCH 2/4] configs/amarula_vyasa_rk3288: Bump to linux 5.0 and uboot 2019.01

[Shyam Saini]

Bump to linux/linux-headers 5.0 and u-boot version 2019.01
and use mainline linux.

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

diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig
index c70958d530..1394cd860a 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 4.14 series
-BR2_KERNEL_HEADERS_4_14=y
+# Linux headers same as kernel, a 5.0 series
+BR2_KERNEL_HEADERS_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.03"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="vyasa-rk3288"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
@@ -21,8 +21,8 @@ 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_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,openedev,linux-openedev,d127129e85a020879f334154300ddd3f7ec21c1e)/linux-d127129e85a020879f334154300ddd3f7ec21c1e.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+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 3/4] configs/bananapi_m2_plus: 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/bananapi_m2_plus_defconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configs/bananapi_m2_plus_defconfig b/configs/bananapi_m2_plus_defconfig
index bbc3eb0ebd..0e2d91d21b 100644
--- a/configs/bananapi_m2_plus_defconfig
+++ b/configs/bananapi_m2_plus_defconfig
@@ -1,12 +1,12 @@
 BR2_arm=y
 BR2_cortex_a7=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_13=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y
 BR2_TARGET_GENERIC_ISSUE="Welcome to Bananapi M2 Plus"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/sinovoip/m2-plus/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.13.3"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0"
 BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="sun8i-h3-bananapi-m2-plus"
@@ -16,7 +16,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.07"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Sinovoip_BPI_M2_Plus"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
-- 
2.11.0

[Buildroot] [PATCH 4/4] configs/bananapi_m64: 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/bananapi_m64_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/bananapi_m64_defconfig b/configs/bananapi_m64_defconfig
index 7d1ed18fbf..f7c01944cf 100644
--- a/configs/bananapi_m64_defconfig
+++ b/configs/bananapi_m64_defconfig
@@ -2,8 +2,8 @@ BR2_aarch64=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_VFPV4=y
 
-# Linux headers same as kernel, a 4.14 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
+# Linux headers same as kernel, a 5.0 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,7 +17,7 @@ BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2017.11"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
@@ -31,7 +31,7 @@ BR2_TARGET_UBOOT_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m64/boot.cmd"
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0"
 BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-bananapi-m64"
-- 
2.11.0

[Buildroot] [PATCH 1/4] configs/amarula_vyasa_rk3288: adjust U-Boot config to boot larger kernel image

[Thomas Petazzoni]

Hello,

On Fri, 19 Apr 2019 15:27:15 +0530
Shyam Saini <shyam.saini@amarulasolutions.com> wrote:

> Default value of CONFIG_SYS_BOOTM_LEN in u-boot causes board reset for
> large uImage files, so add u-boot patch to increase the maximum kernel
> image size.
> 
> Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>

I've applied to master, but please see some comments below.

> 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
> new file mode 100644
> index 0000000000..64a147c09e
> --- /dev/null
> +++ b/board/amarula/vyasa/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>

Could you submit this patch to upstream U-Boot, if not already done ?

> diff --git a/configs/amarula_vyasa_rk3288_defconfig b/configs/amarula_vyasa_rk3288_defconfig
> index 88fb6abbec..c70958d530 100644
> --- a/configs/amarula_vyasa_rk3288_defconfig
> +++ b/configs/amarula_vyasa_rk3288_defconfig
> @@ -44,3 +44,6 @@ 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/"
> +
> +

Please review your patches a bit more carefully before sending them:
you would have easily spotted that you added two useless empty lines at
the end of this file. I fixed that up when applying.

Thanks!

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

[Buildroot] [PATCH 2/4] configs/amarula_vyasa_rk3288: Bump to linux 5.0 and uboot 2019.01

[Thomas Petazzoni]

On Fri, 19 Apr 2019 15:27:16 +0530
Shyam Saini <shyam.saini@amarulasolutions.com> wrote:

> Bump to linux/linux-headers 5.0 and u-boot version 2019.01
> and use mainline linux.
> 
> Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
> ---
>  configs/amarula_vyasa_rk3288_defconfig | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)

Applied to master, thanks.

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

[Buildroot] [PATCH 3/4] configs/bananapi_m2_plus: Bump to the linux kernel 5.0 and u-boot 2019.01

[Thomas Petazzoni]

On Fri, 19 Apr 2019 15:27:17 +0530
Shyam Saini <shyam.saini@amarulasolutions.com> wrote:

> This bumps to linux/linux-headers 5.0 and u-boot version 2019.01
> 
> Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
> ---
>  configs/bananapi_m2_plus_defconfig | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)

Applied to master, thanks.

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

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

[Thomas Petazzoni]

On Fri, 19 Apr 2019 15:27:18 +0530
Shyam Saini <shyam.saini@amarulasolutions.com> wrote:

> This bumps to linux/linux-headers 5.0 and u-boot version 2019.01
> 
> Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>
> ---
>  configs/bananapi_m64_defconfig | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Applied to master, thanks.

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

[Buildroot] [PATCH 1/4] configs/amarula_vyasa_rk3288: adjust U-Boot config to boot larger kernel image

[Peter Korsgaard]

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

 > Default value of CONFIG_SYS_BOOTM_LEN in u-boot causes board reset for
 > large uImage files, so add u-boot patch to increase the maximum kernel
 > image size.

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

Committed to 2019.02.x, thanks.

-- 
Bye, Peter Korsgaard

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

[Thomas Petazzoni]

Hello,

On Fri, 19 Apr 2019 15:27:18 +0530
Shyam Saini <shyam.saini@amarulasolutions.com> wrote:

> This bumps to linux/linux-headers 5.0 and u-boot version 2019.01
> 
> Signed-off-by: Shyam Saini <shyam.saini@amarulasolutions.com>

Following this bump, this defconfig no longer builds:

  https://gitlab.com/buildroot.org/buildroot/-/jobs/259847578

The problem is:

scripts/extract-cert.c:21:25: fatal error: openssl/bio.h: No such file or directory
 #include <openssl/bio.h>

Which is fixed by adding BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y to the
defconfig. Could you send a patch doing this ?

Note that bananapro_defconfig seems to also be affected by the same issue:

  https://gitlab.com/buildroot.org/buildroot/-/jobs/259847598

Thanks,

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