Page MenuHomeFreeBSD
Files F141049758

D54421.diff
No OneTemporary
Actions

D54421.diff
View Options

diff --git a/sysutils/opensbi/Makefile b/sysutils/opensbi/Makefile
--- a/sysutils/opensbi/Makefile
+++ b/sysutils/opensbi/Makefile
@@ -1,6 +1,6 @@
PORTNAME= opensbi
DISTVERSIONPREFIX=v
-DISTVERSION= 1.7
+DISTVERSION= 1.8
CATEGORIES= sysutils
MAINTAINER= mhorne@FreeBSD.org
diff --git a/sysutils/opensbi/distinfo b/sysutils/opensbi/distinfo
--- 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 = 1767052010
+SHA256 (riscv-software-src-opensbi-v1.8_GH0.tar.gz) = 8293bca3c7507ecf15dd5dfb59fe0f700075974a1f60379f1b6626104c3f0afe
+SIZE (riscv-software-src-opensbi-v1.8_GH0.tar.gz) = 514731
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
--- 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
--- 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
--- 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-fu740/Makefile b/sysutils/u-boot-sifive-fu740/Makefile
--- 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
--- 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

File Metadata

Mime Type
text/plain
Expires
Thu, Jan 1, 5:18 AM (12 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27429178
Default Alt Text
D54421.diff (3 KB)

Event Timeline