Date: Mon, 15 Jan 2024 17:33:47 GMT 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: 3d68246d28be - main - sysutils/opensbi: update to v1.4 Message-ID: <202401151733.40FHXlH9028555@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d68246d28be42fd4c86a277ec44013a60fda71e commit 3d68246d28be42fd4c86a277ec44013a60fda71e Author: Mitchell Horne <mhorne@FreeBSD.org> AuthorDate: 2024-01-11 18:20:51 +0000 Commit: Mitchell Horne <mhorne@FreeBSD.org> CommitDate: 2024-01-15 17:33:30 +0000 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 --- sysutils/opensbi/Makefile | 2 +- sysutils/opensbi/distinfo | 6 +++--- sysutils/opensbi/files/patch-firmware_fw__base.S | 22 ---------------------- sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c | 8 ++++---- sysutils/u-boot-sifive-fu540/Makefile | 2 +- sysutils/u-boot-sifive-fu740/Makefile | 2 ++ 6 files changed, 11 insertions(+), 31 deletions(-) diff --git a/sysutils/opensbi/Makefile b/sysutils/opensbi/Makefile index efd368442ccf..745ca761c7de 100644 --- 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 index a0ad587457f6..fbed4ec056d0 100644 --- 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 deleted file mode 100644 index 44185f571360..000000000000 --- a/sysutils/opensbi/files/patch-firmware_fw__base.S +++ /dev/null @@ -1,22 +0,0 @@ ---- firmware/fw_base.S.orig 2023-07-17 15:17:18 UTC -+++ firmware/fw_base.S -@@ -309,8 +309,8 @@ _scratch_init: - REG_S a5, SBI_SCRATCH_FW_SIZE_OFFSET(tp) - - /* Store R/W section's offset in scratch space */ -- lla a4, __fw_rw_offset -- REG_L a5, 0(a4) -+ lla a5, _fw_rw_start -+ sub a5, a5, a4 - REG_S a5, SBI_SCRATCH_FW_RW_OFFSET(tp) - - /* Store fw_heap_offset and fw_heap_size in scratch space */ -@@ -536,8 +536,6 @@ _link_end: - RISCV_PTR FW_TEXT_START - _link_end: - RISCV_PTR _fw_reloc_end --__fw_rw_offset: -- RISCV_PTR _fw_rw_start - _fw_start - - .section .entry, "ax", %progbits - .align 3 diff --git a/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c b/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c index e9b4ed6abde2..73263b9d2715 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 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 index 7bd809ba6b4d..f6f4a81b6e4b 100644 --- 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 index 3902e50d6394..93e585e7659f 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_2024.01= 1 + MODEL= sifive-fu740 BOARD_CONFIG= sifive_unmatched_defconfig FAMILY= sifive
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401151733.40FHXlH9028555>