Page MenuHomeFreeBSD

D23820.diff
No OneTemporary

D23820.diff

Index: head/sysutils/opensbi/Makefile
===================================================================
--- head/sysutils/opensbi/Makefile
+++ head/sysutils/opensbi/Makefile
@@ -2,28 +2,29 @@
PORTNAME= opensbi
DISTVERSIONPREFIX=v
-DISTVERSION= 0.5
+DISTVERSION= 0.6
CATEGORIES= sysutils
MAINTAINER= mhorne@FreeBSD.org
COMMENT= RISC-V SBI bootloader and firmware
LICENSE= BSD2CLAUSE
+BUILD_DEPENDS= ${RISCV_PREFIX}gcc:devel/riscv64-none-elf-gcc \
+ ${RISCV_PREFIX}ld:devel/binutils@riscv64_none_elf
USES= gmake
USE_GITHUB= yes
GH_ACCOUNT= riscv
-RISCV_PREFIX= riscv64-unknown-${OPSYS:tl}${OSREL}-
-BUILD_DEPENDS= ${RISCV_PREFIX}gcc:devel/riscv64-xtoolchain-gcc
+RISCV_PREFIX= riscv64-none-elf-
MAKE_ARGS= CROSS_COMPILE=${RISCV_PREFIX} I=${STAGEDIR}${PREFIX}
OPTIONS_GROUP= PLATFORMS
-OPTIONS_GROUP_PLATFORMS=QEMU_VIRT SIFIVE_FU540
+OPTIONS_GROUP_PLATFORMS=QEMU_VIRT SIFIVE_FU540 SPIKE
OPTIONS_SUB= yes
-OPTIONS_DEFAULT= QEMU_VIRT SIFIVE_FU540
+OPTIONS_DEFAULT= QEMU_VIRT SIFIVE_FU540 SPIKE
QEMU_VIRT_DESC= Support for QEMU Virt platform
QEMU_VIRT_PLATFORM= qemu/virt
@@ -31,6 +32,10 @@
SIFIVE_FU540_DESC= Support for SiFive U540 platform
SIFIVE_FU540_PLATFORM= sifive/fu540
+SPIKE_DESC= Support for Spike ISA Simulator platform
+SPIKE_PLATFORM= spike
+SPIKE_STRIP_ARGS= -K tohost -K fromhost
+
INSTALL_TARGET= install
.for platform in ${OPTIONS_GROUP_PLATFORMS}
@@ -46,9 +51,8 @@
I=${STAGEDIR}${DATADIR} install_libplatsbi
post-install-${platform}-on:
-.for i in dynamic jump payload
- ${STRIP_CMD} ${STAGEDIR}${DATADIR}/platform/${${platform}_PLATFORM}/firmware/fw_${i}.elf
-.endfor
+ ${STRIP_CMD} ${${platform}_STRIP_ARGS} \
+ ${STAGEDIR}${DATADIR}/platform/${${platform}_PLATFORM}/firmware/fw_*.elf
${STRIP_CMD} ${STAGEDIR}${DATADIR}/platform/${${platform}_PLATFORM}/firmware/payloads/test.elf
.endfor # OPTIONS_GROUP_PLATFORMS
Index: head/sysutils/opensbi/distinfo
===================================================================
--- head/sysutils/opensbi/distinfo
+++ head/sysutils/opensbi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1571500133
-SHA256 (riscv-opensbi-v0.5_GH0.tar.gz) = bc82f1e63663cafb7976b324d8a01263510cfd816063dc89e0ccffb9763fb1dd
-SIZE (riscv-opensbi-v0.5_GH0.tar.gz) = 138745
+TIMESTAMP = 1582555902
+SHA256 (riscv-opensbi-v0.6_GH0.tar.gz) = 46a93afd5465eba094ddba40015e754bf09f9e80e0702c00013d6bdb3ecd0a72
+SIZE (riscv-opensbi-v0.6_GH0.tar.gz) = 148351
Index: head/sysutils/opensbi/pkg-plist
===================================================================
--- head/sysutils/opensbi/pkg-plist
+++ head/sysutils/opensbi/pkg-plist
@@ -6,7 +6,6 @@
include/sbi/riscv_fp.h
include/sbi/riscv_io.h
include/sbi/riscv_locks.h
-include/sbi/riscv_unpriv.h
include/sbi/sbi_bitops.h
include/sbi/sbi_bits.h
include/sbi/sbi_console.h
@@ -17,9 +16,11 @@
include/sbi/sbi_error.h
include/sbi/sbi_fifo.h
include/sbi/sbi_hart.h
+include/sbi/sbi_hfence.h
include/sbi/sbi_illegal_insn.h
include/sbi/sbi_init.h
include/sbi/sbi_ipi.h
+include/sbi/sbi_list.h
include/sbi/sbi_misaligned_ldst.h
include/sbi/sbi_platform.h
include/sbi/sbi_scratch.h
@@ -29,11 +30,13 @@
include/sbi/sbi_tlb.h
include/sbi/sbi_trap.h
include/sbi/sbi_types.h
+include/sbi/sbi_unpriv.h
include/sbi/sbi_version.h
include/sbi_utils/irqchip/plic.h
include/sbi_utils/serial/sifive-uart.h
include/sbi_utils/serial/uart8250.h
include/sbi_utils/sys/clint.h
+include/sbi_utils/sys/htif.h
lib/libsbi.a
lib/libsbiutils.a
%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/fw_dynamic.bin
@@ -54,3 +57,10 @@
%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/payloads/test.bin
%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/payloads/test.elf
%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/lib/libplatsbi.a
+%%SPIKE%%%%DATADIR%%/platform/spike/firmware/fw_jump.bin
+%%SPIKE%%%%DATADIR%%/platform/spike/firmware/fw_jump.elf
+%%SPIKE%%%%DATADIR%%/platform/spike/firmware/fw_payload.bin
+%%SPIKE%%%%DATADIR%%/platform/spike/firmware/fw_payload.elf
+%%SPIKE%%%%DATADIR%%/platform/spike/firmware/payloads/test.bin
+%%SPIKE%%%%DATADIR%%/platform/spike/firmware/payloads/test.elf
+%%SPIKE%%%%DATADIR%%/platform/spike/lib/libplatsbi.a

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 31, 10:48 PM (12 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28208226
Default Alt Text
D23820.diff (4 KB)

Event Timeline