sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-04-28 01:26:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

sysutils/opensbi: update to v1.6

Browse source 
Remove the port platform OPTIONS in favor of the 'generic' platform
only. This has been the only one we've shipped with for a few versions
now.

This cleans up the Makefile, but more to the point, there is some kind
of build regression with the new version that doing the make and install
in a single step seems to fix.

Bump dependent u-boot ports.

Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Mitchell Horne 2024-07-08 11:34:35 -03:00
parent 9b33208481
commit 1ebf5e656c
8 changed files with 23 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
sysutils/opensbi/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= opensbi
DISTVERSIONPREFIX=v
DISTVERSION= 1.4
DISTVERSION= 1.6
CATEGORIES= sysutils
MAINTAINER= mhorne@FreeBSD.org
@ -18,15 +18,10 @@ SHEBANG_FILES= scripts/Kconfiglib/*.py
USE_GITHUB= yes
GH_ACCOUNT= riscv-software-src
MAKE_ARGS= LLVM=1 I=${STAGEDIR}${PREFIX} V=1 FW_PAYLOAD=n
MAKE_ARGS= LLVM=1 I=${STAGEDIR}${PREFIX} V=1 \
FW_PAYLOAD=n FW_TEXT_START=0x80000000 \
OPENSBI_VERSION_GIT= PLATFORM=generic
OPTIONS_GROUP= PLATFORMS
OPTIONS_GROUP_PLATFORMS=GENERIC
OPTIONS_SUB= yes
OPTIONS_DEFAULT= GENERIC
GENERIC_DESC= Support for generic platform
GENERIC_PLATFORM= generic
GENERIC_STRIP_ARGS= -K tohost -K fromhost
INSTALL_TARGET= install
@ -35,22 +30,8 @@ PLIST_SUB+= RISCV_ABI=${PLATFORM_RISCV_ABI}
PLATFORM_RISCV_ABI= lp64
do-install: # only need install_firmwares target
.for platform in ${OPTIONS_GROUP_PLATFORMS}
post-build-${platform}-on:
${MAKE_CMD} -C ${WRKSRC} ${MAKE_ARGS} PLATFORM=${${platform}_PLATFORM}
do-install-${platform}-on:
${MKDIR} ${STAGEDIR}${PREFIX}
${MAKE_CMD} -C ${WRKSRC} PLATFORM=${${platform}_PLATFORM} ${MAKE_ARGS} \
I=${STAGEDIR}${PREFIX} V=1 install_firmwares
post-install-${platform}-on:
${STRIP_CMD} ${${platform}_STRIP_ARGS} \
${STAGEDIR}${DATADIR}/${PLATFORM_RISCV_ABI}/${${platform}_PLATFORM}/firmware/fw_*.elf
.endfor # OPTIONS_GROUP_PLATFORMS
post-install:
${STRIP_CMD} ${GENERIC_STRIP_ARGS} \
${STAGEDIR}${DATADIR}/${PLATFORM_RISCV_ABI}/generic/firmware/fw_*.elf
.include <bsd.port.mk>

6
sysutils/opensbi/distinfo
View file

@ -1,3 +1,3 @@
TIMESTAMP = 1704470709
SHA256 (riscv-software-src-opensbi-v1.4_GH0.tar.gz) = 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1
SIZE (riscv-software-src-opensbi-v1.4_GH0.tar.gz) = 409903
TIMESTAMP = 1735930463
SHA256 (riscv-software-src-opensbi-v1.6_GH0.tar.gz) = d11702103f177a2914e94eec57ce5ed820296d874f6b6525c4482e55d71a3667
SIZE (riscv-software-src-opensbi-v1.6_GH0.tar.gz) = 476631

20
sysutils/opensbi/files/patch-Makefile
View file

@ -1,20 +0,0 @@
--- Makefile.orig 2023-07-19 06:21:59 UTC
+++ Makefile
@@ -337,7 +337,7 @@ endif
else
CFLAGS += -O2
endif
-CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls -mstrict-align
+CFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
# enable -m(no-)save-restore option by CC_SUPPORT_SAVE_RESTORE
ifeq ($(CC_SUPPORT_SAVE_RESTORE),y)
CFLAGS += -mno-save-restore
@@ -355,7 +355,7 @@ ASFLAGS = -g -Wall -nostdlib
CPPFLAGS += $(firmware-cppflags-y)
ASFLAGS = -g -Wall -nostdlib
-ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls -mstrict-align
+ASFLAGS += -fno-omit-frame-pointer -fno-optimize-sibling-calls
# enable -m(no-)save-restore option by CC_SUPPORT_SAVE_RESTORE
ifeq ($(CC_SUPPORT_SAVE_RESTORE),y)
ASFLAGS += -mno-save-restore

5
sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c
View file

@ -1,12 +1,13 @@
--- platform/generic/sifive/fu540.c.orig 2022-06-26 14:27:30 UTC
+++ platform/generic/sifive/fu540.c
@@ -11,6 +11,15 @@
@@ -11,6 +11,16 @@
#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 struct fdt_match *match)
+static int sifive_fu540_early_init(bool cold_boot, const void *fdt,
+ const struct fdt_match *match)
+{
+ need_pmp_war = true;
+

8
sysutils/opensbi/pkg-plist
View file

@ -1,4 +1,4 @@
%%GENERIC%%%%DATADIR%%/%%RISCV_ABI%%/generic/firmware/fw_dynamic.bin
%%GENERIC%%%%DATADIR%%/%%RISCV_ABI%%/generic/firmware/fw_dynamic.elf
%%GENERIC%%%%DATADIR%%/%%RISCV_ABI%%/generic/firmware/fw_jump.bin
%%GENERIC%%%%DATADIR%%/%%RISCV_ABI%%/generic/firmware/fw_jump.elf
%%DATADIR%%/%%RISCV_ABI%%/generic/firmware/fw_dynamic.bin
%%DATADIR%%/%%RISCV_ABI%%/generic/firmware/fw_dynamic.elf
%%DATADIR%%/%%RISCV_ABI%%/generic/firmware/fw_jump.bin
%%DATADIR%%/%%RISCV_ABI%%/generic/firmware/fw_jump.elf

2
sysutils/u-boot-sifive-fu540/Makefile
View file

@ -1,5 +1,7 @@
MASTERDIR= ${.CURDIR}/../u-boot-master
U_BOOT_SLAVE_PORTREVISION_2024.07=1
MODEL= sifive-fu540
BOARD_CONFIG= sifive_unleashed_defconfig
FAMILY= sifive

2
sysutils/u-boot-sifive-fu740/Makefile
View file

@ -1,5 +1,7 @@
MASTERDIR= ${.CURDIR}/../u-boot-master
U_BOOT_SLAVE_PORTREVISION_2024.07=1
MODEL= sifive-fu740
BOARD_CONFIG= sifive_unmatched_defconfig
FAMILY= sifive

2
sysutils/u-boot-starfive-visionfive2/Makefile
View file

@ -1,5 +1,7 @@
MASTERDIR= ${.CURDIR}/../u-boot-master
U_BOOT_SLAVE_PORTREVISION_2024.07=1
MODEL= starfive-visionfive2
BOARD_CONFIG= starfive_visionfive2_defconfig
FAMILY= starfive