chore: bump u-boot

Bump u-boot. Pulled in updated patches from siderolabs/pkgs#860 Signed-off-by: Noel Georgi <[email protected]>
siderolabs · Apr 3, 2024 · da9bd8f · da9bd8f
1 parent 4900a6b
commit da9bd8f
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 46 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -1,6 +1,6 @@
 # THIS FILE WAS AUTOMATICALLY GENERATED, PLEASE DO NOT EDIT.
 #
-# Generated on 2024-03-12T16:46:47Z by kres latest.
+# Generated on 2024-04-03T13:05:44Z by kres latest.
 
 name: default
 concurrency:
@@ -31,7 +31,7 @@ jobs:
     if: (!startsWith(github.head_ref, 'renovate/') && !startsWith(github.head_ref, 'dependabot/'))
     services:
       buildkitd:
-        image: moby/buildkit:v0.12.5
+        image: moby/buildkit:v0.13.1
         options: --privileged
         ports:
           - 1234:1234

diff --git a/Pkgfile b/Pkgfile
@@ -9,8 +9,8 @@ vars:
   raspberrypi_firmware_sha512: cf5ed2ce16ee059c9c185ef53d079fb4a59720f1729c270480f2ffb46e5d990936ad58233486143f71d60116fd14e78edb81cd13feec1a787a47650d7eaaf56f
 
   # renovate: datasource=github-tags extractVersion=^v(?<version>.*)$ depName=u-boot/u-boot
-  uboot_version: 2023.01
-  uboot_sha256: 69423bad380f89a0916636e89e6dcbd2e4512d584308d922d1039d1e4331950f
-  uboot_sha512: 417a28267eb7875820d08fafc7316f164663609378637539e71648b0b9b7d28796b6c381717f31b0ab6472805fefd32628ef7d1b2e7b9f3c51c8ad122993f679
+  uboot_version: 2024.01
+  uboot_sha256: b99611f1ed237bf3541bdc8434b68c96a6e05967061f992443cb30aabebef5b3
+  uboot_sha512: 45bd093ba3bda23e43cdde83d8656c1ee1348ac2886ecff1fee475f101ac4965a5be6565408fa5b990c723f3fdc833edfca60a719f735a43040cd14a1b59a88b
 labels:
   org.opencontainers.image.source: https://github.com/siderolabs/sbc-raspberrypi
diff --git a/artifacts/u-boot/patches/0002-rpi-add-NVMe-to-boot-order.patch b/artifacts/u-boot/patches/0002-rpi-add-NVMe-to-boot-order.patch
@@ -1,44 +1,25 @@
-From 191b5f4e0408e40f35379fdaab6b37a7ad93e298 Mon Sep 17 00:00:00 2001
-Message-Id: <191b5f4e0408e40f35379fdaab6b37a7ad93e298.1668448794.git.stefan@agner.ch>
-In-Reply-To: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
-References: <135d886b4e5077c8fa96a5449a70d81ae9c1c3d0.1668448794.git.stefan@agner.ch>
-From: Stefan Agner <[email protected]>
-Date: Tue, 29 Dec 2020 23:34:52 +0100
+From 0c4e4f9cce2bd329a2c607c28fc770586a503ab9 Mon Sep 17 00:00:00 2001
+From: Tom Plant <[email protected]>
+Date: Sun, 3 Dec 2023 09:27:07 +0000
 Subject: [PATCH] rpi: add NVMe to boot order
 
 The Compute Module 4 I/O Board can support a NVMe. Add NVMe to the boot
 order.
 
-Signed-off-by: Stefan Agner <[email protected]>
+Signed-off-by: Tom Plant <[email protected]>
 ---
- include/configs/rpi.h | 7 +++++++
- 1 file changed, 7 insertions(+)
+ board/raspberrypi/rpi/rpi.env | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/include/configs/rpi.h b/include/configs/rpi.h
-index cd8fe8b518..7257659932 100644
---- a/include/configs/rpi.h
-+++ b/include/configs/rpi.h
-@@ -131,6 +131,12 @@
- 	#define BOOT_TARGET_MMC(func)
- #endif
-
-+#if CONFIG_IS_ENABLED(CMD_NVME)
-+	#define BOOT_TARGET_NVME(func) func(NVME, nvme, 0)
-+#else
-+	#define BOOT_TARGET_NVME(func)
-+#endif
-+
- #if CONFIG_IS_ENABLED(CMD_USB)
- 	#define BOOT_TARGET_USB(func) func(USB, usb, 0)
- #else
-@@ -151,6 +157,7 @@
-
- #define BOOT_TARGET_DEVICES(func) \
- 	BOOT_TARGET_MMC(func) \
-+	BOOT_TARGET_NVME(func) \
- 	BOOT_TARGET_USB(func) \
- 	BOOT_TARGET_PXE(func) \
- 	BOOT_TARGET_DHCP(func)
--- 
-2.38.1
+diff --git a/board/raspberrypi/rpi/rpi.env b/board/raspberrypi/rpi/rpi.env
+index 30228285ed..0226e31680 100644
+--- a/board/raspberrypi/rpi/rpi.env
++++ b/board/raspberrypi/rpi/rpi.env
+@@ -74,4 +74,4 @@ pxefile_addr_r=0x02500000
+ fdt_addr_r=0x02600000
+ ramdisk_addr_r=0x02700000
 
+-boot_targets=mmc usb pxe dhcp
++boot_targets=mmc usb pxe dhcp nvme
+--
+2.39.2
diff --git a/artifacts/u-boot/patches/0008-enable-nvme-and-fixup-efi-boot.patch b/artifacts/u-boot/patches/0008-enable-nvme-and-fixup-efi-boot.patch
@@ -1,11 +1,21 @@
+From 04c8073b1ead282eac7b90432f39f104b006f824 Mon Sep 17 00:00:00 2001
+From: Tom Plant <[email protected]>
+Date: Sun, 3 Dec 2023 09:33:24 +0000
+Subject: [PATCH] rpi: enable NVMe and fixup EFI boot
+
+Signed-off-by: Tom Plant <[email protected]>
+---
+ configs/rpi_arm64_defconfig | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
 diff --git a/configs/rpi_arm64_defconfig b/configs/rpi_arm64_defconfig
-index 031ed69ff0..f41d367238 100644
+index f9dade18f6..f2394e4a52 100644
 --- a/configs/rpi_arm64_defconfig
 +++ b/configs/rpi_arm64_defconfig
-@@ -57,3 +57,19 @@ CONFIG_VIDEO_BCM2835=y
+@@ -57,3 +57,19 @@ CONFIG_SYS_WHITE_ON_BLACK=y
+ CONFIG_VIDEO_BCM2835=y
  CONFIG_CONSOLE_SCROLL_LINES=10
  CONFIG_PHYS_TO_BUS=y
- CONFIG_OF_LIBFDT_OVERLAY=y
 +# Enable NVME
 +CONFIG_NVME_PCI=y
 +CONFIG_CMD_NVME=y
@@ -22,3 +32,5 @@ index 031ed69ff0..f41d367238 100644
 +CONFIG_PXE_UTILS=n
 +# Disable EFI bootmanager (reserves memory on 0x00080000 -> prevents continuing after being successful)
 +CONFIG_CMD_BOOTEFI_BOOTMGR=n
+--
+2.39.2
diff --git a/artifacts/u-boot/pkg.yaml b/artifacts/u-boot/pkg.yaml
@@ -19,7 +19,10 @@ steps:
     prepare:
       - |
         mkdir -p /usr/bin \
-          && ln -sf /toolchain/bin/env /usr/bin/env
+          && ln -sf /toolchain/bin/env /usr/bin/env \
+          && ln -sf /toolchain/bin/python3 /toolchain/bin/python
+
+        pip3 install pyelftools
 
         tar xf u-boot.tar.bz2 --strip-components=1
       # rpi_generic (built with rpi_arm64_defconfig, which "uses the device-tree provided by the firmware")
@@ -33,7 +36,6 @@ steps:
         patch -p1 < /pkg/patches/0008-enable-nvme-and-fixup-efi-boot.patch
 
         make rpi_arm64_defconfig
-        sed -i "s/CONFIG_TOOLS_LIBCRYPTO=y/# CONFIG_TOOLS_LIBCRYPTO is not set/" .config
     build:
       # rpi_generic
       - |