From nobody Sat Apr 12 17:19:56 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZZgKV017Dz5sM6k; Sat, 12 Apr 2025 17:19:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZZgKT12pmz3ZWM; Sat, 12 Apr 2025 17:19:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744478397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GjkxBRV6qn9TyzcLDBYQ+jDzcZLrZla4CUsggu01hLo=; b=UK+a8g3vizwT3OMgrcTInKKrnumDCwo4Uj+I4VxiAPwDByL+KrT9ah+pGOr/PCMkbOVrU8 cjLC4iN8Saxyokn5jpyUg0tJoNW/ICRNSRojao0YLwLHfpsu3Cx/ZUuHrInmz0nwyhzWf1 SKwR4Me8cYzvGYbCVsqpIWa/yRtCkZhRoX+VDOVI7FgIMBYK8KOhZQQwInuzvexw/htT4U d+kC1AbCYW2mEj0uZ5nTOBL39v25clUoVexNG7W6Tp2lCpaGrmDv9nM9ABRVpY5oZLhIj+ Hn/uCCHbbRqeTVU7yOHks5YsI8ooa9CZPmJch7H8KD6a3qaDYgagv/kRt+/mxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744478397; a=rsa-sha256; cv=none; b=Iyjrj2UEYmXSZ54GsLms8Cn6jTj8+vavjaUBdf0TFk7IoC/W0k8zxOGzdhGhSPCiXlyO3M vQWE3+tudSez213CY4eoq2vXYIf5qpVwdl2bxzbQWPGqjIkYS+JdRCgdDs2FEnXAI4dESa S+xfEdAR4FZRJMEPlCH/UQTy+vm/KzogTwpZbAyGjb6lU0C0QLZFbcSXhjYBmXBCPkptQW JpZZUNwQ+SKmi9kPBzrGhTpPoFhl8ZM0gmDw20B6c/7CNm+/iOtxQh/o7GB5qLPtuzrsP9 TOENI+ImNlzHkJWlWatuMveMzJjZTlTaIHESKq1QDwOI0iuaCNGZlDijb0E5KQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744478397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GjkxBRV6qn9TyzcLDBYQ+jDzcZLrZla4CUsggu01hLo=; b=j/vBkfM4V7VaW0Xd9EYub3RHuZo1fnUASEGsWJFHxFnUUhoFu4o/LQ2ADVbpimqkNSO2di 0dgnPjtcmpIpC9mMAlNcqCmTTDELvrwDeuilZGbnZHIRZO0pEnB+toX2FR3gfNdZViXoZy lkCCIXIfRuXuLIqQSGH2pvaJVeyo5s6zjDO1WGpYXvGtMqkZKcz1gKIzdlFpuCZC6EHS3i 5WPT2ppQlnXdmMFnxKM6T/2ef/J1wjb4ocrEcGCw3wl8YdDRDC87+3E45vi33wEMutC3RF MqobkX9qfGuZBEQOi8+Fi+EPs2xcP+MzQ0/r/ZKkWuhmm2w6J6rbhWuEqU4YNQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZZgKT0YhWzBGs; Sat, 12 Apr 2025 17:19:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53CHJuVX000893; Sat, 12 Apr 2025 17:19:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53CHJuXn000890; Sat, 12 Apr 2025 17:19:56 GMT (envelope-from git) Date: Sat, 12 Apr 2025 17:19:56 GMT Message-Id: <202504121719.53CHJuXn000890@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: ba4619f8e525 - main - sysutils/u-boot: Update to 2024.10 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba4619f8e5259e2b44640a16ad316e5bd9b1c3a5 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba4619f8e5259e2b44640a16ad316e5bd9b1c3a5 commit ba4619f8e5259e2b44640a16ad316e5bd9b1c3a5 Author: Emmanuel Vadot AuthorDate: 2025-04-08 15:42:08 +0000 Commit: Emmanuel Vadot CommitDate: 2025-04-12 17:18:06 +0000 sysutils/u-boot: Update to 2024.10 Except for u-boot-bhyve-arm64 which doesn't compile, so stay on 2024.07 for it. --- sysutils/u-boot-bhyve-arm64/Makefile | 1 + sysutils/u-boot-master/Makefile | 2 +- sysutils/u-boot-master/distinfo | 4 ++- sysutils/u-boot-master/files/patch-boot__bootm.c | 31 ------------------------ 4 files changed, 5 insertions(+), 33 deletions(-) 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 -