Skip to contentSkip to conversation

sunxi: use mainline arm-trusted-firmware

PATCH Superseded Sergey Matyukevich 4 participants 37 messages Jun 9, 2021 – Jun 24, 2021

lore
Share & tools
lore
#0 lore raw

v2 cover sunxi: use mainline arm-trusted-firmware

Hi all,

This is the second revision of the patch set that updates BSP on H5/A64 sunxi boards. The following changes are suggested:

- introduce new ATF option to explicitly disable GCC stack protection when platform does not support it
- switch from early Allwinner ATF port to mainline ATF for all H6/A64 boards
- bump Linux kernel version
- bump U-Boot version
-- switch to combined u-boot-sunxi-with-spl.bin image
-- for now disable support for Allwinner SCP firmware

Note that only ATF is modified for amarula_a64_relic_defconfig. That board uses vendor kernel from their github repo. I do not have any idea which tag/branch is better to use.

Finally, let me re-iterate once again: I have only orangepi-zero-plus2 board at my disposal. So only this board has been tested. For all the other boards only build tests have been completed. ATF provides only basic support for H5/A64 and SCP firmware is disabled, so I do not expect any surprises here. But still, any help with boot tests on other H5/A64 sunxi boards is more than welcome.

Regards,
Sergey

v2:
- as per Heiko Thiery suggestion, bump mainline ATF version to v2.5
- cleanup commit messages: use 'mainline' instead of 'upstream'

Sergey Matyukevich (28):
boot/arm-trusted-firmware: option to disable stack protection support/testing: switch TestATFAllwinner to mainline ATF support/testing/tests/boot/test_atf: update U-Boot in TestATFAllwinner configs/orangepi_zero_plus2_defconfig: switch to mainline ATF configs/bananapi_m64_defconfig: switch to mainline ATF configs/orangepi_zero_plus_defconfig: switch to mainline ATF configs/orangepi_pc2_defconfig: switch to mainline ATF configs/orangepi_prime_defconfig: switch to mainline ATF configs/orangepi_win_defconfig: switch to mainline ATF configs/friendlyarm_nanopi_a64_defconfig: switch to mainline ATF configs/friendlyarm_nanopi_neo2_defconfig: switch to mainline ATF configs/friendlyarm_nanopi_neo_plus2_defconfig: switch to mainline ATF configs/amarula_a64_relic_defconfig: switch to mainline ATF configs/olimex_a64_olinuxino_defconfig: switch to mainline ATF configs/pine64_defconfig: switch to mainline ATF configs/pine64_sopine_defconfig: switch to mainline ATF configs/orangepi-zero-plus2: bump BSP versions configs/bananapi_m64_defconfig: bump BSP versions configs/orangepi_zero_plus_defconfig: bump BSP versions configs/orangepi_pc2_defconfig: bump BSP versions configs/orangepi_prime_defconfig: bump BSP versions configs/orangepi_win_defconfig: bump BSP versions configs/friendlyarm_nanopi_a64_defconfig: bump BSP versions configs/friendlyarm_nanopi_neo2_defconfig: bump BSP versions configs/friendlyarm_nanopi_neo_plus2_defconfig: bump BSP versions configs/olimex_a64_olinuxino_defconfig: bump BSP versions configs/pine64_defconfig: bump BSP versions configs/pine64_sopine_defconfig: bump BSP versions

 board/bananapi/bananapi-m64/genimage.cfg      | 10 ++------
 board/friendlyarm/nanopi-a64/genimage.cfg     | 10 ++------
 .../friendlyarm/nanopi-neo-plus2/genimage.cfg | 10 ++------
 board/friendlyarm/nanopi-neo2/genimage.cfg    | 10 ++------
 board/olimex/a64-olinuxino/genimage.cfg       | 10 ++------
 board/orangepi/orangepi-pc2/genimage.cfg      | 10 ++------
 board/orangepi/orangepi-prime/genimage.cfg    | 10 ++------
 board/orangepi/orangepi-win/genimage.cfg      | 10 ++------
 .../orangepi/orangepi-zero-plus/genimage.cfg  | 10 ++------
 .../orangepi/orangepi-zero-plus2/genimage.cfg | 10 ++------
 board/pine64/pine64/genimage.cfg              | 10 ++------
 board/pine64/sopine/genimage.cfg              | 10 ++------
 boot/arm-trusted-firmware/Config.in           |  7 ++++++
 .../arm-trusted-firmware.mk                   |  4 ++++
 configs/amarula_a64_relic_defconfig           |  8 +++----
 configs/bananapi_m64_defconfig                | 21 ++++++++---------
 configs/friendlyarm_nanopi_a64_defconfig      | 21 ++++++++---------
 configs/friendlyarm_nanopi_neo2_defconfig     | 21 ++++++++---------
 .../friendlyarm_nanopi_neo_plus2_defconfig    | 20 ++++++++--------
 configs/olimex_a64_olinuxino_defconfig        | 21 ++++++++---------
 configs/orangepi_pc2_defconfig                | 21 ++++++++---------
 configs/orangepi_prime_defconfig              | 21 ++++++++---------
 configs/orangepi_win_defconfig                | 23 ++++++++++---------
 configs/orangepi_zero_plus2_defconfig         | 19 ++++++++-------
 configs/orangepi_zero_plus_defconfig          | 19 ++++++++-------
 configs/pine64_defconfig                      | 22 +++++++++---------
 configs/pine64_sopine_defconfig               | 21 ++++++++---------
 support/testing/tests/boot/test_atf.py        | 16 ++++++-------
 28 files changed, 168 insertions(+), 237 deletions(-)
Signature · 1 line
2.31.1
#1 lore raw

PATCH v2 1/28 boot/arm-trusted-firmware: option to disable stack protection

Default value for ATF build flag ENABLE_STACK_PROTECTOR is "none". Buildroot sets appropriate ENABLE_STACK_PROTECTOR build flag value based on the enabled BR2_SSP_* options. For any values other than "none", ATF platform specific hook 'plat_get_stack_protector_canary' should be implemented. However this hook is not implemented by all the platforms supported by ATF. For instance, allwinner does not provide such a hook.

Add new option BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP to disable GCC stack protecton when selected ATF platform does not provide support for this feature.

---
 boot/arm-trusted-firmware/Config.in               | 7 +++++++
 boot/arm-trusted-firmware/arm-trusted-firmware.mk | 4 ++++
 2 files changed, 11 insertions(+)
boot/arm-trusted-firmware/Config.in +7 -0
index a5a8c5bfc3..ba371986d8 100644
@@ -188,4 +188,11 @@ config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN
 	  Select this option if your ATF board configuration requires
 	  an ARM32 bare metal toolchain to be available.
 
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP
+	bool "Disable stack protection"
+	help
+	  Select this option to explicitly disable stack protection checks in GCC.
+	  Such checks need to be disabled if ATF platform port does not implement
+	  plat_get_stack_protector_canary() hook.
+
 endif
boot/arm-trusted-firmware/arm-trusted-firmware.mk +4 -0
index 279658712b..00d20aac94 100644
@@ -109,6 +109,9 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += MV_DDR_PATH=$(MV_DDR_MARVELL_DIR)
 ARM_TRUSTED_FIRMWARE_DEPENDENCIES += mv-ddr-marvell
 endif
 
+ifeq ($(BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP),y)
+ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=none
+else
 ifeq ($(BR2_SSP_REGULAR),y)
 ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=default
 else ifeq ($(BR2_SSP_STRONG),y)
@@ -116,6 +119,7 @@ ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=strong
 else ifeq ($(BR2_SSP_ALL),y)
 ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=all
 endif
+endif
 
 ARM_TRUSTED_FIRMWARE_MAKE_TARGETS = all
 
Signature · 1 line
2.31.1
#2 lore raw

PATCH v2 1/28 boot/arm-trusted-firmware: option to disable stack protection

boot/arm-trusted-firmware/Config.in config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN · line 196

Quoted 6 lines · On Wed, 9 Jun 2021 22:59:36 +0300 Sergey Matyukevich <[email protected]>…
boot/arm-trusted-firmware/Config.in +6 -0
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP
+	bool "Disable stack protection"
+	help
+	  Select this option to explicitly disable stack protection checks in GCC.
+	  Such checks need to be disabled if ATF platform port does not implement
+	  plat_get_stack_protector_canary() hook.

It's a bit annoying that we have to tell TF-A about this. If TF-A doesn't implement plat_get_stack_protector_canary() for a certain platform, why does it try to enable SSP ? It feels like something that should be fixed in TF-A.

Thomas

Signature · 3 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#3 lore raw

PATCH v2 1/28 boot/arm-trusted-firmware: option to disable stack protection

Hello Thomas,

Quoted 11 lines

boot/arm-trusted-firmware/Config.in config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN · line 196

Quoted 6 lines
boot/arm-trusted-firmware/Config.in +6 -0
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP
+	bool "Disable stack protection"
+	help
+	  Select this option to explicitly disable stack protection checks in GCC.
+	  Such checks need to be disabled if ATF platform port does not implement
+	  plat_get_stack_protector_canary() hook.

It's a bit annoying that we have to tell TF-A about this. If TF-A doesn't implement plat_get_stack_protector_canary() for a certain platform, why does it try to enable SSP ? It feels like something that should be fixed in TF-A.

TF-A does not attempt to enable those protection checks. This is controlled by its ENABLE_STACK_PROTECTOR build flag, which default value is 'none'. This is Buildroot who tries to enable TF-A stack protection checks depending on BR2_SSP_* toolchain features only:
see arm-trusted-firmware.mk.

Regards,
Sergey

#4 lore raw

PATCH v2 1/28 boot/arm-trusted-firmware: option to disable stack protection

Hi Thomas, Hi Sergey,

Am Do., 10. Juni 2021 um 00:03 Uhr schrieb Sergey Matyukevich <[email protected]>:

Quoted 15 lines

Hello Thomas,

Quoted 11 lines

boot/arm-trusted-firmware/Config.in config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN · line 196

Quoted 6 lines
boot/arm-trusted-firmware/Config.in +6 -0
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP
+   bool "Disable stack protection"
+   help
+     Select this option to explicitly disable stack protection checks in GCC.
+     Such checks need to be disabled if ATF platform port does not implement
+     plat_get_stack_protector_canary() hook.

It's a bit annoying that we have to tell TF-A about this. If TF-A doesn't implement plat_get_stack_protector_canary() for a certain platform, why does it try to enable SSP ? It feels like something that should be fixed in TF-A.

Quoted 5 lines

TF-A does not attempt to enable those protection checks. This is controlled by its ENABLE_STACK_PROTECTOR build flag, which default value is 'none'. This is Buildroot who tries to enable TF-A stack protection checks depending on BR2_SSP_* toolchain features only:
see arm-trusted-firmware.mk.

with commit 810ba387 we enabled SSP by default. And in the ATF makefile we map that setting to atf ENABLE_STACK_PROTECTOR setting. As this we force to use SSP in atf. But you're right this should be handled in the TF-A stack. I tried to get some feedback from the TF-A guys [1] but there is no helpful answer. So for now I think it is a quick solution to make it possible to disable SSP for ATF like that.

On the other hand, does it make any sense at all to automatically take over the SSP setting from the compiler options?

[1] https://lists.trustedfirmware.org/pipermail/tf-a/2021-May/001152.html

Quoted 3 lines

Regards,
Sergey

#5 lore raw

PATCH v2 1/28 boot/arm-trusted-firmware: option to disable stack protection

Hello Thomas, Heiko

Quoted 25 lines
Quoted 12 lines
Quoted 11 lines

boot/arm-trusted-firmware/Config.in config BR2_TARGET_ARM_TRUSTED_FIRMWARE_NEEDS_ARM32_TOOLCHAIN · line 196

Quoted 6 lines
boot/arm-trusted-firmware/Config.in +6 -0
+config BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP
+   bool "Disable stack protection"
+   help
+     Select this option to explicitly disable stack protection checks in GCC.
+     Such checks need to be disabled if ATF platform port does not implement
+     plat_get_stack_protector_canary() hook.

It's a bit annoying that we have to tell TF-A about this. If TF-A doesn't implement plat_get_stack_protector_canary() for a certain platform, why does it try to enable SSP ? It feels like something that should be fixed in TF-A.

Quoted 5 lines

TF-A does not attempt to enable those protection checks. This is controlled by its ENABLE_STACK_PROTECTOR build flag, which default value is 'none'. This is Buildroot who tries to enable TF-A stack protection checks depending on BR2_SSP_* toolchain features only:
see arm-trusted-firmware.mk.

with commit 810ba387 we enabled SSP by default. And in the ATF makefile we map that setting to atf ENABLE_STACK_PROTECTOR setting. As this we force to use SSP in atf. But you're right this should be handled in the TF-A stack. I tried to get some feedback from the TF-A guys [1] but there is no helpful answer. So for now I think it is a quick solution to make it possible to disable SSP for ATF like that.

Quoted 4 lines

On the other hand, does it make any sense at all to automatically take over the SSP setting from the compiler options?

[1] https://lists.trustedfirmware.org/pipermail/tf-a/2021-May/001152.html

I would also agree that it might not be always convenient to automatically infer TF-A SSP settings from the compiler options. Imagine the case when secure memory constraints become an issue and all the extra features need to be tuned or disabled in order to shrink TF-A firmware image.

So what if we leave the right to choose to the user ? I mean something like the following menu in TF-A Config.in:

choice
prompt "TF-A GCC stack protection"
help
Select TF-A GCC stack protection. Note that for all values other than 'none' the plat_get_stack_protector_canary() platform hook needs to be implemented.

config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_NONE
bool "none"

config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_DEFAULT
bool "default"
depends on BR2_SSP_REGULAR

config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_STRONG
bool "strong"
depends on BR2_SSP_STRONG

config BR2_TARGET_ARM_TRUSTED_FIRMWARE_SSP_ALL
bool "all"
depends on BR2_SSP_ALL

endchoice

Regards,
Sergey

#6 lore raw

PATCH v2 1/28 boot/arm-trusted-firmware: option to disable stack protection

In reply to Sergey Matyukevich

Hello,

Quoted 10 lines · On Thu, 10 Jun 2021 01:03:56 +0300 Sergey Matyukevich <[email protected]>…
Quoted 4 lines

It's a bit annoying that we have to tell TF-A about this. If TF-A doesn't implement plat_get_stack_protector_canary() for a certain platform, why does it try to enable SSP ? It feels like something that should be fixed in TF-A.

TF-A does not attempt to enable those protection checks. This is controlled by its ENABLE_STACK_PROTECTOR build flag, which default value is 'none'. This is Buildroot who tries to enable TF-A stack protection checks depending on BR2_SSP_* toolchain features only:
see arm-trusted-firmware.mk.

I think:

ifeq ($(BR2_SSP_REGULAR),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=default else ifeq ($(BR2_SSP_STRONG),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=strong else ifeq ($(BR2_SSP_ALL),y) ARM_TRUSTED_FIRMWARE_MAKE_OPTS += ENABLE_STACK_PROTECTOR=all endif

is probably not great. BR2_SSP_* should really only affect user-space code, IMO. For bare-metal/bootloader code, handling SSP really requires special support, so we should probably not force it.

That being said, it's a bit weird for TF-A to provide that ENABLE_STACK_PROTECTOR option in a way that doesn't build/work on all platforms.

Thomas

Signature · 3 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#7 lore raw

PATCH v2 2/28 support/testing: switch TestATFAllwinner to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 support/testing/tests/boot/test_atf.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
support/testing/tests/boot/test_atf.py +5 -4
index e6c11aa742..868b13c9e6 100644
@@ -33,10 +33,11 @@ class TestATFAllwinner(infra.basetest.BRTest):
         BR2_TOOLCHAIN_EXTERNAL=y
         BR2_TOOLCHAIN_EXTERNAL_LINARO_AARCH64=y
         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=y
+        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_DISABLE_SSP=y
         BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
         BR2_TARGET_UBOOT=y
         BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
Signature · 1 line
2.31.1
#8 lore raw

PATCH v2 3/28 support/testing/tests/boot/test_atf: update U-Boot in TestATFAllwinner

In reply to Sergey Matyukevich

Bump U-Boot version in TestATFAllwinner. Updating U-Boot version 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.

---
 support/testing/tests/boot/test_atf.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
support/testing/tests/boot/test_atf.py +3 -4
index 868b13c9e6..8f7c8e5650 100644
@@ -42,16 +42,15 @@ class TestATFAllwinner(infra.basetest.BRTest):
         BR2_TARGET_UBOOT=y
         BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
         BR2_TARGET_UBOOT_CUSTOM_VERSION=y
-        BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2020.10"
+        BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
         BR2_TARGET_UBOOT_BOARD_DEFCONFIG="bananapi_m64"
         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"
         """
 
     def test_run(self):
Signature · 1 line
2.31.1
#9 lore raw

PATCH v2 4/28 configs/orangepi_zero_plus2_defconfig: switch to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 configs/orangepi_zero_plus2_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/orangepi_zero_plus2_defconfig +4 -4
index aa4c5c9413..b5f35da9b3 100644
@@ -8,10 +8,10 @@ BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay"
 
 # 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_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
2.31.1
#10 lore raw

PATCH v2 5/28 configs/bananapi_m64_defconfig: switch to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 configs/bananapi_m64_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/bananapi_m64_defconfig +4 -4
index b93332ed21..12025d6e29 100644
@@ -7,10 +7,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=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_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
2.31.1
#11 lore raw

PATCH v2 6/28 configs/orangepi_zero_plus_defconfig: switch to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 configs/orangepi_zero_plus_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/orangepi_zero_plus_defconfig +4 -4
index cf82f8b3cc..790dfff276 100644
@@ -8,10 +8,10 @@ BR2_SYSTEM_DHCP="eth0"
 
 # 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_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
2.31.1
#12 lore raw

PATCH v2 7/28 configs/orangepi_pc2_defconfig: switch to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 configs/orangepi_pc2_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/orangepi_pc2_defconfig +4 -4
index c7e17c8eb1..3cd8bdb82b 100644
@@ -7,10 +7,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=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_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
2.31.1
#13 lore raw

PATCH v2 8/28 configs/orangepi_prime_defconfig: switch to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 configs/orangepi_prime_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/orangepi_prime_defconfig +4 -4
index f8f958c67b..d79d764fec 100644
@@ -7,10 +7,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=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_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
2.31.1
#14 lore raw

PATCH v2 9/28 configs/orangepi_win_defconfig: switch to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 configs/orangepi_win_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/orangepi_win_defconfig +4 -4
index 715ff3b711..882cfc360c 100644
@@ -7,10 +7,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=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_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
2.31.1
#15 lore raw

PATCH v2 10/28 configs/friendlyarm_nanopi_a64_defconfig: switch to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 configs/friendlyarm_nanopi_a64_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/friendlyarm_nanopi_a64_defconfig +4 -4
index 4df22b2a2f..afb338e653 100644
@@ -7,10 +7,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=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_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
2.31.1
#16 lore raw

PATCH v2 11/28 configs/friendlyarm_nanopi_neo2_defconfig: switch to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 configs/friendlyarm_nanopi_neo2_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/friendlyarm_nanopi_neo2_defconfig +4 -4
index 9262737b88..90d96f9e28 100644
@@ -7,10 +7,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=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_DISABLE_SSP=y
 R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
2.31.1
#17 lore raw

PATCH v2 12/28 configs/friendlyarm_nanopi_neo_plus2_defconfig: switch to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 configs/friendlyarm_nanopi_neo_plus2_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/friendlyarm_nanopi_neo_plus2_defconfig +4 -4
index 461e468cb6..730ff3ee6f 100644
@@ -8,10 +8,10 @@ BR2_ROOTFS_OVERLAY="board/friendlyarm/nanopi-neo-plus2/rootfs_overlay"
 
 # 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_DISABLE_SSP=y
 R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
2.31.1
#18 lore raw

PATCH v2 13/28 configs/amarula_a64_relic_defconfig: switch to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 configs/amarula_a64_relic_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/amarula_a64_relic_defconfig +4 -4
index 304a3ef824..1e7943635d 100644
@@ -7,10 +7,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_17=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_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
2.31.1
#19 lore raw

PATCH v2 14/28 configs/olimex_a64_olinuxino_defconfig: switch to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 configs/olimex_a64_olinuxino_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/olimex_a64_olinuxino_defconfig +4 -4
index e35c6014bd..a4169df564 100644
@@ -7,10 +7,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=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_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
2.31.1
#20 lore raw

PATCH v2 15/28 configs/pine64_defconfig: switch to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 configs/pine64_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/pine64_defconfig +4 -4
index 2bdb6f6ae1..57a56da0ec 100644
@@ -7,10 +7,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=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_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
2.31.1
#21 lore raw

PATCH v2 16/28 configs/pine64_sopine_defconfig: switch to mainline ATF

In reply to Sergey Matyukevich

Switch to mainline ATF that provides basic support for H5 and A64. Note that allwinner platform layer does not provide support for GCC stack protection, so make sure to disable this ATF feature.

---
 configs/pine64_sopine_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
configs/pine64_sopine_defconfig +4 -4
index 6fa511477c..8dc0751108 100644
@@ -7,10 +7,10 @@ BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=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_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
Signature · 1 line
2.31.1
#22 lore raw

PATCH v2 17/28 configs/orangepi-zero-plus2: bump BSP versions

In reply to Sergey Matyukevich

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.

---
 board/orangepi/orangepi-zero-plus2/genimage.cfg | 10 ++--------
 configs/orangepi_zero_plus2_defconfig           | 11 +++++------
 2 files changed, 7 insertions(+), 14 deletions(-)
board/orangepi/orangepi-zero-plus2/genimage.cfg +2 -8
index 98ebf5b475..255acdbecb 100644
@@ -19,15 +19,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 = 1024000 # 1MB - 40K + 16K(GPT)
+		size = 1056768 # 1MB - 8K + 16K(GPT)
 	}
 
 	partition boot {
configs/orangepi_zero_plus2_defconfig +5 -6
index b5f35da9b3..dc424d3929 100644
@@ -2,7 +2,7 @@ BR2_aarch64=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_VFPV4=y
 
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_10=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_ROOTFS_OVERLAY="board/orangepi/orangepi-zero-plus2/rootfs_overlay"
 
@@ -18,16 +18,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="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_plus2"
 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/orangepi/orangepi-zero-plus2/boot.cmd"
@@ -35,7 +34,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-pl
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.10.10"
+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-h5-orangepi-zero-plus2"
Signature · 1 line
2.31.1
#23 lore raw

PATCH v2 18/28 configs/bananapi_m64_defconfig: bump BSP versions

In reply to Sergey Matyukevich

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.

---
 board/bananapi/bananapi-m64/genimage.cfg | 10 ++--------
 configs/bananapi_m64_defconfig           | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)
board/bananapi/bananapi-m64/genimage.cfg +2 -8
index 9730d8faac..dcd57f8f97 100644
@@ -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 {
configs/bananapi_m64_defconfig +6 -7
index 12025d6e29..70975886ec 100644
@@ -2,8 +2,7 @@ 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
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,15 +16,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="bananapi_m64"
 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/bananapi/bananapi-m64/boot.cmd"
@@ -33,7 +32,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/bananapi/bananapi-m64/boo
 # 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-bananapi-m64"
Signature · 1 line
2.31.1
#24 lore raw

PATCH v2 19/28 configs/orangepi_zero_plus_defconfig: bump BSP versions

In reply to Sergey Matyukevich

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.

---
 board/orangepi/orangepi-zero-plus/genimage.cfg | 10 ++--------
 configs/orangepi_zero_plus_defconfig           | 11 +++++------
 2 files changed, 7 insertions(+), 14 deletions(-)
board/orangepi/orangepi-zero-plus/genimage.cfg +2 -8
index ec15898ddd..13f42533ca 100644
@@ -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 {
configs/orangepi_zero_plus_defconfig +5 -6
index 790dfff276..76dbbcdb6d 100644
@@ -2,7 +2,7 @@ BR2_aarch64=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_VFPV4=y
 
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_SYSTEM_DHCP="eth0"
 
@@ -18,16 +18,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="2020.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_zero_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/orangepi/orangepi-zero-plus/boot.cmd"
@@ -35,7 +34,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-zero-pl
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.19"
+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-h5-orangepi-zero-plus"
Signature · 1 line
2.31.1
#25 lore raw

PATCH v2 20/28 configs/orangepi_pc2_defconfig: bump BSP versions

In reply to Sergey Matyukevich

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.

---
 board/orangepi/orangepi-pc2/genimage.cfg | 10 ++--------
 configs/orangepi_pc2_defconfig           | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)
board/orangepi/orangepi-pc2/genimage.cfg +2 -8
index e10c67ffc3..c179efcc19 100644
@@ -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 {
configs/orangepi_pc2_defconfig +6 -7
index 3cd8bdb82b..acf5031e17 100644
@@ -2,8 +2,7 @@ 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
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,15 +16,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="orangepi_pc2"
 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/orangepi/orangepi-pc2/boot.cmd"
@@ -33,7 +32,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-pc2/boo
 # 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-h5-orangepi-pc2"
Signature · 1 line
2.31.1
#26 lore raw

PATCH v2 21/28 configs/orangepi_prime_defconfig: bump BSP versions

In reply to Sergey Matyukevich

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.

---
 board/orangepi/orangepi-prime/genimage.cfg | 10 ++--------
 configs/orangepi_prime_defconfig           | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)
board/orangepi/orangepi-prime/genimage.cfg +2 -8
index bb01ed9f10..be7e9d7908 100644
@@ -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 {
configs/orangepi_prime_defconfig +6 -7
index d79d764fec..270465cb79 100644
@@ -2,8 +2,7 @@ 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
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,15 +16,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="orangepi_prime"
 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/orangepi/orangepi-prime/boot.cmd"
@@ -33,7 +32,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-prime/b
 # 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-h5-orangepi-prime"
Signature · 1 line
2.31.1
#27 lore raw

PATCH v2 22/28 configs/orangepi_win_defconfig: bump BSP versions

In reply to Sergey Matyukevich

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.

---
 board/orangepi/orangepi-win/genimage.cfg | 10 ++--------
 configs/orangepi_win_defconfig           | 15 ++++++++-------
 2 files changed, 10 insertions(+), 15 deletions(-)
board/orangepi/orangepi-win/genimage.cfg +2 -8
index db025d55ca..f24ea32584 100644
@@ -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 {
configs/orangepi_win_defconfig +8 -7
index 882cfc360c..4406855102 100644
@@ -2,8 +2,7 @@ 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
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,14 +16,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="2017.11"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="orangepi_win"
 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/orangepi/orangepi-win/boot.cmd"
@@ -32,10 +32,11 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/orangepi/orangepi-win/boo
 # 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.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-orangepi-win"
+BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
 
 # Filesystem
 BR2_TARGET_GENERIC_ISSUE="Welcome to Orangepi Win/Win Plus"
Signature · 1 line
2.31.1
#28 lore raw

PATCH v2 23/28 configs/friendlyarm_nanopi_a64_defconfig: bump BSP versions

In reply to Sergey Matyukevich

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.

---
 board/friendlyarm/nanopi-a64/genimage.cfg | 10 ++--------
 configs/friendlyarm_nanopi_a64_defconfig  | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)
board/friendlyarm/nanopi-a64/genimage.cfg +2 -8
index 66b6c5f461..778d89b2f6 100644
@@ -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 {
configs/friendlyarm_nanopi_a64_defconfig +6 -7
index afb338e653..31e1491f1f 100644
@@ -2,8 +2,7 @@ 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
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,15 +16,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="nanopi_a64"
 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/friendlyarm/nanopi-a64/boot.cmd"
@@ -33,7 +32,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-a64/bo
 # 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-nanopi-a64"
Signature · 1 line
2.31.1
#29 lore raw

PATCH v2 24/28 configs/friendlyarm_nanopi_neo2_defconfig: bump BSP versions

In reply to Sergey Matyukevich

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.

---
 board/friendlyarm/nanopi-neo2/genimage.cfg | 10 ++--------
 configs/friendlyarm_nanopi_neo2_defconfig  | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)
board/friendlyarm/nanopi-neo2/genimage.cfg +2 -8
index ebe123b758..c025289cb5 100644
@@ -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 {
configs/friendlyarm_nanopi_neo2_defconfig +6 -7
index 90d96f9e28..77136c26f0 100644
@@ -2,8 +2,7 @@ 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
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,15 +16,15 @@ R2_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="nanopi_neo2"
 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/friendlyarm/nanopi-neo2/boot.cmd"
@@ -33,7 +32,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/friendlyarm/nanopi-neo2/b
 # 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-h5-nanopi-neo2"
Signature · 1 line
2.31.1
#30 lore raw

PATCH v2 25/28 configs/friendlyarm_nanopi_neo_plus2_defconfig: bump BSP versions

In reply to Sergey Matyukevich

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.

---
 board/friendlyarm/nanopi-neo-plus2/genimage.cfg | 10 ++--------
 configs/friendlyarm_nanopi_neo_plus2_defconfig  | 12 ++++++------
 2 files changed, 8 insertions(+), 14 deletions(-)
board/friendlyarm/nanopi-neo-plus2/genimage.cfg +2 -8
index fb871abd43..e883cbf725 100644
@@ -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 {
configs/friendlyarm_nanopi_neo_plus2_defconfig +6 -6
index 730ff3ee6f..a3ba469adc 100644
@@ -2,7 +2,7 @@ BR2_aarch64=y
 BR2_cortex_a53=y
 BR2_ARM_FPU_VFPV4=y
 
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_3=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y
 BR2_ROOTFS_OVERLAY="board/friendlyarm/nanopi-neo-plus2/rootfs_overlay"
 
@@ -18,20 +18,20 @@ R2_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.10"
+BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.04"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi_neo_plus2"
 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"
 
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.3.4"
+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-h5-nanopi-neo-plus2"
Signature · 1 line
2.31.1
#31 lore raw

PATCH v2 26/28 configs/olimex_a64_olinuxino_defconfig: bump BSP versions

In reply to Sergey Matyukevich

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.

---
 board/olimex/a64-olinuxino/genimage.cfg | 10 ++--------
 configs/olimex_a64_olinuxino_defconfig  | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)
board/olimex/a64-olinuxino/genimage.cfg +2 -8
index 328b68be19..0fe8c0283c 100644
@@ -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 {
configs/olimex_a64_olinuxino_defconfig +6 -7
index a4169df564..1b348c47d6 100644
@@ -2,8 +2,7 @@ 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
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,15 +16,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="a64-olinuxino"
 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/olimex/a64-olinuxino/boot.cmd"
@@ -33,7 +32,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.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-olinuxino"
Signature · 1 line
2.31.1
#32 lore raw

PATCH v2 27/28 configs/pine64_defconfig: bump BSP versions

In reply to Sergey Matyukevich

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.

---
 board/pine64/pine64/genimage.cfg | 10 ++--------
 configs/pine64_defconfig         | 14 +++++++-------
 2 files changed, 9 insertions(+), 15 deletions(-)
board/pine64/pine64/genimage.cfg +2 -8
index 2ff38d5415..f1f276a877 100644
@@ -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 {
configs/pine64_defconfig +7 -7
index 57a56da0ec..44c53fc4ff 100644
@@ -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"
Signature · 1 line
2.31.1
#33 lore raw

PATCH v2 28/28 configs/pine64_sopine_defconfig: bump BSP versions

In reply to Sergey Matyukevich

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.

---
 board/pine64/sopine/genimage.cfg | 10 ++--------
 configs/pine64_sopine_defconfig  | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)
board/pine64/sopine/genimage.cfg +2 -8
index 02ebe7ab9b..1f8c76c698 100644
@@ -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 {
configs/pine64_sopine_defconfig +6 -7
index 8dc0751108..5bbe743e0e 100644
@@ -2,8 +2,7 @@ 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
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_12=y
 
 # Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
@@ -17,15 +16,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="sopine_baseboard"
 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/sopine/boot.cmd"
@@ -33,7 +32,7 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/pine64/sopine/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-sopine-baseboard"
Signature · 1 line
2.31.1
#34 lore raw

v2 cover sunxi: use mainline arm-trusted-firmware

In reply to Sergey Matyukevich

Hello Sergey,

Thanks a lot for this work! See below some comments/doubts, though.

Quoted 6 lines · On Wed, 9 Jun 2021 22:59:35 +0300 Sergey Matyukevich <[email protected]>…

Finally, let me re-iterate once again: I have only orangepi-zero-plus2 board at my disposal. So only this board has been tested. For all the other boards only build tests have been completed. ATF provides only basic support for H5/A64 and SCP firmware is disabled, so I do not expect any surprises here. But still, any help with boot tests on other H5/A64 sunxi boards is more than welcome.

Then, I'm not sure of the approach. Indeed, the defconfigs are really meant to be configurations that have been tested on HW. If we start changing them without testing them on HW, their purpose kind of goes away. What is your plan here? Wait for the initial submitters to confirm that the change is OK and working on HW ? It might take a while. Or should we give up on that promise that all defconfigs have been tested on HW ?

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#35 lore raw

v2 cover sunxi: use mainline arm-trusted-firmware

Hello Thomas,

Quoted 12 lines

Thanks a lot for this work! See below some comments/doubts, though.

Quoted 6 lines · On Wed, 9 Jun 2021 22:59:35 +0300 Sergey Matyukevich <[email protected]>…

Finally, let me re-iterate once again: I have only orangepi-zero-plus2 board at my disposal. So only this board has been tested. For all the other boards only build tests have been completed. ATF provides only basic support for H5/A64 and SCP firmware is disabled, so I do not expect any surprises here. But still, any help with boot tests on other H5/A64 sunxi boards is more than welcome.

Quoted 7 lines

Then, I'm not sure of the approach. Indeed, the defconfigs are really meant to be configurations that have been tested on HW. If we start changing them without testing them on HW, their purpose kind of goes away. What is your plan here? Wait for the initial submitters to confirm that the change is OK and working on HW ? It might take a while. Or should we give up on that promise that all defconfigs have been tested on HW ?

I believe that promise should be kept. My plan is to wait for a while and to collect feedback from the boards submitters/maintainers, if any. In the meantime we can come to the decision on TF-A stack protection. Then, final version of the patch set will include only tested boards.

Regards,
Sergey

#36 lore raw

v2 cover sunxi: use mainline arm-trusted-firmware

Sergey, All,

On 2021-06-10 22:37 +0300, Sergey Matyukevich spake thusly:

Quoted 20 lines
Quoted 12 lines

Thanks a lot for this work! See below some comments/doubts, though.

Quoted 6 lines · On Wed, 9 Jun 2021 22:59:35 +0300 Sergey Matyukevich <[email protected]>…

Finally, let me re-iterate once again: I have only orangepi-zero-plus2 board at my disposal. So only this board has been tested. For all the other boards only build tests have been completed. ATF provides only basic support for H5/A64 and SCP firmware is disabled, so I do not expect any surprises here. But still, any help with boot tests on other H5/A64 sunxi boards is more than welcome.

Quoted 7 lines

Then, I'm not sure of the approach. Indeed, the defconfigs are really meant to be configurations that have been tested on HW. If we start changing them without testing them on HW, their purpose kind of goes away. What is your plan here? Wait for the initial submitters to confirm that the change is OK and working on HW ? It might take a while. Or should we give up on that promise that all defconfigs have been tested on HW ?

Quoted 4 lines

I believe that promise should be kept. My plan is to wait for a while and to collect feedback from the boards submitters/maintainers, if any. In the meantime we can come to the decision on TF-A stack protection. Then, final version of the patch set will include only tested boards.

I haven't seen a single reply from the board custodians, so I'm marking this whole series as rejected for now. If you have some of these boards available on your desk, it would be great to respin a shorter series just for those boards you could test against.

I've just left the first patch as pending, though, because there is still something to be done about the issue.

Thanks! :-)

Regards,
Yann E. MORIN.

Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'