From nobody Mon Jan 26 14:57:12 2026 X-Original-To: dev-commits-ports-main@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 4f0BTN6vWPz6QNYF for ; Mon, 26 Jan 2026 14:57:12 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f0BTN4b3gz3w0l for ; Mon, 26 Jan 2026 14:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769439432; 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=QbBU6FUy0AwivpNarwlzpivFm3NAeRhVeEF5Cg9h81U=; b=plYd6XFMCbQbO8aUb7nWTG9AhQoFoPe2i0M4tO1xGVQdyXHcVGzM43bSJG4Igpxg2OvVKU gGI1I/j12X57DBdoO6Br1rpwUEbY/mg0i5bmIIxISAstVBmTTZvlLd5oVo+my1l4nPHgkg x6bO0+Esg025dFiKuYBvZtoUa7NW6irIO/1040TPZyXQ/vmZ1H1vOWYTT92fVH7tiXA+BD agEm1n1afa2si2e6IO2sYkuUg+NxCzTD9sE3wYrTkt0ZIiKviAy+U3l1zBG+VYBSuUcgn0 9dn3U6NoMNbqwfEC2R1winVVoldsHOccDp4dToyKRM8xG8F3g+8saiQ+dsTV/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769439432; 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=QbBU6FUy0AwivpNarwlzpivFm3NAeRhVeEF5Cg9h81U=; b=rLnRZ4YKSq3SxofE0XgBCcxNzIxk0rHSwnmAHX0ZfUjC1t0lIlEuetc3NdzvtvbAP/Ns6Q GFZJNC14NKOt/OYJvJ8wSyN4OehxCJNCcveKtoAt9RRc1LcCkCVESHvJoHKQCBqZgJn+Y5 Iae1f/ekTjhaOIO+WcbDTPEXnCmTIAsszaW6DNy4mEihg0iSC/t1wqC4FBFR6oxvyqOrez WpXqW2LGRYsVJQZXM7PLj7R1NFKlDF8Y1Q1f5omFsTkvb7qwWzBkR1aEAplDWvEdTC+ZeG yeSgAN6gjnAYTHXmyf1ztSpt1e31BoxArU//gCpCHPirv1BxTgcPDWXumzMcxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769439432; a=rsa-sha256; cv=none; b=LJ3iUDPsnI8qHg0YH8aPwKLpfRMg/4w91lqgIRQMZV23nf9OCAzVNhREYd13RMbqW1KEz4 IbVclKgTfKfP2eKklxoRGNRHFM4GpVe89NDo7s2kFT2iTj1xi9LR0t/OubvYaiyNoAoMU4 QnSoDTD176s9KEW4Ts/VsjHIxgGiWYZ+loYtWyAZhEnD30uWGEAWSL7dh4+rr0yaPEE7AC ZJX0mh0fLva6fuw7stAtrOZucdqhhSoHWkkGv4qBLZnRAMLSPrYU/6IDMYGGxCfJJJBjFU +XSTYEK6fIYlldIo6YmUuhOydNFiuFb/n9MvcUwX2Riq9Jc87CMiMa3ZFfdqUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f0BTN40x7z8nB for ; Mon, 26 Jan 2026 14:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 32fe7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 26 Jan 2026 14:57:12 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mitchell Horne Subject: git: 2145a70e5932 - main - sysutils/opensbi: update to v1.8.1 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2145a70e59323e22f77fe661c013d4bba0e0c55a Auto-Submitted: auto-generated Date: Mon, 26 Jan 2026 14:57:12 +0000 Message-Id: <697780c8.32fe7.200da6ec@gitrepo.freebsd.org> The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/ports/commit/?id=2145a70e59323e22f77fe661c013d4bba0e0c55a commit 2145a70e59323e22f77fe661c013d4bba0e0c55a Author: Mitchell Horne AuthorDate: 2026-01-26 14:55:00 +0000 Commit: Mitchell Horne CommitDate: 2026-01-26 14:55:00 +0000 sysutils/opensbi: update to v1.8.1 In this update, drop the PMP workaround patch for FU540. This will be fixed in the src tree. As usual, bump dependent u-boot ports. Tested by: Klaus Küchemann Reviewed by: lwhsu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D54421 --- sysutils/opensbi/Makefile | 2 +- sysutils/opensbi/distinfo | 6 ++--- sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c | 19 ---------------- .../files/patch-platform_generic_platform.c | 11 --------- .../files/patch-platform_generic_sifive_fu540.c | 26 ---------------------- sysutils/u-boot-sifive-fu540/Makefile | 2 ++ sysutils/u-boot-sifive-fu740/Makefile | 2 ++ sysutils/u-boot-starfive-visionfive2/Makefile | 2 ++ 8 files changed, 10 insertions(+), 60 deletions(-) diff --git a/sysutils/opensbi/Makefile b/sysutils/opensbi/Makefile index 48d1f5e554a9..50317266b7e1 100644 --- a/sysutils/opensbi/Makefile +++ b/sysutils/opensbi/Makefile @@ -1,6 +1,6 @@ PORTNAME= opensbi DISTVERSIONPREFIX=v -DISTVERSION= 1.7 +DISTVERSION= 1.8.1 CATEGORIES= sysutils MAINTAINER= mhorne@FreeBSD.org diff --git a/sysutils/opensbi/distinfo b/sysutils/opensbi/distinfo index 4c670b9b189d..6b93e107e752 100644 --- a/sysutils/opensbi/distinfo +++ b/sysutils/opensbi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1751304581 -SHA256 (riscv-software-src-opensbi-v1.7_GH0.tar.gz) = 2cf856a4e5e2e052948ddb54ba48232b1f698b7f52e0374fc7d17d51e8c8f7ce -SIZE (riscv-software-src-opensbi-v1.7_GH0.tar.gz) = 490131 +TIMESTAMP = 1768236677 +SHA256 (riscv-software-src-opensbi-v1.8.1_GH0.tar.gz) = fb1ae61a85e966322101acb1c982f84d9eaafc4de7dd474a7d7546d9bb321c6f +SIZE (riscv-software-src-opensbi-v1.8.1_GH0.tar.gz) = 514734 diff --git a/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c b/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c deleted file mode 100644 index e22fa1ab8d57..000000000000 --- a/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/sbi/sbi_hart.c.orig 2025-06-30 03:07:30 UTC -+++ lib/sbi/sbi_hart.c -@@ -567,6 +567,16 @@ int sbi_hart_pmp_configure(struct sbi_scratch *scratch - if (!pmp_count) - return 0; - -+ /* -+ * Disable the PMP for the sifive/fu540 platform, required to work -+ * around a hardware errata. -+ */ -+ extern int need_pmp_war; -+ if (need_pmp_war) { -+ pmp_set(0, PMP_R | PMP_W | PMP_X, -1, __riscv_xlen); -+ return 0; -+ } -+ - pmp_log2gran = sbi_hart_pmp_log2gran(scratch); - pmp_bits = sbi_hart_pmp_addrbits(scratch) - 1; - pmp_addr_max = (1UL << pmp_bits) | ((1UL << pmp_bits) - 1); diff --git a/sysutils/opensbi/files/patch-platform_generic_platform.c b/sysutils/opensbi/files/patch-platform_generic_platform.c deleted file mode 100644 index c4e535de59b5..000000000000 --- a/sysutils/opensbi/files/patch-platform_generic_platform.c +++ /dev/null @@ -1,11 +0,0 @@ ---- platform/generic/platform.c.orig 2025-06-30 03:07:30 UTC -+++ platform/generic/platform.c -@@ -30,6 +30,8 @@ - #include - #include - -+int need_pmp_war = false; -+ - /* List of platform override modules generated at compile time */ - extern const struct fdt_driver *const platform_override_modules[]; - diff --git a/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c b/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c deleted file mode 100644 index d721c7224afa..000000000000 --- a/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c +++ /dev/null @@ -1,26 +0,0 @@ ---- platform/generic/sifive/fu540.c.orig 2025-06-30 03:07:30 UTC -+++ platform/generic/sifive/fu540.c -@@ -11,6 +11,15 @@ - #include - #include - -+extern int need_pmp_war; -+ -+static int sifive_fu540_early_init(bool cold_boot) -+{ -+ need_pmp_war = true; -+ -+ return 0; -+} -+ - static u64 sifive_fu540_tlbr_flush_limit(void) - { - /* -@@ -22,6 +31,7 @@ static int sifive_fu540_platform_init(const void *fdt, - - static int sifive_fu540_platform_init(const void *fdt, int nodeoff, const struct fdt_match *match) - { -+ generic_platform_ops.early_init = sifive_fu540_early_init; - generic_platform_ops.get_tlbr_flush_limit = sifive_fu540_tlbr_flush_limit; - - return 0; diff --git a/sysutils/u-boot-sifive-fu540/Makefile b/sysutils/u-boot-sifive-fu540/Makefile index 5f79e53b93d8..b678f8a6e7b5 100644 --- a/sysutils/u-boot-sifive-fu540/Makefile +++ b/sysutils/u-boot-sifive-fu540/Makefile @@ -1,5 +1,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2025.10=1 + MODEL= sifive-fu540 BOARD_CONFIG= sifive_unleashed_defconfig FAMILY= sifive diff --git a/sysutils/u-boot-sifive-fu740/Makefile b/sysutils/u-boot-sifive-fu740/Makefile index 3902e50d6394..246d78a2219f 100644 --- a/sysutils/u-boot-sifive-fu740/Makefile +++ b/sysutils/u-boot-sifive-fu740/Makefile @@ -1,5 +1,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2025.10=1 + MODEL= sifive-fu740 BOARD_CONFIG= sifive_unmatched_defconfig FAMILY= sifive diff --git a/sysutils/u-boot-starfive-visionfive2/Makefile b/sysutils/u-boot-starfive-visionfive2/Makefile index 101a17f18a02..7c513886057f 100644 --- a/sysutils/u-boot-starfive-visionfive2/Makefile +++ b/sysutils/u-boot-starfive-visionfive2/Makefile @@ -1,5 +1,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2025.10=1 + MODEL= starfive-visionfive2 BOARD_CONFIG= starfive_visionfive2_defconfig FAMILY= starfive