[Buildroot] [PATCH] configs/ci20: Use upstream Linux and U-Boot

[Buildroot] [PATCH] configs/ci20: Use upstream Linux and U-Boot

[Ezequiel Garcia]

From: Ezequiel Garcia <ezequiel@collabora.com>

The vendor kernel we are currently selecting no longer builds,
and fails with a ton of:

                 from include/linux/list.h:8,
                 from include/linux/module.h:9,
                 from arch/mips/jz4740/prom.c:16:
include/linux/log2.h:22:1: error: ignoring attribute 'noreturn' because it conflicts with attribute 'const' [-Werror=a
ttributes]
   22 | int ____ilog2_NaN(void);
      | ^~~

We can't afford to fix that, so let's just move to upstream
kernel and bootloader. It doesn't make much sense to keep
using an unsupported kernel and bootloader at this point.

This means we will be missing some of the features supported
by the vendor (such as HDMI support), but it is what it is.

Linux v5.7 and v5.4 have been tested to boot fine, the latter
is picked for the defconfig.

Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
---
 configs/ci20_defconfig | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/configs/ci20_defconfig b/configs/ci20_defconfig
index 8f2604b07c8e..081fb6e52ee6 100644
--- a/configs/ci20_defconfig
+++ b/configs/ci20_defconfig
@@ -2,9 +2,8 @@
 BR2_mipsel=y
 BR2_mips_xburst=y
 # BR2_MIPS_SOFT_FLOAT is not set
-
-# Linux headers same as kernel, a 3.18 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_3_18=y
+BR2_KERNEL_HEADERS_AS_KERNEL=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_4=y
 
 # system
 BR2_TARGET_GENERIC_GETTY_PORT="ttyS4"
@@ -15,19 +14,16 @@ BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/ci20/genimage.cfg"
 
 # kernel
 BR2_LINUX_KERNEL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="$(call github,MIPS,CI20_linux,7dff33297116643485ca37141d804eddd793e834)/linux-7dff33297116643485ca37141d804eddd793e834.tar.gz"
+BR2_LINUX_KERNEL_CUSTOM_VERSION=y
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.4.58"
 BR2_LINUX_KERNEL_DEFCONFIG="ci20"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 
 # u-boot
 BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BUILD_SYSTEM_LEGACY=y
-BR2_TARGET_UBOOT_BOARDNAME="ci20_mmc"
-BR2_TARGET_UBOOT_CUSTOM_GIT=y
-BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/MIPS/CI20_u-boot"
-BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="dd3c1b95dac7d10b2ca5806f65e5c1050d7dd0fa"
-BR2_TARGET_UBOOT_PATCH="board/ci20/patches/uboot"
+BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
+BR2_TARGET_UBOOT_LATEST_VERSION=y
+BR2_TARGET_UBOOT_BOARD_DEFCONFIG="ci20_mmc"
 BR2_TARGET_UBOOT_FORMAT_IMG=y
 BR2_TARGET_UBOOT_SPL=y
 BR2_TARGET_UBOOT_SPL_NAME="spl/u-boot-spl.bin"
-- 
2.27.0

[Buildroot] [PATCH] configs/ci20: Use upstream Linux and U-Boot

[Thomas Petazzoni]

Hello,

On Tue, 11 Aug 2020 12:44:29 -0300
Ezequiel Garcia via buildroot <buildroot@busybox.net> wrote:

> From: Ezequiel Garcia <ezequiel@collabora.com>
> 
> The vendor kernel we are currently selecting no longer builds,
> and fails with a ton of:
> 
>                  from include/linux/list.h:8,
>                  from include/linux/module.h:9,
>                  from arch/mips/jz4740/prom.c:16:
> include/linux/log2.h:22:1: error: ignoring attribute 'noreturn' because it conflicts with attribute 'const' [-Werror=a
> ttributes]
>    22 | int ____ilog2_NaN(void);
>       | ^~~
> 
> We can't afford to fix that, so let's just move to upstream
> kernel and bootloader. It doesn't make much sense to keep
> using an unsupported kernel and bootloader at this point.
> 
> This means we will be missing some of the features supported
> by the vendor (such as HDMI support), but it is what it is.
> 
> Linux v5.7 and v5.4 have been tested to boot fine, the latter
> is picked for the defconfig.

I've added a reference to the Gitlab CI failure here.

> +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> +BR2_TARGET_UBOOT_LATEST_VERSION=y

And changed this to use a fixed version instead of "latest version", so
that we're sure this defconfig will continue to build a U-Boot version
that was tested by someone.

Thanks!

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

[Buildroot] [PATCH] configs/ci20: Use upstream Linux and U-Boot

[Ezequiel Garcia]

On Wed, 12 Aug 2020 at 06:41, Thomas Petazzoni
<thomas.petazzoni@bootlin.com> wrote:
>
> Hello,
>
> On Tue, 11 Aug 2020 12:44:29 -0300
> Ezequiel Garcia via buildroot <buildroot@busybox.net> wrote:
>
> > From: Ezequiel Garcia <ezequiel@collabora.com>
> >
> > The vendor kernel we are currently selecting no longer builds,
> > and fails with a ton of:
> >
> >                  from include/linux/list.h:8,
> >                  from include/linux/module.h:9,
> >                  from arch/mips/jz4740/prom.c:16:
> > include/linux/log2.h:22:1: error: ignoring attribute 'noreturn' because it conflicts with attribute 'const' [-Werror=a
> > ttributes]
> >    22 | int ____ilog2_NaN(void);
> >       | ^~~
> >
> > We can't afford to fix that, so let's just move to upstream
> > kernel and bootloader. It doesn't make much sense to keep
> > using an unsupported kernel and bootloader at this point.
> >
> > This means we will be missing some of the features supported
> > by the vendor (such as HDMI support), but it is what it is.
> >
> > Linux v5.7 and v5.4 have been tested to boot fine, the latter
> > is picked for the defconfig.
>
> I've added a reference to the Gitlab CI failure here.
>
> > +BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
> > +BR2_TARGET_UBOOT_LATEST_VERSION=y
>
> And changed this to use a fixed version instead of "latest version", so
> that we're sure this defconfig will continue to build a U-Boot version
> that was tested by someone.
>

Great, Thanks!

Ezequiel