Date: Mon, 26 Jan 2026 14:57:12 +0000 From: Mitchell Horne <mhorne@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 2145a70e5932 - main - sysutils/opensbi: update to v1.8.1 Message-ID: <697780c8.32fe7.200da6ec@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/ports/commit/?id=2145a70e59323e22f77fe661c013d4bba0e0c55a commit 2145a70e59323e22f77fe661c013d4bba0e0c55a Author: Mitchell Horne <mhorne@FreeBSD.org> AuthorDate: 2026-01-26 14:55:00 +0000 Commit: Mitchell Horne <mhorne@FreeBSD.org> 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 <maciphone2@googlemail.com> 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 <sbi_utils/serial/semihosting.h> - #include <sbi_utils/timer/fdt_timer.h> - -+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 <sbi_utils/fdt/fdt_helper.h> - #include <sbi_utils/fdt/fdt_fixup.h> - -+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= starfivehome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?697780c8.32fe7.200da6ec>