From nobody Tue Jan 03 15:34:37 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NmcH16xCjz2nyBg; Tue, 3 Jan 2023 15:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NmcH168Djz3RHv; Tue, 3 Jan 2023 15:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672760077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=COwpJJl4BK7PNOq5HRfYWvSB66me7Zt3AH/fF8cq7sU=; b=h2ob4mdNCPd8DzBsa6Ajwkmb2ge8fdNw3Jge1SxLuXdLtQWD0jq3OjS0K1wLGscEaIJP8y kloUajxG1vsrXBTSU3bK8XSJq42bwJvGH6gQBvA5SterxepvM07qLrkYEb4msv22Nf0Raj d0UUfRLBqqCp95wqq1PA1qJU52kEhNGnWu23iqfcnc9XLb/Ajn1fk/bG0DI5JUmzMlvS+n 53my4A9eiYsKoA+BVzebGT0RWfj5Iuqd/IeHLvXJz+b/lCxmuKlKapRtQ0dpCKLMHui/rH TT+6j7LQEKXoaUS8Q4z/WJ4jbK333UiKhGQMAtFT7EuFmFjEEFeTFJSPfVIdvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672760077; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=COwpJJl4BK7PNOq5HRfYWvSB66me7Zt3AH/fF8cq7sU=; b=ohENsqlhxFCCnXYrsfghdbtkmTguHZZNwoKtklWwWUvoa5J0gK55MB4J8jr19Ey142uxh/ fQqOE3HSV5YgIiGYWR6NKLjDLtm8BH05zTpC/H7HD/McXBWfu93oho+eraAmVYxISn7Q2W ZcFlQuDtXCInFgnHnXxqcsjDaXh7zE4sr+dF3JGOqdCCdFRRBPv8Kqji3UruoeCAM9g+5e JsSlcs0Z6e5wqO5oeko2dcOzx8z1WxwWiU+opWxWtOyXUubU3STPTc2WMn9TjxMgARjNbA ybmHDosMyI4tP5Wtrn/Q68j5FST0dgaJqMd6/iHfsIRVPVYxG+DciaQ858/fIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672760077; a=rsa-sha256; cv=none; b=J05taO8Ylve0puBqkT/5gq4TaSPNYOwe5yscczTmmpJTPuEaM91r3UL0k1QThX5avotLfK hTGNo1r+rLA1QB9OfgFqsK2zeTo55onGx/qiz6VCD0f3Ux+ResDaLGiCPPJkJsr/Ep35jU m3q63cFN1n6uAyxhGmJAoc0vTEM+RjJClpPqmxmVCDrlx6XtZKat2YuSPYZGJuF/kcXqiO QO2emQoe13bGy/7ZhMRLrxgR9PNu+FIpsBA2UzwJc7+NCig8oXIqYPrDg8rLJnf1tOAZ4+ rSJD6o9Xo38+jvDGSM0P585iD4fNi3GHKtreeBd8Z8762NMFiowv0q7s60No9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NmcH15BmXzccD; Tue, 3 Jan 2023 15:34:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 303FYbjq018525; Tue, 3 Jan 2023 15:34:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 303FYbkG018524; Tue, 3 Jan 2023 15:34:37 GMT (envelope-from git) Date: Tue, 3 Jan 2023 15:34:37 GMT Message-Id: <202301031534.303FYbkG018524@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mitchell Horne Subject: git: b594a4b70c07 - main - sysutils/opensbi: update to version 1.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b594a4b70c0719165896b87fdd0350bc100a9878 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=b594a4b70c0719165896b87fdd0350bc100a9878 commit b594a4b70c0719165896b87fdd0350bc100a9878 Author: Mitchell Horne AuthorDate: 2022-12-19 22:49:04 +0000 Commit: Mitchell Horne CommitDate: 2023-01-03 15:33:47 +0000 sysutils/opensbi: update to version 1.2 With this version, stop providing the library and header files altogether. I do not think they are useful at this time. Bump associate u-boot port revisions. Reviewed by: lwhsu Approved by: lwhsu (ports) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37934 --- sysutils/opensbi/Makefile | 17 ++++----- sysutils/opensbi/distinfo | 6 ++-- sysutils/opensbi/pkg-plist | 67 ----------------------------------- sysutils/u-boot-sifive-fu540/Makefile | 2 ++ sysutils/u-boot-sifive-fu740/Makefile | 2 ++ 5 files changed, 16 insertions(+), 78 deletions(-) diff --git a/sysutils/opensbi/Makefile b/sysutils/opensbi/Makefile index 0a916f22222e..e488d185ae4c 100644 --- a/sysutils/opensbi/Makefile +++ b/sysutils/opensbi/Makefile @@ -1,21 +1,22 @@ PORTNAME= opensbi DISTVERSIONPREFIX=v -DISTVERSION= 1.1 +DISTVERSION= 1.2 CATEGORIES= sysutils MAINTAINER= mhorne@FreeBSD.org COMMENT= RISC-V SBI bootloader and firmware -WWW= https://github.com/riscv/opensbi +WWW= https://github.com/riscv-software-src/opensbi LICENSE= BSD2CLAUSE -BUILD_DEPENDS= bash:shells/bash +BUILD_DEPENDS= bash:shells/bash \ + dtc:sysutils/dtc -USES= gmake shebangfix -SHEBANG_FILES= scripts/*.sh +USES= gmake python:build shebangfix +SHEBANG_FILES= scripts/Kconfiglib/*.py USE_GITHUB= yes -GH_ACCOUNT= riscv +GH_ACCOUNT= riscv-software-src MAKE_ARGS= CC=clang I=${STAGEDIR}${PREFIX} V=1 FW_PAYLOAD=n @@ -34,6 +35,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: @@ -43,8 +46,6 @@ do-install-${platform}-on: ${MKDIR} ${STAGEDIR}${PREFIX} ${MAKE_CMD} -C ${WRKSRC} PLATFORM=${${platform}_PLATFORM} ${MAKE_ARGS} \ I=${STAGEDIR}${PREFIX} V=1 install_firmwares - ${MAKE_CMD} -C ${WRKSRC} PLATFORM=${${platform}_PLATFORM} ${MAKE_ARGS} \ - I=${STAGEDIR}${PREFIX} V=1 install_libplatsbi post-install-${platform}-on: ${STRIP_CMD} ${${platform}_STRIP_ARGS} \ diff --git a/sysutils/opensbi/distinfo b/sysutils/opensbi/distinfo index 393e22ea3ab1..d88fd9dc680e 100644 --- a/sysutils/opensbi/distinfo +++ b/sysutils/opensbi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1656188838 -SHA256 (riscv-opensbi-v1.1_GH0.tar.gz) = d183cb890130983a4f01e75fc03ee4f7ea0e16a7923b8af9c6dff7deb2fedaec -SIZE (riscv-opensbi-v1.1_GH0.tar.gz) = 241383 +TIMESTAMP = 1672591798 +SHA256 (riscv-software-src-opensbi-v1.2_GH0.tar.gz) = 8fcbce598a73acc2c7f7d5607d46b9d5107d3ecbede8f68f42631dcfc25ef2b2 +SIZE (riscv-software-src-opensbi-v1.2_GH0.tar.gz) = 356905 diff --git a/sysutils/opensbi/pkg-plist b/sysutils/opensbi/pkg-plist index 6a660f894053..444198483dc1 100644 --- a/sysutils/opensbi/pkg-plist +++ b/sysutils/opensbi/pkg-plist @@ -1,70 +1,3 @@ -include/sbi/fw_dynamic.h -include/sbi/riscv_asm.h -include/sbi/riscv_atomic.h -include/sbi/riscv_barrier.h -include/sbi/riscv_elf.h -include/sbi/riscv_encoding.h -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_console.h -include/sbi/sbi_const.h -include/sbi/sbi_csr_detect.h -include/sbi/sbi_domain.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_pmu.h -include/sbi/sbi_scratch.h -include/sbi/sbi_string.h -include/sbi/sbi_system.h -include/sbi/sbi_timer.h -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/fdt/fdt_domain.h -include/sbi_utils/fdt/fdt_fixup.h -include/sbi_utils/fdt/fdt_helper.h -include/sbi_utils/fdt/fdt_pmu.h -include/sbi_utils/gpio/fdt_gpio.h -include/sbi_utils/gpio/gpio.h -include/sbi_utils/i2c/fdt_i2c.h -include/sbi_utils/i2c/i2c.h -include/sbi_utils/ipi/aclint_mswi.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/gaisler-uart.h -include/sbi_utils/serial/litex-uart.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/htif.h -include/sbi_utils/sys/sifive_test.h -include/sbi_utils/timer/aclint_mtimer.h -include/sbi_utils/timer/fdt_timer.h -lib64/%%RISCV_ABI%%/libsbi.a -lib64/%%RISCV_ABI%%/libsbiutils.a -%%GENERIC%%lib64/%%RISCV_ABI%%/opensbi/generic/lib/libplatsbi.a %%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 diff --git a/sysutils/u-boot-sifive-fu540/Makefile b/sysutils/u-boot-sifive-fu540/Makefile index 5f79e53b93d8..05550af0388c 100644 --- a/sysutils/u-boot-sifive-fu540/Makefile +++ b/sysutils/u-boot-sifive-fu540/Makefile @@ -1,5 +1,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2022.10= 1 + MODEL= sifive-fu540 BOARD_CONFIG= sifive_unleashed_defconfig FAMILY= sifive diff --git a/sysutils/u-boot-sifive-fu740/Makefile b/sysutils/u-boot-sifive-fu740/Makefile index 3902e50d6394..f053b48e6897 100644 --- a/sysutils/u-boot-sifive-fu740/Makefile +++ b/sysutils/u-boot-sifive-fu740/Makefile @@ -1,5 +1,7 @@ MASTERDIR= ${.CURDIR}/../u-boot-master +U_BOOT_SLAVE_PORTREVISION_2022.10= 1 + MODEL= sifive-fu740 BOARD_CONFIG= sifive_unmatched_defconfig FAMILY= sifive