Page MenuHomeFreeBSD

D24660.id73408.diff
No OneTemporary

D24660.id73408.diff

Index: sysutils/opensbi/Makefile
===================================================================
--- sysutils/opensbi/Makefile
+++ sysutils/opensbi/Makefile
@@ -2,18 +2,18 @@
PORTNAME= opensbi
DISTVERSIONPREFIX=v
-DISTVERSION= 0.6
+DISTVERSION= 0.8
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
@@ -22,20 +22,17 @@
MAKE_ARGS= CROSS_COMPILE=${RISCV_PREFIX} I=${STAGEDIR}${PREFIX}
OPTIONS_GROUP= PLATFORMS
-OPTIONS_GROUP_PLATFORMS=QEMU_VIRT SIFIVE_FU540 SPIKE
+OPTIONS_GROUP_PLATFORMS=GENERIC SIFIVE_FU540
OPTIONS_SUB= yes
-OPTIONS_DEFAULT= QEMU_VIRT SIFIVE_FU540 SPIKE
+OPTIONS_DEFAULT= GENERIC SIFIVE_FU540
-QEMU_VIRT_DESC= Support for QEMU Virt platform
-QEMU_VIRT_PLATFORM= qemu/virt
+GENERIC_DESC= Support for generic platform
+GENERIC_PLATFORM= generic
+GENERIC_STRIP_ARGS= -K tohost -K fromhost
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}
@@ -44,16 +41,15 @@
${MAKE_CMD} -C ${WRKSRC} ${MAKE_ARGS} PLATFORM=${${platform}_PLATFORM}
do-install-${platform}-on:
- ${MKDIR} ${STAGEDIR}${DATADIR}
+ ${MKDIR} ${STAGEDIR}${LOCALBASE}
${MAKE_CMD} -C ${WRKSRC} PLATFORM=${${platform}_PLATFORM} \
- I=${STAGEDIR}${DATADIR} install_firmwares
+ I=${STAGEDIR}${LOCALBASE} install_firmwares
${MAKE_CMD} -C ${WRKSRC} PLATFORM=${${platform}_PLATFORM} \
- I=${STAGEDIR}${DATADIR} install_libplatsbi
+ I=${STAGEDIR}${LOCALBASE} install_libplatsbi
post-install-${platform}-on:
${STRIP_CMD} ${${platform}_STRIP_ARGS} \
- ${STAGEDIR}${DATADIR}/platform/${${platform}_PLATFORM}/firmware/fw_*.elf
- ${STRIP_CMD} ${STAGEDIR}${DATADIR}/platform/${${platform}_PLATFORM}/firmware/payloads/test.elf
+ ${STAGEDIR}${DATADIR}/lp64/${${platform}_PLATFORM}/firmware/fw_*.elf
.endfor # OPTIONS_GROUP_PLATFORMS
Index: sysutils/opensbi/distinfo
===================================================================
--- sysutils/opensbi/distinfo
+++ sysutils/opensbi/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1582555902
-SHA256 (riscv-opensbi-v0.6_GH0.tar.gz) = 46a93afd5465eba094ddba40015e754bf09f9e80e0702c00013d6bdb3ecd0a72
-SIZE (riscv-opensbi-v0.6_GH0.tar.gz) = 148351
+TIMESTAMP = 1592679770
+SHA256 (riscv-opensbi-v0.8_GH0.tar.gz) = 17e048ac765e92e15f7436b604452614cf88dc2bcbbaab18cdc024f3fdd4c575
+SIZE (riscv-opensbi-v0.8_GH0.tar.gz) = 172450
Index: sysutils/opensbi/pkg-plist
===================================================================
--- sysutils/opensbi/pkg-plist
+++ sysutils/opensbi/pkg-plist
@@ -6,21 +6,25 @@
include/sbi/riscv_fp.h
include/sbi/riscv_io.h
include/sbi/riscv_locks.h
+include/sbi/sbi_bitmap.h
include/sbi/sbi_bitops.h
-include/sbi/sbi_bits.h
include/sbi/sbi_console.h
include/sbi/sbi_const.h
+include/sbi/sbi_csr_detect.h
include/sbi/sbi_ecall.h
include/sbi/sbi_ecall_interface.h
include/sbi/sbi_emulate_csr.h
include/sbi/sbi_error.h
include/sbi/sbi_fifo.h
include/sbi/sbi_hart.h
+include/sbi/sbi_hartmask.h
include/sbi/sbi_hfence.h
+include/sbi/sbi_hsm.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_math.h
include/sbi/sbi_misaligned_ldst.h
include/sbi/sbi_platform.h
include/sbi/sbi_scratch.h
@@ -32,35 +36,33 @@
include/sbi/sbi_types.h
include/sbi/sbi_unpriv.h
include/sbi/sbi_version.h
+include/sbi_utils/fdt/fdt_fixup.h
+include/sbi_utils/fdt/fdt_helper.h
+include/sbi_utils/ipi/fdt_ipi.h
+include/sbi_utils/irqchip/fdt_irqchip.h
include/sbi_utils/irqchip/plic.h
+include/sbi_utils/reset/fdt_reset.h
+include/sbi_utils/serial/fdt_serial.h
+include/sbi_utils/serial/shakti-uart.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
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/fw_dynamic.elf
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/fw_jump.bin
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/fw_jump.elf
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/fw_payload.bin
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/fw_payload.elf
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/payloads/test.bin
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/firmware/payloads/test.elf
-%%QEMU_VIRT%%%%DATADIR%%/platform/qemu/virt/lib/libplatsbi.a
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/fw_dynamic.bin
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/fw_dynamic.elf
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/fw_jump.bin
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/fw_jump.elf
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/fw_payload.bin
-%%SIFIVE_FU540%%%%DATADIR%%/platform/sifive/fu540/firmware/fw_payload.elf
-%%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
+include/sbi_utils/sys/sifive_test.h
+include/sbi_utils/timer/fdt_timer.h
+lib64/lp64/libsbi.a
+lib64/lp64/libsbiutils.a
+lib64/lp64/opensbi/generic/lib/libplatsbi.a
+lib64/lp64/opensbi/sifive/fu540/lib/libplatsbi.a
+%%GENERIC%%%%DATADIR%%/lp64/generic/firmware/fw_dynamic.bin
+%%GENERIC%%%%DATADIR%%/lp64/generic/firmware/fw_dynamic.elf
+%%GENERIC%%%%DATADIR%%/lp64/generic/firmware/fw_jump.bin
+%%GENERIC%%%%DATADIR%%/lp64/generic/firmware/fw_jump.elf
+%%GENERIC%%%%DATADIR%%/lp64/generic/firmware/fw_payload.bin
+%%GENERIC%%%%DATADIR%%/lp64/generic/firmware/fw_payload.elf
+%%SIFIVE_FU540%%%%DATADIR%%/lp64/sifive/fu540/firmware/fw_dynamic.bin
+%%SIFIVE_FU540%%%%DATADIR%%/lp64/sifive/fu540/firmware/fw_dynamic.elf
+%%SIFIVE_FU540%%%%DATADIR%%/lp64/sifive/fu540/firmware/fw_jump.bin
+%%SIFIVE_FU540%%%%DATADIR%%/lp64/sifive/fu540/firmware/fw_jump.elf
+%%SIFIVE_FU540%%%%DATADIR%%/lp64/sifive/fu540/firmware/fw_payload.bin
+%%SIFIVE_FU540%%%%DATADIR%%/lp64/sifive/fu540/firmware/fw_payload.elf

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 3, 9:54 PM (9 h, 34 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16954427
Default Alt Text
D24660.id73408.diff (6 KB)

Event Timeline