diff --git a/sysutils/u-boot-bhyve-arm64/Makefile b/sysutils/u-boot-bhyve-arm64/Makefile index 380254843ab6..96694deaf957 100644 --- a/sysutils/u-boot-bhyve-arm64/Makefile +++ b/sysutils/u-boot-bhyve-arm64/Makefile @@ -4,6 +4,7 @@ MODEL= bhyve-arm64 BOARD_CONFIG= bhyve_arm64_defconfig FAMILY= bhyve UBOOT_ARCH= aarch64 +UBOOT_VERSION= 2024.07 UBOOT_PLIST= u-boot.bin diff --git a/sysutils/u-boot-master/Makefile b/sysutils/u-boot-master/Makefile index 8c27342da61b..c3b361537974 100644 --- a/sysutils/u-boot-master/Makefile +++ b/sysutils/u-boot-master/Makefile @@ -124,7 +124,7 @@ UBOOT_PLIST_QEMU= u-boot.bin .if !defined(UBOOT_VERSION) && defined(UBOOT_VERSION_${FAMILY:tu}) UBOOT_VERSION=${UBOOT_VERSION_${FAMILY:tu}} .endif -UBOOT_VERSION?= 2024.07 +UBOOT_VERSION?= 2024.10 # If a slave port defines a PORTREVISION use it .if defined(U_BOOT_SLAVE_PORTREVISION_${UBOOT_VERSION}) diff --git a/sysutils/u-boot-master/distinfo b/sysutils/u-boot-master/distinfo index a4117d982557..8538e3eb7d14 100644 --- a/sysutils/u-boot-master/distinfo +++ b/sysutils/u-boot-master/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1727176237 +TIMESTAMP = 1729748230 SHA256 (u-boot/u-boot-2024.07.tar.bz2) = f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f SIZE (u-boot/u-boot-2024.07.tar.bz2) = 26086110 +SHA256 (u-boot/u-boot-2024.10.tar.bz2) = b28daf4ac17e43156363078bf510297584137f6df50fced9b12df34f61a92fb0 +SIZE (u-boot/u-boot-2024.10.tar.bz2) = 26398495 diff --git a/sysutils/u-boot-master/files/patch-boot__bootm.c b/sysutils/u-boot-master/files/patch-boot__bootm.c deleted file mode 100644 index 364ac0822593..000000000000 --- a/sysutils/u-boot-master/files/patch-boot__bootm.c +++ /dev/null @@ -1,31 +0,0 @@ -From 7d25c0b01248fbfbbcdf668cc1c080fe0b54978f Mon Sep 17 00:00:00 2001 -From: Emmanuel Vadot -Date: Sat, 7 Nov 2020 19:42:31 +0100 -Subject: [PATCH 2/2] Add FreeBSD hack that does not disable usb when - efi_exit_boot_service is called -Content-Type: text/plain; charset=UTF-8 - ---- - common/bootm.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/common/bootm.c b/common/bootm.c -index b3377490b3..22476fc7c9 100644 ---- boot/bootm.c -+++ boot/bootm.c -@@ -458,7 +458,12 @@ ulong bootm_disable_interrupts(void) - * updated every 1 ms within the HCCA structure in SDRAM! For more - * details see the OpenHCI specification. - */ -+ /* -+ * FreeBSD Hack, on some board this cause efi_exit_bootservice to hang -+ * for some yet unknown reason. -+ * This only does this when doing netboot ??? - usb_stop(); -+ */ - #endif - return iflag; - } --- -2.28.0 -