sysutils/opensbi: update to v1.4

Release notes/info: https://github.com/riscv-software-src/opensbi/releases/tag/v1.4 Bump dependent u-boot ports. Sponsored by: The FreeBSD Foundation
freebsd · Jan 15, 2024 · 3d68246 · 3d68246
1 parent 219aba9
commit 3d68246
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 31 deletions.
diff --git a/sysutils/opensbi/Makefile b/sysutils/opensbi/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	opensbi
 DISTVERSIONPREFIX=v
-DISTVERSION=	1.3.1
+DISTVERSION=	1.4
 CATEGORIES=	sysutils
 
 MAINTAINER=	mhorne@FreeBSD.org

diff --git a/sysutils/opensbi/distinfo b/sysutils/opensbi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691077727
-SHA256 (riscv-software-src-opensbi-v1.3.1_GH0.tar.gz) = ee5be2c582f9a837e9db88368220758e014dd694b566bb6c8efe1e50cfad0004
-SIZE (riscv-software-src-opensbi-v1.3.1_GH0.tar.gz) = 399131
+TIMESTAMP = 1704470709
+SHA256 (riscv-software-src-opensbi-v1.4_GH0.tar.gz) = 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1
+SIZE (riscv-software-src-opensbi-v1.4_GH0.tar.gz) = 409903
diff --git a/sysutils/opensbi/files/patch-firmware_fw__base.S b/sysutils/opensbi/files/patch-firmware_fw__base.S
diff --git 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	2021-12-24 11:57:44 UTC
-+++ lib/sbi/sbi_hart.c
-@@ -203,6 +203,16 @@ int sbi_hart_pmp_configure(struct sbi_scratch *scratch
+--- 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 @@
  	if (!pmp_count)
  		return 0;
 
@@ -14,6 +14,6 @@
 +		return 0;
 +	}
 +
- 	pmp_gran_log2 = log2roundup(sbi_hart_pmp_granularity(scratch));
+ 	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/u-boot-sifive-fu540/Makefile b/sysutils/u-boot-sifive-fu540/Makefile
@@ -1,6 +1,6 @@
 MASTERDIR=	${.CURDIR}/../u-boot-master
 
-U_BOOT_SLAVE_PORTREVISION_2023.01=	1
+U_BOOT_SLAVE_PORTREVISION_2024.01=	1
 
 MODEL=		sifive-fu540
 BOARD_CONFIG=	sifive_unleashed_defconfig

diff --git 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_2024.01=	1
+
 MODEL=		sifive-fu740
 BOARD_CONFIG=	sifive_unmatched_defconfig
 FAMILY=		sifive