The tool mkeficapsule is disabled as this tools needs gnutls and
we don't need mkeficapsule.
A backported patch is removed as this patch is now integrated
in this version of u-boot.
Signed-off-by: Philippe Reynes <philippe.rey...@softathome.com>
---
History:
v2:
- remove propriotary footer in the mail
package/boot/uboot-armsr/Makefile | 7 ++-
...ss-device-numbers-to-set-efi-bootdev.patch | 62 -------------------
2 files changed, 4 insertions(+), 65 deletions(-)
delete mode 100644
package/boot/uboot-armsr/patches/001-v2023.07-bootstd-Use-blk-uclass-device-numbers-to-set-efi-bootdev.patch
diff --git a/package/boot/uboot-armsr/Makefile
b/package/boot/uboot-armsr/Makefile
index ce53d19b79..fdc156ac76 100644
--- a/package/boot/uboot-armsr/Makefile
+++ b/package/boot/uboot-armsr/Makefile
@@ -1,9 +1,9 @@
include $(TOPDIR)/rules.mk
-PKG_VERSION:=2023.04
+PKG_VERSION:=2025.01
PKG_RELEASE:=1
-PKG_HASH:=e31cac91545ff41b71cec5d8c22afd695645cd6e2a442ccdacacd60534069341
+PKG_HASH:=cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f
include $(INCLUDE_DIR)/u-boot.mk
include $(INCLUDE_DIR)/package.mk
@@ -31,6 +31,7 @@ UBOOT_TARGETS := \
qemu_armv8
UBOOT_CUSTOMIZE_CONFIG := \
- --enable CMD_EFIDEBUG
+ --enable CMD_EFIDEBUG \
+ --disable TOOLS_MKEFICAPSULE
$(eval $(call BuildPackage/U-Boot))
diff --git
a/package/boot/uboot-armsr/patches/001-v2023.07-bootstd-Use-blk-uclass-device-numbers-to-set-efi-bootdev.patch
b/package/boot/uboot-armsr/patches/001-v2023.07-bootstd-Use-blk-uclass-device-numbers-to-set-efi-bootdev.patch
deleted file mode 100644
index f4c8118952..0000000000
---
a/package/boot/uboot-armsr/patches/001-v2023.07-bootstd-Use-blk-uclass-device-numbers-to-set-efi-bootdev.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From: Simon Glass <s...@chromium.org>
-To: U-Boot Mailing List <u-b...@lists.denx.de>
-Subject: [PATCH v10 7/9] bootstd: Use blk uclass device numbers to set efi
- bootdev
-Date: Mon, 24 Apr 2023 13:49:50 +1200
-Message-ID:
- <20230424134946.v10.7.Ia5f5e39c882ac22b5f71c4d576941b34e868eeba@changeid>
-
-From: Mathew McBride <m...@traverse.com.au>
-
-When loading a file from a block device, efiload_read_file
-was using the seq_num of the device (e.g "35" of virtio_blk#35)
-instead of the block device id (e.g what you get from running
-the corresponding device scan command, like "virtio 0")
-
-This cause EFI booting from these devices to fail as an
-invalid device number is passed to blk_get_device_part_str:
-
- Scanning bootdev 'virtio-blk#35.bootdev':
- distro_efi_read_bootflow_file start (efi,fname=<NULL>)
- distro_efi_read_bootflow_file start (efi,fname=<NULL>)
- setting bootdev virtio, 35, efi/boot/bootaa64.efi, 00000000beef9a40, 170800
- efi_dp_from_name calling blk_get_device_part_str
- dev=virtio devnr=35 path=efi/boot/bootaa64.efi
- blk_get_device_part_str (virtio,35)
- blk_get_device_by_str (virtio, 35)
- ** Bad device specification virtio 35 **
- Using default device tree: dtb/qemu-arm.dtb
- No device tree available
- 0 efi ready virtio 1 virtio-blk#35.bootdev.par
efi/boot/bootaa64.efi
- ** Booting bootflow 'virtio-blk#35.bootdev.part_1' with efi
- blk_get_device_part_str (virtio,0:1)
- blk_get_device_by_str (virtio, 0)
- No UEFI binary known at beef9a40 (image
buf=00000000beef9a40,addr=0000000000000000)
- Boot failed (err=-22)
-
-Signed-off-by: Mathew McBride <m...@traverse.com.au>
-Signed-off-by: Simon Glass <s...@chromium.org>
-Signed-off-by: Petr Štetiar <yn...@true.cz> [backport to 2023.04]
----
-
-(no changes since v8)
-
-Changes in v8:
-- Add new patch to use blk uclass device numbers to set efi bootdev
-
- boot/bootmeth_efi.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- a/boot/bootmeth_efi.c
-+++ b/boot/bootmeth_efi.c
-@@ -117,7 +117,9 @@ static int efiload_read_file(struct blk_
- * this can go away.
- */
- media_dev = dev_get_parent(bflow->dev);
-- snprintf(devnum_str, sizeof(devnum_str), "%x", dev_seq(media_dev));
-+ snprintf(devnum_str, sizeof(devnum_str), "%x:%x",
-+ desc ? desc->devnum : dev_seq(media_dev),
-+ bflow->part);
-
- strlcpy(dirname, bflow->fname, sizeof(dirname));
- last_slash = strrchr(dirname, '/');
--
2.25.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
