[Buildroot] [PATCH v2] configs/olimex_a64_olinuxino: bump to Linux kernel 5.15.7, u-boot 2021.10 and ATF v2.5
Arnout Vandecappelle
arnout at mind.be
Sun Dec 12 15:12:28 UTC 2021
On 12/12/2021 00:44, Giulio Benetti wrote:
> 1) Now u-boot needs SCP environment variable specified that can point to
> the or1k coprocessor firmware while if coprocessor is not used it must
> be passed /dev/null as we do in this case.
> 2) We now use the u-boot-sunxi-with-spl.bin instead of u-boot.itb since
> it's produced by u-boot anymore.
> 3) U-Boot 2021.10 requires python 3 and openssl so let's enable them.
> 4) Remove local patches for uboot and linux.
> 5) Remove global patches path from defconfig.
>
> Signed-off-by: Giulio Benetti <giulio.benetti at benettiengineering.com>
Applied to master, thanks.
Regards,
Arnout
> ---
> V1->V2:
> as pointed by Arnout:
> * improve commit log by removing repeated summary and using capital
> letters to begin a phrase
> * changed partition spl to partition u-boot in genimage.cfg since the
> pointed image is exactly the entire u-boot image and not the spl.
> * substituted BR2_TARGET_UBOOT_SPL/_SPL_NAME with
> BR2_TARGET_UBOOT_FORMAT_CUSTOM/_CUSTOM_NAME since again we don't deal
> with spl file but with spl+u-boot entire image.
> ---
> board/olimex/a64-olinuxino/genimage.cfg | 12 ++---
> ...ve-redundant-YYLOC-global-declaratio.patch | 52 -------------------
> ...e-redundant-YYLOC-global-declaration.patch | 28 ----------
> configs/olimex_a64_olinuxino_defconfig | 25 ++++-----
> 4 files changed, 14 insertions(+), 103 deletions(-)
> delete mode 100644 board/olimex/a64-olinuxino/patches/linux/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
> delete mode 100644 board/olimex/a64-olinuxino/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch
>
> diff --git a/board/olimex/a64-olinuxino/genimage.cfg b/board/olimex/a64-olinuxino/genimage.cfg
> index 44fcb3cb59..ac59e915d9 100644
> --- a/board/olimex/a64-olinuxino/genimage.cfg
> +++ b/board/olimex/a64-olinuxino/genimage.cfg
> @@ -14,17 +14,11 @@ image sdcard.img {
> hdimage {
> }
>
> - partition spl {
> - in-partition-table = "no"
> - image = "sunxi-spl.bin"
> - offset = 8K
> - }
> -
> partition u-boot {
> in-partition-table = "no"
> - image = "u-boot.itb"
> - offset = 40K
> - size = 1M # 1MB - 40K
> + image = "u-boot-sunxi-with-spl.bin"
> + offset = 8K
> + size = 1032K # 1MB - 8KB + 16KB(GPT)
> }
>
> partition boot {
> diff --git a/board/olimex/a64-olinuxino/patches/linux/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch b/board/olimex/a64-olinuxino/patches/linux/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
> deleted file mode 100644
> index 71ae991816..0000000000
> --- a/board/olimex/a64-olinuxino/patches/linux/0001-scripts-dtc-Remove-redundant-YYLOC-global-declaratio.patch
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -From f9df4186c17d686f1ca38f973d7a3a49e8e37c01 Mon Sep 17 00:00:00 2001
> -From: Dirk Mueller <dmueller at suse.com>
> -Date: Tue, 14 Jan 2020 18:53:41 +0100
> -Subject: [PATCH] scripts/dtc: Remove redundant YYLOC global declaration
> -
> -gcc 10 will default to -fno-common, which causes this error at link
> -time:
> -
> - (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here
> -
> -This is because both dtc-lexer as well as dtc-parser define the same
> -global symbol yyloc. Before with -fcommon those were merged into one
> -defintion. The proper solution would be to to mark this as "extern",
> -however that leads to:
> -
> - dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]
> - 26 | extern YYLTYPE yylloc;
> - | ^~~~~~
> -In file included from dtc-lexer.l:24:
> -dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here
> - 127 | extern YYLTYPE yylloc;
> - | ^~~~~~
> -cc1: all warnings being treated as errors
> -
> -which means the declaration is completely redundant and can just be
> -dropped.
> -
> -Signed-off-by: Dirk Mueller <dmueller at suse.com>
> -Signed-off-by: David Gibson <david at gibson.dropbear.id.au>
> -[robh: cherry-pick from upstream]
> -Cc: stable at vger.kernel.org
> -Signed-off-by: Rob Herring <robh at kernel.org>
> -Signed-off-by: Giulio Benetti <giulio.benetti at benettiengineering.com>
> ----
> - scripts/dtc/dtc-lexer.l | 1 -
> - 1 file changed, 1 deletion(-)
> -
> -diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
> -index 06c040902444..d1b3810156c7 100644
> ---- a/scripts/dtc/dtc-lexer.l
> -+++ b/scripts/dtc/dtc-lexer.l
> -@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n
> - #include "srcpos.h"
> - #include "dtc-parser.tab.h"
> -
> --YYLTYPE yylloc;
> - extern bool treesource_error;
> -
> - /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
> ---
> -2.25.1
> -
> diff --git a/board/olimex/a64-olinuxino/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch b/board/olimex/a64-olinuxino/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch
> deleted file mode 100644
> index ec60fc5825..0000000000
> --- a/board/olimex/a64-olinuxino/patches/uboot/0001-Remove-redundant-YYLOC-global-declaration.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From 018921ee79d3f30893614b3b2b63b588d8544f73 Mon Sep 17 00:00:00 2001
> -From: Peter Robinson <pbrobinson at gmail.com>
> -Date: Thu, 30 Jan 2020 09:37:15 +0000
> -Subject: [PATCH] Remove redundant YYLOC global declaration
> -
> -Same as the upstream fix for building dtc with gcc 10.
> -
> -Signed-off-by: Peter Robinson <pbrobinson at gmail.com>
> -Signed-off-by: Giulio Benetti <giulio.benetti at benettiengineering.com>
> ----
> - scripts/dtc/dtc-lexer.l | 1 -
> - 1 file changed, 1 deletion(-)
> -
> -diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
> -index fd825ebba6..24af549977 100644
> ---- a/scripts/dtc/dtc-lexer.l
> -+++ b/scripts/dtc/dtc-lexer.l
> -@@ -38,7 +38,6 @@ LINECOMMENT "//".*\n
> - #include "srcpos.h"
> - #include "dtc-parser.tab.h"
> -
> --YYLTYPE yylloc;
> - extern bool treesource_error;
> -
> - /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
> ---
> -2.20.1
> -
> diff --git a/configs/olimex_a64_olinuxino_defconfig b/configs/olimex_a64_olinuxino_defconfig
> index 7df52dfbdc..53e8c2ece5 100644
> --- a/configs/olimex_a64_olinuxino_defconfig
> +++ b/configs/olimex_a64_olinuxino_defconfig
> @@ -2,33 +2,30 @@ BR2_aarch64=y
> BR2_cortex_a53=y
> BR2_ARM_FPU_VFPV4=y
>
> -# System
> -BR2_GLOBAL_PATCH_DIR="board/olimex/a64-olinuxino/patches"
> -
> -# 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.15 series
> +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
>
> # Firmware
> BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://github.com/apritzel/arm-trusted-firmware.git"
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50iw1p1"
> -BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="aa75c8da415158a94b82a430b2b40000778e851f"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION=y
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_VERSION_VALUE="v2.5"
> +BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
> BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=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="a64-olinuxino"
> BR2_TARGET_UBOOT_NEEDS_DTC=y
> +BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
> BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
> +BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
> BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
> BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
> -BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
> -BR2_TARGET_UBOOT_SPL=y
> -BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
> +BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-sunxi-with-spl.bin"
> +BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="SCP=/dev/null"
> BR2_PACKAGE_HOST_UBOOT_TOOLS=y
> BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT=y
> BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot.cmd"
> @@ -36,7 +33,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/olimex/a64-olinuxino/boot
> # 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.15.7"
> BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
> BR2_LINUX_KERNEL_DTS_SUPPORT=y
> BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-olinuxino"
>
More information about the buildroot
mailing list