diff options
Diffstat (limited to 'sysutils/opensbi')
| -rw-r--r-- | sysutils/opensbi/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/opensbi/distinfo | 6 | ||||
| -rw-r--r-- | sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c | 6 | ||||
| -rw-r--r-- | sysutils/opensbi/files/patch-platform_generic_platform.c | 12 | ||||
| -rw-r--r-- | sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c | 23 |
5 files changed, 24 insertions, 25 deletions
diff --git a/sysutils/opensbi/Makefile b/sysutils/opensbi/Makefile index 703e9218ed9f..48d1f5e554a9 100644 --- a/sysutils/opensbi/Makefile +++ b/sysutils/opensbi/Makefile @@ -1,6 +1,6 @@ PORTNAME= opensbi DISTVERSIONPREFIX=v -DISTVERSION= 1.6 +DISTVERSION= 1.7 CATEGORIES= sysutils MAINTAINER= mhorne@FreeBSD.org diff --git a/sysutils/opensbi/distinfo b/sysutils/opensbi/distinfo index 27de00840a02..4c670b9b189d 100644 --- a/sysutils/opensbi/distinfo +++ b/sysutils/opensbi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1735930463 -SHA256 (riscv-software-src-opensbi-v1.6_GH0.tar.gz) = d11702103f177a2914e94eec57ce5ed820296d874f6b6525c4482e55d71a3667 -SIZE (riscv-software-src-opensbi-v1.6_GH0.tar.gz) = 476631 +TIMESTAMP = 1751304581 +SHA256 (riscv-software-src-opensbi-v1.7_GH0.tar.gz) = 2cf856a4e5e2e052948ddb54ba48232b1f698b7f52e0374fc7d17d51e8c8f7ce +SIZE (riscv-software-src-opensbi-v1.7_GH0.tar.gz) = 490131 diff --git a/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c b/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c index 73263b9d2715..e22fa1ab8d57 100644 --- a/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c +++ b/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c @@ -1,6 +1,6 @@ ---- lib/sbi/sbi_hart.c.orig 2023-12-27 03:02:58.000000000 -0400 -+++ lib/sbi/sbi_hart.c 2024-01-11 14:10:09.723340000 -0400 -@@ -523,6 +523,16 @@ +--- 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; diff --git a/sysutils/opensbi/files/patch-platform_generic_platform.c b/sysutils/opensbi/files/patch-platform_generic_platform.c index 2e6ed1159868..c4e535de59b5 100644 --- a/sysutils/opensbi/files/patch-platform_generic_platform.c +++ b/sysutils/opensbi/files/patch-platform_generic_platform.c @@ -1,11 +1,11 @@ ---- platform/generic/platform.c.orig 2022-06-25 03:42:10 UTC +--- platform/generic/platform.c.orig 2025-06-30 03:07:30 UTC +++ platform/generic/platform.c -@@ -24,6 +24,8 @@ - #include <sbi_utils/ipi/fdt_ipi.h> - #include <sbi_utils/reset/fdt_reset.h> +@@ -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 platform_override *platform_override_modules[]; - extern unsigned long platform_override_modules_size; + 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 index 9f776d796e1b..d721c7224afa 100644 --- a/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c +++ b/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c @@ -1,27 +1,26 @@ ---- platform/generic/sifive/fu540.c.orig 2022-06-26 14:27:30 UTC +--- platform/generic/sifive/fu540.c.orig 2025-06-30 03:07:30 UTC +++ platform/generic/sifive/fu540.c -@@ -11,6 +11,16 @@ +@@ -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, const void *fdt, -+ const struct fdt_match *match) ++static int sifive_fu540_early_init(bool cold_boot) +{ + need_pmp_war = true; + + return 0; +} + - static u64 sifive_fu540_tlbr_flush_limit(const struct fdt_match *match) + static u64 sifive_fu540_tlbr_flush_limit(void) { /* -@@ -41,6 +50,7 @@ const struct platform_override sifive_fu540 = { - }; +@@ -22,6 +31,7 @@ static int sifive_fu540_platform_init(const void *fdt, - const struct platform_override sifive_fu540 = { -+ .early_init = sifive_fu540_early_init, - .match_table = sifive_fu540_match, - .tlbr_flush_limit = sifive_fu540_tlbr_flush_limit, - .fdt_fixup = sifive_fu540_fdt_fixup, + 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; |