From: Sergey Matyukevich <geomatsi@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 27/28] configs/pine64_defconfig: bump BSP versions
Date: Wed, 9 Jun 2021 23:00:02 +0300 [thread overview]
Message-ID: <20210609200003.2866122-28-geomatsi@gmail.com> (raw)
In-Reply-To: <20210609200003.2866122-1-geomatsi@gmail.com>
Bump U-Boot and Linux kernel versions. Updating U-Boot to 2021.04
requires the following two changes.
First, after switching to binman, u-boot.itb is no more generated for
64-bit sunxi boards. Combined u-boot-sunxi-with-spl.bin image should
be used instead. This image contains SPL, U-Boot, and FIT image,
where FIT image contains other binaries such as BL31 and SCP.
Second, new U-Boot enables support for System Control Processor (SCP)
firmware. SCP firmware is included by default into FIT image in the
combined u-boot-sunxi-with-spl.bin binary. When SCP is not available
or not needed, it should be explicitly disabled by pointing to an
empty file. Support for Allwinner SCP firmware is not yet available
neither in Buildroot nor in mainline kernel. So disable it for now
using custom U-Boot build options.
Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
board/pine64/pine64/genimage.cfg | 10 ++--------
configs/pine64_defconfig | 14 +++++++-------
2 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/board/pine64/pine64/genimage.cfg b/board/pine64/pine64/genimage.cfg
index 2ff38d5415..f1f276a877 100644
--- a/board/pine64/pine64/genimage.cfg
+++ b/board/pine64/pine64/genimage.cfg
@@ -15,15 +15,9 @@ image sdcard.img {
partition spl {
in-partition-table = "no"
- image = "sunxi-spl.bin"
+ image = "u-boot-sunxi-with-spl.bin"
offset = 8192
- }
-
- partition u-boot {
- in-partition-table = "no"
- image = "u-boot.itb"
- offset = 40K
- size = 1M # 1MB - 40K
+ size = 1040384 # 1MB - 8KB
}
partition boot {
diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig
index 57a56da0ec..44c53fc4ff 100644
--- a/configs/pine64_defconfig
+++ b/configs/pine64_defconfig
@@ -2,8 +2,8 @@ BR2_aarch64=y
BR2_cortex_a53=y
BR2_ARM_FPU_VFPV4=y
-# 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.12 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
# Firmware
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,15 +17,15 @@ 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="2019.01"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_plus"
BR2_TARGET_UBOOT_NEEDS_DTC=y
+BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=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_SPL_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/pine64/pine64/boot.cmd"
@@ -33,7 +33,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/pine64/boot.cmd"
# 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.12.2"
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="allwinner/sun50i-a64-pine64"
--
2.31.1
next prev parent reply other threads:[~2021-06-09 20:00 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-09 19:59 [Buildroot] [PATCH v2 00/28] sunxi: use mainline arm-trusted-firmware Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 01/28] boot/arm-trusted-firmware: option to disable stack protection Sergey Matyukevich
2021-06-09 21:40 ` Thomas Petazzoni
2021-06-09 22:03 ` Sergey Matyukevich
2021-06-10 6:36 ` Heiko Thiery
2021-06-10 19:26 ` Sergey Matyukevich
2021-06-10 14:10 ` Thomas Petazzoni
2021-06-09 19:59 ` [Buildroot] [PATCH v2 02/28] support/testing: switch TestATFAllwinner to mainline ATF Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 03/28] support/testing/tests/boot/test_atf: update U-Boot in TestATFAllwinner Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 04/28] configs/orangepi_zero_plus2_defconfig: switch to mainline ATF Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 05/28] configs/bananapi_m64_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 06/28] configs/orangepi_zero_plus_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 07/28] configs/orangepi_pc2_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 08/28] configs/orangepi_prime_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 09/28] configs/orangepi_win_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 10/28] configs/friendlyarm_nanopi_a64_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 11/28] configs/friendlyarm_nanopi_neo2_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 12/28] configs/friendlyarm_nanopi_neo_plus2_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 13/28] configs/amarula_a64_relic_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 14/28] configs/olimex_a64_olinuxino_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 15/28] configs/pine64_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 16/28] configs/pine64_sopine_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 17/28] configs/orangepi-zero-plus2: bump BSP versions Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 18/28] configs/bananapi_m64_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 19/28] configs/orangepi_zero_plus_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 20/28] configs/orangepi_pc2_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 21/28] configs/orangepi_prime_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 22/28] configs/orangepi_win_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 23/28] configs/friendlyarm_nanopi_a64_defconfig: " Sergey Matyukevich
2021-06-09 19:59 ` [Buildroot] [PATCH v2 24/28] configs/friendlyarm_nanopi_neo2_defconfig: " Sergey Matyukevich
2021-06-09 20:00 ` [Buildroot] [PATCH v2 25/28] configs/friendlyarm_nanopi_neo_plus2_defconfig: " Sergey Matyukevich
2021-06-09 20:00 ` [Buildroot] [PATCH v2 26/28] configs/olimex_a64_olinuxino_defconfig: " Sergey Matyukevich
2021-06-09 20:00 ` Sergey Matyukevich [this message]
2021-06-09 20:00 ` [Buildroot] [PATCH v2 28/28] configs/pine64_sopine_defconfig: " Sergey Matyukevich
2021-06-10 13:22 ` [Buildroot] [PATCH v2 00/28] sunxi: use mainline arm-trusted-firmware Thomas Petazzoni
2021-06-10 19:37 ` Sergey Matyukevich
2021-06-24 21:25 ` Yann E. MORIN
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210609200003.2866122-28-geomatsi@gmail.com \
--to=geomatsi@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.