All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF
@ 2021-05-31 21:27 Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 01/28] boot/arm-trusted-firmware: option to disable stack protection Sergey Matyukevich
                   ` (28 more replies)
  0 siblings, 29 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Hi all,

This patch set updates BSP on H5/A64 sunxi boards. For each board
the following changes are implemented:

- switch from early Allwinner ATF port to mainline ATF
- bump Linux kernel and U-Boot versions

Note that 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. Any help with boot tests on other H5/A64 sunxi
boards is more than welcome.

Regards,
Sergey


Sergey Matyukevich (28):
  boot/arm-trusted-firmware: option to disable stack protection
  support/testing: switch TestATFAllwinner to upstream ATF
  support/testing/tests/boot/test_atf: update U-Boot in TestATFAllwinner
  configs/orangepi_zero_plus2_defconfig: switch to upstream ATF
  configs/bananapi_m64_defconfig: switch to upstream ATF
  configs/orangepi_zero_plus_defconfig: switch to upstream ATF
  configs/orangepi_pc2_defconfig: switch to upstream ATF
  configs/orangepi_prime_defconfig: switch to upstream ATF
  configs/orangepi_win_defconfig: switch to upstream ATF
  configs/friendlyarm_nanopi_a64_defconfig: switch to upstream ATF
  configs/friendlyarm_nanopi_neo2_defconfig: switch to upstream ATF
  configs/friendlyarm_nanopi_neo_plus2_defconfig: switch to upstream ATF
  configs/amarula_a64_relic_defconfig: switch to upstream ATF
  configs/olimex_a64_olinuxino_defconfig: switch to mainline ATF
  configs/pine64_defconfig: switch to mainline ATF
  configs/pine64_sopine_defconfig: switch to upstream 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(-)

-- 
2.31.1

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 01/28] boot/arm-trusted-firmware: option to disable stack protection
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-06-07 14:09   ` Heiko Thiery
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 02/28] support/testing: switch TestATFAllwinner to upstream ATF Sergey Matyukevich
                   ` (27 subsequent siblings)
  28 siblings, 1 reply; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 boot/arm-trusted-firmware/Config.in               | 7 +++++++
 boot/arm-trusted-firmware/arm-trusted-firmware.mk | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in
index c06294040e..9b851845b9 100644
--- a/boot/arm-trusted-firmware/Config.in
+++ b/boot/arm-trusted-firmware/Config.in
@@ -175,4 +175,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
diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
index 0597cecf71..3fb65a01b3 100644
--- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
+++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
@@ -100,6 +100,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)
@@ -107,6 +110,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
 
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 02/28] support/testing: switch TestATFAllwinner to upstream ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 01/28] boot/arm-trusted-firmware: option to disable stack protection Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 03/28] support/testing/tests/boot/test_atf: update U-Boot in TestATFAllwinner Sergey Matyukevich
                   ` (26 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 support/testing/tests/boot/test_atf.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py
index e6c11aa742..c86c32092c 100644
--- a/support/testing/tests/boot/test_atf.py
+++ b/support/testing/tests/boot/test_atf.py
@@ -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.4"
+        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
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 03/28] support/testing/tests/boot/test_atf: update U-Boot in TestATFAllwinner
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 01/28] boot/arm-trusted-firmware: option to disable stack protection Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 02/28] support/testing: switch TestATFAllwinner to upstream ATF Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 04/28] configs/orangepi_zero_plus2_defconfig: switch to upstream ATF Sergey Matyukevich
                   ` (25 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 support/testing/tests/boot/test_atf.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/support/testing/tests/boot/test_atf.py b/support/testing/tests/boot/test_atf.py
index c86c32092c..a5037b4b27 100644
--- a/support/testing/tests/boot/test_atf.py
+++ b/support/testing/tests/boot/test_atf.py
@@ -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):
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 04/28] configs/orangepi_zero_plus2_defconfig: switch to upstream ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (2 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 03/28] support/testing/tests/boot/test_atf: update U-Boot in TestATFAllwinner Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 05/28] configs/bananapi_m64_defconfig: " Sergey Matyukevich
                   ` (24 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/orangepi_zero_plus2_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig
index aa4c5c9413..282418885f 100644
--- a/configs/orangepi_zero_plus2_defconfig
+++ b/configs/orangepi_zero_plus2_defconfig
@@ -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.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 05/28] configs/bananapi_m64_defconfig: switch to upstream ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (3 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 04/28] configs/orangepi_zero_plus2_defconfig: switch to upstream ATF Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 06/28] configs/orangepi_zero_plus_defconfig: " Sergey Matyukevich
                   ` (23 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/bananapi_m64_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/bananapi_m64_defconfig b/configs/bananapi_m64_defconfig
index b93332ed21..4bf8f1e96c 100644
--- a/configs/bananapi_m64_defconfig
+++ b/configs/bananapi_m64_defconfig
@@ -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.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 06/28] configs/orangepi_zero_plus_defconfig: switch to upstream ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (4 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 05/28] configs/bananapi_m64_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 07/28] configs/orangepi_pc2_defconfig: " Sergey Matyukevich
                   ` (22 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/orangepi_zero_plus_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig
index cf82f8b3cc..d3cd1d1b63 100644
--- a/configs/orangepi_zero_plus_defconfig
+++ b/configs/orangepi_zero_plus_defconfig
@@ -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.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 07/28] configs/orangepi_pc2_defconfig: switch to upstream ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (5 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 06/28] configs/orangepi_zero_plus_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 08/28] configs/orangepi_prime_defconfig: " Sergey Matyukevich
                   ` (21 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/orangepi_pc2_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig
index c7e17c8eb1..e7af1d4276 100644
--- a/configs/orangepi_pc2_defconfig
+++ b/configs/orangepi_pc2_defconfig
@@ -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.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 08/28] configs/orangepi_prime_defconfig: switch to upstream ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (6 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 07/28] configs/orangepi_pc2_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 09/28] configs/orangepi_win_defconfig: " Sergey Matyukevich
                   ` (20 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/orangepi_prime_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig
index f8f958c67b..ddee65c185 100644
--- a/configs/orangepi_prime_defconfig
+++ b/configs/orangepi_prime_defconfig
@@ -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.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 09/28] configs/orangepi_win_defconfig: switch to upstream ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (7 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 08/28] configs/orangepi_prime_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 10/28] configs/friendlyarm_nanopi_a64_defconfig: " Sergey Matyukevich
                   ` (19 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/orangepi_win_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/orangepi_win_defconfig b/configs/orangepi_win_defconfig
index 715ff3b711..217f3e1e42 100644
--- a/configs/orangepi_win_defconfig
+++ b/configs/orangepi_win_defconfig
@@ -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.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 10/28] configs/friendlyarm_nanopi_a64_defconfig: switch to upstream ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (8 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 09/28] configs/orangepi_win_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 11/28] configs/friendlyarm_nanopi_neo2_defconfig: " Sergey Matyukevich
                   ` (18 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/friendlyarm_nanopi_a64_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/friendlyarm_nanopi_a64_defconfig b/configs/friendlyarm_nanopi_a64_defconfig
index 4df22b2a2f..d0c2f71960 100644
--- a/configs/friendlyarm_nanopi_a64_defconfig
+++ b/configs/friendlyarm_nanopi_a64_defconfig
@@ -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.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 11/28] configs/friendlyarm_nanopi_neo2_defconfig: switch to upstream ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (9 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 10/28] configs/friendlyarm_nanopi_a64_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 12/28] configs/friendlyarm_nanopi_neo_plus2_defconfig: " Sergey Matyukevich
                   ` (17 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/friendlyarm_nanopi_neo2_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig
index 9262737b88..c695150ce3 100644
--- a/configs/friendlyarm_nanopi_neo2_defconfig
+++ b/configs/friendlyarm_nanopi_neo2_defconfig
@@ -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.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP=y
 R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 12/28] configs/friendlyarm_nanopi_neo_plus2_defconfig: switch to upstream ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (10 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 11/28] configs/friendlyarm_nanopi_neo2_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 13/28] configs/amarula_a64_relic_defconfig: " Sergey Matyukevich
                   ` (16 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/friendlyarm_nanopi_neo_plus2_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/friendlyarm_nanopi_neo_plus2_defconfig b/configs/friendlyarm_nanopi_neo_plus2_defconfig
index 461e468cb6..91b8ad1a22 100644
--- a/configs/friendlyarm_nanopi_neo_plus2_defconfig
+++ b/configs/friendlyarm_nanopi_neo_plus2_defconfig
@@ -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.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP=y
 R2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 13/28] configs/amarula_a64_relic_defconfig: switch to upstream ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (11 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 12/28] configs/friendlyarm_nanopi_neo_plus2_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 14/28] configs/olimex_a64_olinuxino_defconfig: switch to mainline ATF Sergey Matyukevich
                   ` (15 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/amarula_a64_relic_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/amarula_a64_relic_defconfig b/configs/amarula_a64_relic_defconfig
index 304a3ef824..3e51cefdbc 100644
--- a/configs/amarula_a64_relic_defconfig
+++ b/configs/amarula_a64_relic_defconfig
@@ -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.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 14/28] configs/olimex_a64_olinuxino_defconfig: switch to mainline ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (12 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 13/28] configs/amarula_a64_relic_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 15/28] configs/pine64_defconfig: " Sergey Matyukevich
                   ` (14 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/olimex_a64_olinuxino_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/olimex_a64_olinuxino_defconfig b/configs/olimex_a64_olinuxino_defconfig
index e35c6014bd..f9b40410ce 100644
--- a/configs/olimex_a64_olinuxino_defconfig
+++ b/configs/olimex_a64_olinuxino_defconfig
@@ -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.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 15/28] configs/pine64_defconfig: switch to mainline ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (13 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 14/28] configs/olimex_a64_olinuxino_defconfig: switch to mainline ATF Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 16/28] configs/pine64_sopine_defconfig: switch to upstream ATF Sergey Matyukevich
                   ` (13 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/pine64_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig
index 2bdb6f6ae1..981360b934 100644
--- a/configs/pine64_defconfig
+++ b/configs/pine64_defconfig
@@ -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.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 16/28] configs/pine64_sopine_defconfig: switch to upstream ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (14 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 15/28] configs/pine64_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 17/28] configs/orangepi-zero-plus2: bump BSP versions Sergey Matyukevich
                   ` (12 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

Switch to upstream 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.

Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
---
 configs/pine64_sopine_defconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/configs/pine64_sopine_defconfig b/configs/pine64_sopine_defconfig
index 6fa511477c..11539ac671 100644
--- a/configs/pine64_sopine_defconfig
+++ b/configs/pine64_sopine_defconfig
@@ -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.4"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="sun50i_a64"
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
 
 # Bootloader
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 17/28] configs/orangepi-zero-plus2: bump BSP versions
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (15 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 16/28] configs/pine64_sopine_defconfig: switch to upstream ATF Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 18/28] configs/bananapi_m64_defconfig: " Sergey Matyukevich
                   ` (11 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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/orangepi/orangepi-zero-plus2/genimage.cfg | 10 ++--------
 configs/orangepi_zero_plus2_defconfig           | 11 +++++------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/board/orangepi/orangepi-zero-plus2/genimage.cfg b/board/orangepi/orangepi-zero-plus2/genimage.cfg
index 98ebf5b475..255acdbecb 100644
--- a/board/orangepi/orangepi-zero-plus2/genimage.cfg
+++ b/board/orangepi/orangepi-zero-plus2/genimage.cfg
@@ -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 {
diff --git a/configs/orangepi_zero_plus2_defconfig b/configs/orangepi_zero_plus2_defconfig
index 282418885f..53f035a7ac 100644
--- a/configs/orangepi_zero_plus2_defconfig
+++ b/configs/orangepi_zero_plus2_defconfig
@@ -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"
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 18/28] configs/bananapi_m64_defconfig: bump BSP versions
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (16 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 17/28] configs/orangepi-zero-plus2: bump BSP versions Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 19/28] configs/orangepi_zero_plus_defconfig: " Sergey Matyukevich
                   ` (10 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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/bananapi/bananapi-m64/genimage.cfg | 10 ++--------
 configs/bananapi_m64_defconfig           | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/board/bananapi/bananapi-m64/genimage.cfg b/board/bananapi/bananapi-m64/genimage.cfg
index 9730d8faac..dcd57f8f97 100644
--- a/board/bananapi/bananapi-m64/genimage.cfg
+++ b/board/bananapi/bananapi-m64/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/bananapi_m64_defconfig b/configs/bananapi_m64_defconfig
index 4bf8f1e96c..a9d7d69606 100644
--- a/configs/bananapi_m64_defconfig
+++ b/configs/bananapi_m64_defconfig
@@ -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"
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 19/28] configs/orangepi_zero_plus_defconfig: bump BSP versions
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (17 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 18/28] configs/bananapi_m64_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 20/28] configs/orangepi_pc2_defconfig: " Sergey Matyukevich
                   ` (9 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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/orangepi/orangepi-zero-plus/genimage.cfg | 10 ++--------
 configs/orangepi_zero_plus_defconfig           | 11 +++++------
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/board/orangepi/orangepi-zero-plus/genimage.cfg b/board/orangepi/orangepi-zero-plus/genimage.cfg
index ec15898ddd..13f42533ca 100644
--- a/board/orangepi/orangepi-zero-plus/genimage.cfg
+++ b/board/orangepi/orangepi-zero-plus/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/orangepi_zero_plus_defconfig b/configs/orangepi_zero_plus_defconfig
index d3cd1d1b63..23b2d71fcd 100644
--- a/configs/orangepi_zero_plus_defconfig
+++ b/configs/orangepi_zero_plus_defconfig
@@ -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"
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 20/28] configs/orangepi_pc2_defconfig: bump BSP versions
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (18 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 19/28] configs/orangepi_zero_plus_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 21/28] configs/orangepi_prime_defconfig: " Sergey Matyukevich
                   ` (8 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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/orangepi/orangepi-pc2/genimage.cfg | 10 ++--------
 configs/orangepi_pc2_defconfig           | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/board/orangepi/orangepi-pc2/genimage.cfg b/board/orangepi/orangepi-pc2/genimage.cfg
index e10c67ffc3..c179efcc19 100644
--- a/board/orangepi/orangepi-pc2/genimage.cfg
+++ b/board/orangepi/orangepi-pc2/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/orangepi_pc2_defconfig b/configs/orangepi_pc2_defconfig
index e7af1d4276..d88a54ad3b 100644
--- a/configs/orangepi_pc2_defconfig
+++ b/configs/orangepi_pc2_defconfig
@@ -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"
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 21/28] configs/orangepi_prime_defconfig: bump BSP versions
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (19 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 20/28] configs/orangepi_pc2_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 22/28] configs/orangepi_win_defconfig: " Sergey Matyukevich
                   ` (7 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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/orangepi/orangepi-prime/genimage.cfg | 10 ++--------
 configs/orangepi_prime_defconfig           | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/board/orangepi/orangepi-prime/genimage.cfg b/board/orangepi/orangepi-prime/genimage.cfg
index bb01ed9f10..be7e9d7908 100644
--- a/board/orangepi/orangepi-prime/genimage.cfg
+++ b/board/orangepi/orangepi-prime/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/orangepi_prime_defconfig b/configs/orangepi_prime_defconfig
index ddee65c185..580a2baf5b 100644
--- a/configs/orangepi_prime_defconfig
+++ b/configs/orangepi_prime_defconfig
@@ -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"
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 22/28] configs/orangepi_win_defconfig: bump BSP versions
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (20 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 21/28] configs/orangepi_prime_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 23/28] configs/friendlyarm_nanopi_a64_defconfig: " Sergey Matyukevich
                   ` (6 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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/orangepi/orangepi-win/genimage.cfg | 10 ++--------
 configs/orangepi_win_defconfig           | 15 ++++++++-------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/board/orangepi/orangepi-win/genimage.cfg b/board/orangepi/orangepi-win/genimage.cfg
index db025d55ca..f24ea32584 100644
--- a/board/orangepi/orangepi-win/genimage.cfg
+++ b/board/orangepi/orangepi-win/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/orangepi_win_defconfig b/configs/orangepi_win_defconfig
index 217f3e1e42..cf7c0d5e3c 100644
--- a/configs/orangepi_win_defconfig
+++ b/configs/orangepi_win_defconfig
@@ -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"
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 23/28] configs/friendlyarm_nanopi_a64_defconfig: bump BSP versions
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (21 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 22/28] configs/orangepi_win_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 24/28] configs/friendlyarm_nanopi_neo2_defconfig: " Sergey Matyukevich
                   ` (5 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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/friendlyarm/nanopi-a64/genimage.cfg | 10 ++--------
 configs/friendlyarm_nanopi_a64_defconfig  | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/board/friendlyarm/nanopi-a64/genimage.cfg b/board/friendlyarm/nanopi-a64/genimage.cfg
index 66b6c5f461..778d89b2f6 100644
--- a/board/friendlyarm/nanopi-a64/genimage.cfg
+++ b/board/friendlyarm/nanopi-a64/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/friendlyarm_nanopi_a64_defconfig b/configs/friendlyarm_nanopi_a64_defconfig
index d0c2f71960..5292462fc2 100644
--- a/configs/friendlyarm_nanopi_a64_defconfig
+++ b/configs/friendlyarm_nanopi_a64_defconfig
@@ -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"
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 24/28] configs/friendlyarm_nanopi_neo2_defconfig: bump BSP versions
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (22 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 23/28] configs/friendlyarm_nanopi_a64_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 25/28] configs/friendlyarm_nanopi_neo_plus2_defconfig: " Sergey Matyukevich
                   ` (4 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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/friendlyarm/nanopi-neo2/genimage.cfg | 10 ++--------
 configs/friendlyarm_nanopi_neo2_defconfig  | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/board/friendlyarm/nanopi-neo2/genimage.cfg b/board/friendlyarm/nanopi-neo2/genimage.cfg
index ebe123b758..c025289cb5 100644
--- a/board/friendlyarm/nanopi-neo2/genimage.cfg
+++ b/board/friendlyarm/nanopi-neo2/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/friendlyarm_nanopi_neo2_defconfig b/configs/friendlyarm_nanopi_neo2_defconfig
index c695150ce3..5018cf2edc 100644
--- a/configs/friendlyarm_nanopi_neo2_defconfig
+++ b/configs/friendlyarm_nanopi_neo2_defconfig
@@ -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"
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 25/28] configs/friendlyarm_nanopi_neo_plus2_defconfig: bump BSP versions
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (23 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 24/28] configs/friendlyarm_nanopi_neo2_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 26/28] configs/olimex_a64_olinuxino_defconfig: " Sergey Matyukevich
                   ` (3 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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/friendlyarm/nanopi-neo-plus2/genimage.cfg | 10 ++--------
 configs/friendlyarm_nanopi_neo_plus2_defconfig  | 12 ++++++------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg b/board/friendlyarm/nanopi-neo-plus2/genimage.cfg
index fb871abd43..e883cbf725 100644
--- a/board/friendlyarm/nanopi-neo-plus2/genimage.cfg
+++ b/board/friendlyarm/nanopi-neo-plus2/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/friendlyarm_nanopi_neo_plus2_defconfig b/configs/friendlyarm_nanopi_neo_plus2_defconfig
index 91b8ad1a22..a3cd3c4626 100644
--- a/configs/friendlyarm_nanopi_neo_plus2_defconfig
+++ b/configs/friendlyarm_nanopi_neo_plus2_defconfig
@@ -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"
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 26/28] configs/olimex_a64_olinuxino_defconfig: bump BSP versions
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (24 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 25/28] configs/friendlyarm_nanopi_neo_plus2_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 27/28] configs/pine64_defconfig: " Sergey Matyukevich
                   ` (2 subsequent siblings)
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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/olimex/a64-olinuxino/genimage.cfg | 10 ++--------
 configs/olimex_a64_olinuxino_defconfig  | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/board/olimex/a64-olinuxino/genimage.cfg b/board/olimex/a64-olinuxino/genimage.cfg
index 328b68be19..0fe8c0283c 100644
--- a/board/olimex/a64-olinuxino/genimage.cfg
+++ b/board/olimex/a64-olinuxino/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/olimex_a64_olinuxino_defconfig b/configs/olimex_a64_olinuxino_defconfig
index f9b40410ce..f0e407590b 100644
--- a/configs/olimex_a64_olinuxino_defconfig
+++ b/configs/olimex_a64_olinuxino_defconfig
@@ -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"
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 27/28] configs/pine64_defconfig: bump BSP versions
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (25 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 26/28] configs/olimex_a64_olinuxino_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 28/28] configs/pine64_sopine_defconfig: " Sergey Matyukevich
  2021-06-02  9:46 ` [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Heiko Thiery
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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 981360b934..5b85d37087 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

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 28/28] configs/pine64_sopine_defconfig: bump BSP versions
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (26 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 27/28] configs/pine64_defconfig: " Sergey Matyukevich
@ 2021-05-31 21:27 ` Sergey Matyukevich
  2021-06-02  9:46 ` [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Heiko Thiery
  28 siblings, 0 replies; 33+ messages in thread
From: Sergey Matyukevich @ 2021-05-31 21:27 UTC (permalink / raw)
  To: buildroot

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/sopine/genimage.cfg | 10 ++--------
 configs/pine64_sopine_defconfig  | 13 ++++++-------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/board/pine64/sopine/genimage.cfg b/board/pine64/sopine/genimage.cfg
index 02ebe7ab9b..1f8c76c698 100644
--- a/board/pine64/sopine/genimage.cfg
+++ b/board/pine64/sopine/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_sopine_defconfig b/configs/pine64_sopine_defconfig
index 11539ac671..6d8c486ac5 100644
--- a/configs/pine64_sopine_defconfig
+++ b/configs/pine64_sopine_defconfig
@@ -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"
-- 
2.31.1

^ permalink raw reply related	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF
  2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
                   ` (27 preceding siblings ...)
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 28/28] configs/pine64_sopine_defconfig: " Sergey Matyukevich
@ 2021-06-02  9:46 ` Heiko Thiery
  2021-06-02 16:19   ` Sergey Matyukevich
  28 siblings, 1 reply; 33+ messages in thread
From: Heiko Thiery @ 2021-06-02  9:46 UTC (permalink / raw)
  To: buildroot

Hi Sergey,

Am Mo., 31. Mai 2021 um 23:28 Uhr schrieb Sergey Matyukevich
<geomatsi@gmail.com>:
>
> Hi all,
>
> This patch set updates BSP on H5/A64 sunxi boards. For each board
> the following changes are implemented:
>
> - switch from early Allwinner ATF port to mainline ATF
> - bump Linux kernel and U-Boot versions
>
> Note that 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. Any help with boot tests on other H5/A64 sunxi
> boards is more than welcome.

Are you aware that we already bumped the ATF version to v2.5 in the
next branch [1] and do you stick to v2.4 in all your changed
defconfigs to avoid any regression?

[1] https://git.buildroot.net/buildroot/commit/?h=next&id=cb5d9fdf1ebf7002a29e6fa43c817611e2e4e8d1

> Regards,
> Sergey
>
>
> Sergey Matyukevich (28):
>   boot/arm-trusted-firmware: option to disable stack protection
>   support/testing: switch TestATFAllwinner to upstream ATF
>   support/testing/tests/boot/test_atf: update U-Boot in TestATFAllwinner
>   configs/orangepi_zero_plus2_defconfig: switch to upstream ATF
>   configs/bananapi_m64_defconfig: switch to upstream ATF
>   configs/orangepi_zero_plus_defconfig: switch to upstream ATF
>   configs/orangepi_pc2_defconfig: switch to upstream ATF
>   configs/orangepi_prime_defconfig: switch to upstream ATF
>   configs/orangepi_win_defconfig: switch to upstream ATF
>   configs/friendlyarm_nanopi_a64_defconfig: switch to upstream ATF
>   configs/friendlyarm_nanopi_neo2_defconfig: switch to upstream ATF
>   configs/friendlyarm_nanopi_neo_plus2_defconfig: switch to upstream ATF
>   configs/amarula_a64_relic_defconfig: switch to upstream ATF
>   configs/olimex_a64_olinuxino_defconfig: switch to mainline ATF
>   configs/pine64_defconfig: switch to mainline ATF
>   configs/pine64_sopine_defconfig: switch to upstream 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(-)
>

-- 
Heiko

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF
  2021-06-02  9:46 ` [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Heiko Thiery
@ 2021-06-02 16:19   ` Sergey Matyukevich
  2021-06-05 19:44     ` Yann E. MORIN
  0 siblings, 1 reply; 33+ messages in thread
From: Sergey Matyukevich @ 2021-06-02 16:19 UTC (permalink / raw)
  To: buildroot

Hello Heiko,

> > Hi all,
> >
> > This patch set updates BSP on H5/A64 sunxi boards. For each board
> > the following changes are implemented:
> >
> > - switch from early Allwinner ATF port to mainline ATF
> > - bump Linux kernel and U-Boot versions
> >
> > Note that 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. Any help with boot tests on other H5/A64 sunxi
> > boards is more than welcome.
> 
> Are you aware that we already bumped the ATF version to v2.5 in the
> next branch [1] and do you stick to v2.4 in all your changed
> defconfigs to avoid any regression?
> 
> [1] https://git.buildroot.net/buildroot/commit/?h=next&id=cb5d9fdf1ebf7002a29e6fa43c817611e2e4e8d1

No, I missed that commit. Thanks for letting me know. Anyway, I posted
the patches as RFC to collect some feedback and probably get some help
with testing. So in the next revision of the patches I will use v2.5.

Regards,
Sergey

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF
  2021-06-02 16:19   ` Sergey Matyukevich
@ 2021-06-05 19:44     ` Yann E. MORIN
  0 siblings, 0 replies; 33+ messages in thread
From: Yann E. MORIN @ 2021-06-05 19:44 UTC (permalink / raw)
  To: buildroot

Sergey, All,

On 2021-06-02 19:19 +0300, Sergey Matyukevich spake thusly:
> > > This patch set updates BSP on H5/A64 sunxi boards. For each board
> > > the following changes are implemented:
> > > - switch from early Allwinner ATF port to mainline ATF
> > > - bump Linux kernel and U-Boot versions
> > > Note that 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. Any help with boot tests on other H5/A64 sunxi
> > > boards is more than welcome.
> > Are you aware that we already bumped the ATF version to v2.5 in the
> > next branch [1] and do you stick to v2.4 in all your changed
> > defconfigs to avoid any regression?
> > [1] https://git.buildroot.net/buildroot/commit/?h=next&id=cb5d9fdf1ebf7002a29e6fa43c817611e2e4e8d1
> No, I missed that commit. Thanks for letting me know. Anyway, I posted
> the patches as RFC to collect some feedback and probably get some help
> with testing. So in the next revision of the patches I will use v2.5.

Based on your feedback, I understand you'll be sending an updated
series.

As such, I've marked this one as changes-requested in patchwork. Thanks!

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 33+ messages in thread

* [Buildroot] [PATCH/RFC 01/28] boot/arm-trusted-firmware: option to disable stack protection
  2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 01/28] boot/arm-trusted-firmware: option to disable stack protection Sergey Matyukevich
@ 2021-06-07 14:09   ` Heiko Thiery
  0 siblings, 0 replies; 33+ messages in thread
From: Heiko Thiery @ 2021-06-07 14:09 UTC (permalink / raw)
  To: buildroot

Hi Sergey,

Am Mo., 31. Mai 2021 um 23:28 Uhr schrieb Sergey Matyukevich
<geomatsi@gmail.com>:
>
> 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.

I tested this patch to build a defconfig with buildroot toolchain that
has SSP enabled. By using the
BR2_TARGET_ARM_TRUSTED_FIRMWARE_DISABLE_SSP option I was able to build
ATF v2.5 for a imx8m platform without the described error
(plat_get_stack_protector_cannary).

When you update your patch series I can add a tested-by.

> Signed-off-by: Sergey Matyukevich <geomatsi@gmail.com>
> ---
>  boot/arm-trusted-firmware/Config.in               | 7 +++++++
>  boot/arm-trusted-firmware/arm-trusted-firmware.mk | 4 ++++
>  2 files changed, 11 insertions(+)
>
> diff --git a/boot/arm-trusted-firmware/Config.in b/boot/arm-trusted-firmware/Config.in
> index c06294040e..9b851845b9 100644
> --- a/boot/arm-trusted-firmware/Config.in
> +++ b/boot/arm-trusted-firmware/Config.in
> @@ -175,4 +175,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
> diff --git a/boot/arm-trusted-firmware/arm-trusted-firmware.mk b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
> index 0597cecf71..3fb65a01b3 100644
> --- a/boot/arm-trusted-firmware/arm-trusted-firmware.mk
> +++ b/boot/arm-trusted-firmware/arm-trusted-firmware.mk
> @@ -100,6 +100,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)
> @@ -107,6 +110,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
>

Thank you,
Heiko

^ permalink raw reply	[flat|nested] 33+ messages in thread

end of thread, other threads:[~2021-06-07 14:09 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-31 21:27 [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 01/28] boot/arm-trusted-firmware: option to disable stack protection Sergey Matyukevich
2021-06-07 14:09   ` Heiko Thiery
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 02/28] support/testing: switch TestATFAllwinner to upstream ATF Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 03/28] support/testing/tests/boot/test_atf: update U-Boot in TestATFAllwinner Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 04/28] configs/orangepi_zero_plus2_defconfig: switch to upstream ATF Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 05/28] configs/bananapi_m64_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 06/28] configs/orangepi_zero_plus_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 07/28] configs/orangepi_pc2_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 08/28] configs/orangepi_prime_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 09/28] configs/orangepi_win_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 10/28] configs/friendlyarm_nanopi_a64_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 11/28] configs/friendlyarm_nanopi_neo2_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 12/28] configs/friendlyarm_nanopi_neo_plus2_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 13/28] configs/amarula_a64_relic_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 14/28] configs/olimex_a64_olinuxino_defconfig: switch to mainline ATF Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 15/28] configs/pine64_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 16/28] configs/pine64_sopine_defconfig: switch to upstream ATF Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 17/28] configs/orangepi-zero-plus2: bump BSP versions Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 18/28] configs/bananapi_m64_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 19/28] configs/orangepi_zero_plus_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 20/28] configs/orangepi_pc2_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 21/28] configs/orangepi_prime_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 22/28] configs/orangepi_win_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 23/28] configs/friendlyarm_nanopi_a64_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 24/28] configs/friendlyarm_nanopi_neo2_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 25/28] configs/friendlyarm_nanopi_neo_plus2_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 26/28] configs/olimex_a64_olinuxino_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 27/28] configs/pine64_defconfig: " Sergey Matyukevich
2021-05-31 21:27 ` [Buildroot] [PATCH/RFC 28/28] configs/pine64_sopine_defconfig: " Sergey Matyukevich
2021-06-02  9:46 ` [Buildroot] [PATCH/RFC 00/28] sunxi: switch to mainline ATF Heiko Thiery
2021-06-02 16:19   ` Sergey Matyukevich
2021-06-05 19:44     ` Yann E. MORIN

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.