Date: Thu, 3 Aug 2023 16:06:06 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: 652b56fe2473 - main - sysutils/opensbi: update to v1.3.1 Message-ID: <202308031606.373G66DV090216@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=652b56fe24733b9882bd496cb925c05bb40882f0 commit 652b56fe24733b9882bd496cb925c05bb40882f0 Author: Mitchell Horne <mhorne@FreeBSD.org> AuthorDate: 2023-06-23 18:44:33 +0000 Commit: Mitchell Horne <mhorne@FreeBSD.org> CommitDate: 2023-08-03 16:05:13 +0000 sysutils/opensbi: update to v1.3.1 Add a patch to work around an assembler error with clang 16.0. This will be submitted upstream. As usual, bump revision of dependent u-boot ports. Reviewed by: jrtc27, lwhsu (previous version) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D40915 --- sysutils/opensbi/Makefile | 4 ++-- sysutils/opensbi/distinfo | 6 +++--- sysutils/opensbi/files/patch-firmware_fw__base.S | 22 ++++++++++++++++++++++ .../files/patch-platform_generic_platform.c | 2 +- .../files/patch-platform_generic_sifive_fu540.c | 2 +- sysutils/u-boot-sifive-fu540/Makefile | 2 +- sysutils/u-boot-sifive-fu740/Makefile | 2 +- 7 files changed, 31 insertions(+), 9 deletions(-) diff --git a/sysutils/opensbi/Makefile b/sysutils/opensbi/Makefile index e488d185ae4c..efd368442ccf 100644 --- a/sysutils/opensbi/Makefile +++ b/sysutils/opensbi/Makefile @@ -1,6 +1,6 @@ PORTNAME= opensbi DISTVERSIONPREFIX=v -DISTVERSION= 1.2 +DISTVERSION= 1.3.1 CATEGORIES= sysutils MAINTAINER= mhorne@FreeBSD.org @@ -18,7 +18,7 @@ SHEBANG_FILES= scripts/Kconfiglib/*.py USE_GITHUB= yes GH_ACCOUNT= riscv-software-src -MAKE_ARGS= CC=clang I=${STAGEDIR}${PREFIX} V=1 FW_PAYLOAD=n +MAKE_ARGS= LLVM=1 I=${STAGEDIR}${PREFIX} V=1 FW_PAYLOAD=n OPTIONS_GROUP= PLATFORMS OPTIONS_GROUP_PLATFORMS=GENERIC diff --git a/sysutils/opensbi/distinfo b/sysutils/opensbi/distinfo index d88fd9dc680e..a0ad587457f6 100644 --- a/sysutils/opensbi/distinfo +++ b/sysutils/opensbi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1672591798 -SHA256 (riscv-software-src-opensbi-v1.2_GH0.tar.gz) = 8fcbce598a73acc2c7f7d5607d46b9d5107d3ecbede8f68f42631dcfc25ef2b2 -SIZE (riscv-software-src-opensbi-v1.2_GH0.tar.gz) = 356905 +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 diff --git a/sysutils/opensbi/files/patch-firmware_fw__base.S b/sysutils/opensbi/files/patch-firmware_fw__base.S new file mode 100644 index 000000000000..44185f571360 --- /dev/null +++ b/sysutils/opensbi/files/patch-firmware_fw__base.S @@ -0,0 +1,22 @@ +--- 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-platform_generic_platform.c b/sysutils/opensbi/files/patch-platform_generic_platform.c index 46fe653c5bc9..2e6ed1159868 100644 --- a/sysutils/opensbi/files/patch-platform_generic_platform.c +++ b/sysutils/opensbi/files/patch-platform_generic_platform.c @@ -4,7 +4,7 @@ #include <sbi_utils/ipi/fdt_ipi.h> #include <sbi_utils/reset/fdt_reset.h> -+int need_pmp_war = FALSE; ++int need_pmp_war = false; + /* List of platform override modules generated at compile time */ extern const struct platform_override *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 29fd138f269e..fa402a00203b 100644 --- a/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c +++ b/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c @@ -8,7 +8,7 @@ + +static int sifive_fu540_early_init(bool cold_boot, const struct fdt_match *match) +{ -+ need_pmp_war = TRUE; ++ need_pmp_war = true; + + return 0; +} diff --git a/sysutils/u-boot-sifive-fu540/Makefile b/sysutils/u-boot-sifive-fu540/Makefile index 05550af0388c..7bd809ba6b4d 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_2022.10= 1 +U_BOOT_SLAVE_PORTREVISION_2023.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 f053b48e6897..6f5fc07ca8a3 100644 --- a/sysutils/u-boot-sifive-fu740/Makefile +++ b/sysutils/u-boot-sifive-fu740/Makefile @@ -1,6 +1,6 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -U_BOOT_SLAVE_PORTREVISION_2022.10= 1 +U_BOOT_SLAVE_PORTREVISION_2023.01= 1 MODEL= sifive-fu740 BOARD_CONFIG= sifive_unmatched_defconfig
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308031606.373G66DV090216>