All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] configs/amarula_vyasa_rk3288: bump to Linux kernel 5.14 and u-boot 2021.10
@ 2021-10-13 20:25 Giulio Benetti
  2021-10-20  0:10 ` Giulio Benetti
  0 siblings, 1 reply; 4+ messages in thread
From: Giulio Benetti @ 2021-10-13 20:25 UTC (permalink / raw)
  To: buildroot; +Cc: Giulio Benetti, Jagan Teki

This bumps to linux/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>
---
 ...Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch | 35 -------------------
 configs/amarula_vyasa_rk3288_defconfig        |  9 +++--
 2 files changed, 4 insertions(+), 40 deletions(-)
 delete 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
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..934348e1bd 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"
 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/"
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH] configs/amarula_vyasa_rk3288: bump to Linux kernel 5.14 and u-boot 2021.10
  2021-10-13 20:25 [Buildroot] [PATCH] configs/amarula_vyasa_rk3288: bump to Linux kernel 5.14 and u-boot 2021.10 Giulio Benetti
@ 2021-10-20  0:10 ` Giulio Benetti
  2021-10-21 17:08   ` [Buildroot] [PATCH v2] configs/amarula_vyasa_rk3288: bump to Linux kernel 5.14.13 " Giulio Benetti
  0 siblings, 1 reply; 4+ messages in thread
From: Giulio Benetti @ 2021-10-20  0:10 UTC (permalink / raw)
  To: buildroot; +Cc: Jagan Teki


> Il giorno 13 ott 2021, alle ore 22:32, Giulio Benetti <giulio.benetti@benettiengineering.com> ha scritto:
> 
> This bumps to linux/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>
> ---
> ...Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch | 35 -------------------
> configs/amarula_vyasa_rk3288_defconfig        |  9 +++--
> 2 files changed, 4 insertions(+), 40 deletions(-)
> delete 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
> 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..934348e1bd 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"

Here ^^^ I need to pass latest stable 5.14.13 not only 5.14

> 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/"
> -- 
> 2.25.1
> 

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
* [Buildroot] [PATCH v2] configs/amarula_vyasa_rk3288: bump to Linux kernel 5.14.13 and u-boot 2021.10
  2021-10-20  0:10 ` Giulio Benetti
@ 2021-10-21 17:08   ` Giulio Benetti
  2021-10-24 14:06     ` Thomas Petazzoni
  0 siblings, 1 reply; 4+ messages in thread
From: Giulio Benetti @ 2021-10-21 17:08 UTC (permalink / raw)
  To: buildroot; +Cc: Giulio Benetti, Jagan Teki

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>
---
V1->V2:
* use latest stable Linux version 5.14.13 instead of 5.14
---
 ...Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch | 35 -------------------
 configs/amarula_vyasa_rk3288_defconfig        |  9 +++--
 2 files changed, 4 insertions(+), 40 deletions(-)
 delete 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
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/"
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [Buildroot] [PATCH v2] configs/amarula_vyasa_rk3288: bump to Linux kernel 5.14.13 and u-boot 2021.10
  2021-10-21 17:08   ` [Buildroot] [PATCH v2] configs/amarula_vyasa_rk3288: bump to Linux kernel 5.14.13 " Giulio Benetti
@ 2021-10-24 14:06     ` Thomas Petazzoni
  0 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2021-10-24 14:06 UTC (permalink / raw)
  To: Giulio Benetti; +Cc: Jagan Teki, buildroot

On Thu, 21 Oct 2021 19:08:04 +0200
Giulio Benetti <giulio.benetti@benettiengineering.com> wrote:

> 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>
> ---
> V1->V2:
> * use latest stable Linux version 5.14.13 instead of 5.14
> ---
>  ...Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch | 35 -------------------
>  configs/amarula_vyasa_rk3288_defconfig        |  9 +++--
>  2 files changed, 4 insertions(+), 40 deletions(-)
>  delete mode 100644 board/amarula/vyasa/patches/uboot/0001-include-configs-Increase-CONFIG_SYS_BOOTM_LEN-to-16M.patch

Applied to master, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-24 14:06 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-13 20:25 [Buildroot] [PATCH] configs/amarula_vyasa_rk3288: bump to Linux kernel 5.14 and u-boot 2021.10 Giulio Benetti
2021-10-20  0:10 ` Giulio Benetti
2021-10-21 17:08   ` [Buildroot] [PATCH v2] configs/amarula_vyasa_rk3288: bump to Linux kernel 5.14.13 " Giulio Benetti
2021-10-24 14:06     ` Thomas Petazzoni

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.