1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

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
This commit is contained in:
Mitchell Horne 2023-06-23 15:44:33 -03:00
parent e23e7c9a19
commit 652b56fe24
7 changed files with 31 additions and 9 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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[];

View File

@ -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;
+}

View File

@ -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

View File

@ -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