[Buildroot] [PATCH 1/3] configs/pine64: bump U-Boot version to 2024.07

[Mattia Narducci <mattianarducci1@gmail.com>]

Update U-Boot to fix the following error when building with
python-setuptools >= 69, that is, since 6b62384e3d
("package/python-setuptools: bump to version 69.0.3"):

  packaging.version.InvalidVersion: Invalid version: 'u-boot-2019.01'
  make[5]: *** [scripts/dtc/pylibfdt/Makefile:27: scripts/dtc/pylibfdt/_libfdt.so] Error 1
  make[4]: *** [scripts/Makefile.build:434: scripts/dtc/pylibfdt] Error 2
  make[4]: *** Waiting for unfinished jobs....
  make[3]: *** [scripts/Makefile.build:434: scripts/dtc] Error 2
  make[2]: *** [Makefile:508: scripts] Error 2
  make[1]: *** [package/pkg-generic.mk:289: output/build/uboot-2019.01/.stamp_built] Error 2
  make: *** [Makefile:83: _all] Error 2

Use SPL and U-Boot FIT image combined into u-boot-sunxi-with-spl.bin.

Do not use the optional System Control Processor (SCP) firmware pointing
the SCP env variable to /dev/null.

Signed-off-by: Mattia Narducci <mattianarducci1@gmail.com>
---
 board/pine64/pine64/genimage.cfg | 12 +++---------
 configs/pine64_defconfig         |  8 ++++----
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/board/pine64/pine64/genimage.cfg b/board/pine64/pine64/genimage.cfg
index 06b4ed1056..3555869036 100644
--- a/board/pine64/pine64/genimage.cfg
+++ b/board/pine64/pine64/genimage.cfg
@@ -14,17 +14,11 @@ image sdcard.img {
 	hdimage {
 	}
 
-	partition spl {
-		in-partition-table = "no"
-		image = "sunxi-spl.bin"
-		offset = 8K
-	}
-
 	partition u-boot {
 		in-partition-table = "no"
-		image = "u-boot.itb"
-		offset = 40K
-		size = 1M # 1MB - 40KB
+		image = "u-boot-sunxi-with-spl.bin"
+		offset = 8K
+		size = 1016K # 1MB - 8KB
 	}
 
 	partition boot {
diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig
index c454114d2a..a6ddf6e57b 100644
--- a/configs/pine64_defconfig
+++ b/configs/pine64_defconfig
@@ -16,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="2024.07"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="pine64_plus"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
 BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
+BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
 BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
-BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
 BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_SPL_NAME="spl/sunxi-spl.bin"
+BR2_TARGET_UBOOT_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"
-- 
2.45.2




_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot