Index: sysutils/opensbi/Makefile =================================================================== --- sysutils/opensbi/Makefile (révision 539795) +++ sysutils/opensbi/Makefile (copie de travail) @@ -2,7 +2,7 @@ PORTNAME= opensbi DISTVERSIONPREFIX=v -DISTVERSION= 0.6 +DISTVERSION= 0.8 CATEGORIES= sysutils MAINTAINER= mhorne@FreeBSD.org @@ -22,22 +22,39 @@ MAKE_ARGS= CROSS_COMPILE=${RISCV_PREFIX} I=${STAGEDIR}${PREFIX} OPTIONS_GROUP= PLATFORMS -OPTIONS_GROUP_PLATFORMS=QEMU_VIRT SIFIVE_FU540 SPIKE +OPTIONS_GROUP_PLATFORMS=ANDES_AE350 FPGA_ARIANE FPGA_OPENPITON GENERIC NUCLEI_UX600 SIFIVE_FU540 THEAD_C910 OPTIONS_SUB= yes -OPTIONS_DEFAULT= QEMU_VIRT SIFIVE_FU540 SPIKE +OPTIONS_DEFAULT= ANDES_AE350 FPGA_ARIANE FPGA_OPENPITON GENERIC NUCLEI_UX600 SIFIVE_FU540 THEAD_C910 -QEMU_VIRT_DESC= Support for QEMU Virt platform -QEMU_VIRT_PLATFORM= qemu/virt +ANDES_AE350_DESC= Support for Andes AE350 platform +ANDES_AE350_PLATFORM= andes/ae350 +FPGA_ARIANE_DESC= Support for FPGA Ariane platform +FPGA_ARIANE_PLATFORM= fpga/ariane + +FPGA_OPENPITON_DESC= Support for FPGA Openpiton platform +FPGA_OPENPITON_PLATFORM= fpga/openpiton + +GENERIC_DESC= Support for GENERIC platforms (QEMU, Spike) +GENERIC_PLATFORM= generic + +#TODO: k210.c not found +#KENDRYTE_K210_DESC= Support for Kendryte K210 platform +#KENDRYTE_K210_PLATFORM= kendryte/k210 + +NUCLEI_UX600_DESC= Support for NUCLEI UX600 platform +NUCLEI_UX600_PLATFORM= nuclei/ux600 + 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 +THEAD_C910_DESC= Support for THEAD C910 platform +THEAD_C910_PLATFORM= thead/c910 INSTALL_TARGET= install +PLATFORM_RISCV_ABI = lp64 + .for platform in ${OPTIONS_GROUP_PLATFORMS} post-build-${platform}-on: @@ -46,14 +63,16 @@ do-install-${platform}-on: ${MKDIR} ${STAGEDIR}${DATADIR} ${MAKE_CMD} -C ${WRKSRC} PLATFORM=${${platform}_PLATFORM} \ - I=${STAGEDIR}${DATADIR} install_firmwares + I=${STAGEDIR}${PREFIX} install_firmwares ${MAKE_CMD} -C ${WRKSRC} PLATFORM=${${platform}_PLATFORM} \ - I=${STAGEDIR}${DATADIR} install_libplatsbi + I=${STAGEDIR}${PREFIX} 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}/${PLATFORM_RISCV_ABI}/${${platform}_PLATFORM}/firmware/fw_*.elf + if test -f ${STAGEDIR}${DATADIR}/${PLATFORM_RISCV_ABI}/${${platform}_PLATFORM}/firmware/payloads/test.elf ; then \ + ${STRIP_CMD} ${STAGEDIR}${DATADIR}/${PLATFORM_RISCV_ABI}/${${platform}_PLATFORM}/firmware/payloads/test.elf; \ + fi .endfor # OPTIONS_GROUP_PLATFORMS Index: sysutils/opensbi/distinfo =================================================================== --- sysutils/opensbi/distinfo (révision 539795) +++ sysutils/opensbi/distinfo (copie de travail) @@ -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 = 1592804506 +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 (révision 539795) +++ sysutils/opensbi/pkg-plist (copie de travail) @@ -6,10 +6,11 @@ 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 @@ -16,11 +17,14 @@ 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,68 @@ 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 +%%ANDES_AE350%%lib64/lp64/opensbi/andes/ae350/lib/libplatsbi.a +%%FPGA_ARIANE%%lib64/lp64/opensbi/fpga/ariane/lib/libplatsbi.a +%%FPGA_OPENPITON%%lib64/lp64/opensbi/fpga/openpiton/lib/libplatsbi.a +%%GENERIC%%lib64/lp64/opensbi/generic/lib/libplatsbi.a +%%NUCLEI_UX600%%lib64/lp64/opensbi/nuclei/ux600/lib/libplatsbi.a +%%SIFIVE_FU540%%lib64/lp64/opensbi/sifive/fu540/lib/libplatsbi.a +%%THEAD_C910%%lib64/lp64/opensbi/thead/c910/lib/libplatsbi.a +%%ANDES_AE350%%%%DATADIR%%/lp64/andes/ae350/firmware/fw_dynamic.bin +%%ANDES_AE350%%%%DATADIR%%/lp64/andes/ae350/firmware/fw_dynamic.elf +%%ANDES_AE350%%%%DATADIR%%/lp64/andes/ae350/firmware/fw_jump.bin +%%ANDES_AE350%%%%DATADIR%%/lp64/andes/ae350/firmware/fw_jump.elf +%%ANDES_AE350%%%%DATADIR%%/lp64/andes/ae350/firmware/fw_payload.bin +%%ANDES_AE350%%%%DATADIR%%/lp64/andes/ae350/firmware/fw_payload.elf +%%ANDES_AE350%%%%DATADIR%%/lp64/andes/ae350/firmware/payloads/test.bin +%%ANDES_AE350%%%%DATADIR%%/lp64/andes/ae350/firmware/payloads/test.elf +%%FPGA_ARIANE%%%%DATADIR%%/lp64/fpga/ariane/firmware/fw_payload.bin +%%FPGA_ARIANE%%%%DATADIR%%/lp64/fpga/ariane/firmware/fw_payload.elf +%%FPGA_ARIANE%%%%DATADIR%%/lp64/fpga/ariane/firmware/payloads/test.bin +%%FPGA_ARIANE%%%%DATADIR%%/lp64/fpga/ariane/firmware/payloads/test.elf +%%FPGA_OPENPITON%%%%DATADIR%%/lp64/fpga/openpiton/firmware/fw_payload.bin +%%FPGA_OPENPITON%%%%DATADIR%%/lp64/fpga/openpiton/firmware/fw_payload.elf +%%FPGA_OPENPITON%%%%DATADIR%%/lp64/fpga/openpiton/firmware/payloads/test.bin +%%FPGA_OPENPITON%%%%DATADIR%%/lp64/fpga/openpiton/firmware/payloads/test.elf +%%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 +%%GENERIC%%%%DATADIR%%/lp64/generic/firmware/payloads/test.bin +%%GENERIC%%%%DATADIR%%/lp64/generic/firmware/payloads/test.elf +%%NUCLEI_UX600%%%%DATADIR%%/lp64/nuclei/ux600/firmware/fw_dynamic.bin +%%NUCLEI_UX600%%%%DATADIR%%/lp64/nuclei/ux600/firmware/fw_dynamic.elf +%%NUCLEI_UX600%%%%DATADIR%%/lp64/nuclei/ux600/firmware/fw_jump.bin +%%NUCLEI_UX600%%%%DATADIR%%/lp64/nuclei/ux600/firmware/fw_jump.elf +%%NUCLEI_UX600%%%%DATADIR%%/lp64/nuclei/ux600/firmware/fw_payload.bin +%%NUCLEI_UX600%%%%DATADIR%%/lp64/nuclei/ux600/firmware/fw_payload.elf +%%NUCLEI_UX600%%%%DATADIR%%/lp64/nuclei/ux600/firmware/payloads/test.bin +%%NUCLEI_UX600%%%%DATADIR%%/lp64/nuclei/ux600/firmware/payloads/test.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 +%%SIFIVE_FU540%%%%DATADIR%%/lp64/sifive/fu540/firmware/payloads/test.bin +%%SIFIVE_FU540%%%%DATADIR%%/lp64/sifive/fu540/firmware/payloads/test.elf +%%THEAD_C910%%%%DATADIR%%/lp64/thead/c910/firmware/fw_jump.bin +%%THEAD_C910%%%%DATADIR%%/lp64/thead/c910/firmware/fw_jump.elf