From nobody Mon Feb 24 21:17:43 2025 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 4Z1tqX2FgVz5ngJ7; Mon, 24 Feb 2025 21:17:44 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z1tqX05w9z3DnV; Mon, 24 Feb 2025 21:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740431864; 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=uRdk8WEivc/oVsAqfNorU3UUi2mIKI47wRBIMTDn90E=; b=BZfZQ9uzfintySlMiNINVNC9LAQ4Q3kgF0wypzPCB+QlHA8/2L2pXl9vdTn8hHmhV+44lo 6JjdZEzHsWsJVIasHsL6/gagV6R8uvDxkC88M4NBf6HVCeuXNs7oSaXd8RtDmUWWDBneEI Am7NNHqTxL+QfooR7rAWMZI3jPg3oBWBaBm/odTBXSiwc6C5sGF6ZwPOphu2j65hVGXBgL nFAolffOHWUAsBpKFIEh5xjMKC/R22BKCNdiWd575kldkfY4KIL3dhOc6jwZqaZn/ZUBAy vSc8f7tKsZnaGu5/bMeozPEoLZKYreRSE8Xe8IAaLgSmZg9OAsDndz4gY4k+nA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740431864; a=rsa-sha256; cv=none; b=An6m5lJ/KirZljVZ030TeoLITJ2k5+7khGf/r009PI75VyMTzIc3Vb7RGxfIIa+5AEWEVz FA0pxrQxfj4EWjK5l/hImY5d6ZG+Ih/qQMYckQbKjXEYsEA+HN4s6XHzjOU6t1sznyTA6g GC+ricrEf5n4MMdb4jEzgoZUGoLXno2PfyMh/v4mC1/1m0/Jj1SP6kJRYq2+WN8CaQKVWV sUoISp4YN5e3B1bna8ElWlOGbDPcPMxqu5FJQrcz54S+TOCxGSKspmNBYdfQRdedNRUrAR GxebM176MfuNqJGvNRcD78g2kRlfXa8FjaG6nhelrOrrf24z0O1TdqBWkEaHaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740431864; 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=uRdk8WEivc/oVsAqfNorU3UUi2mIKI47wRBIMTDn90E=; b=CkYz62dqchgTLrXy2ela9E/t39irW86KbXDL/eEhzIkewqBMz/Ir6wdVurim9j4uWyDUMl kNcWUCSuDbXC9cVptcsQD+1Kd2R/gekLmAyyWsuece/ZiNwgjlo+mEVjPlhwJ3N0NmxjsY hA61rHO6+oBr3FG4CbXsrdz3WxUFpJOBvLUusjSFF+XKs/XWpxNwvvCR0bpaTYACQv2DdO guCOmUGxcHlQatLB7OQaOLgOdfJ0LkbUer4cN0kKeXcvEgkfwaePIVIpZIVvCzSE0bXqhR Sks+W5xkunLEKp8A679DTujearIgfEmqBCxJTWFCh+enP/Umy+hwNX7vDke8qw== 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 4Z1tqW6ZWpzxQB; Mon, 24 Feb 2025 21:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51OLHhMN021582; Mon, 24 Feb 2025 21:17:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51OLHhAJ021579; Mon, 24 Feb 2025 21:17:43 GMT (envelope-from git) Date: Mon, 24 Feb 2025 21:17:43 GMT Message-Id: <202502242117.51OLHhAJ021579@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: 1ebf5e656c9f - main - sysutils/opensbi: update to v1.6 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 1ebf5e656c9fcc68e6f62685e0e97e4228a4267a Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/ports/commit/?id=1ebf5e656c9fcc68e6f62685e0e97e4228a4267a commit 1ebf5e656c9fcc68e6f62685e0e97e4228a4267a Author: Mitchell Horne AuthorDate: 2024-07-08 14:34:35 +0000 Commit: Mitchell Horne CommitDate: 2025-02-24 21:17:28 +0000 sysutils/opensbi: update to v1.6 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 --- sysutils/opensbi/Makefile | 33 +++++----------------- sysutils/opensbi/distinfo | 6 ++-- sysutils/opensbi/files/patch-Makefile | 20 ------------- .../files/patch-platform_generic_sifive_fu540.c | 5 ++-- sysutils/opensbi/pkg-plist | 8 +++--- sysutils/u-boot-sifive-fu540/Makefile | 2 ++ sysutils/u-boot-sifive-fu740/Makefile | 2 ++ sysutils/u-boot-starfive-visionfive2/Makefile | 2 ++ 8 files changed, 23 insertions(+), 55 deletions(-) diff --git a/sysutils/opensbi/Makefile b/sysutils/opensbi/Makefile index 745ca761c7de..703e9218ed9f 100644 --- a/sysutils/opensbi/Makefile +++ b/sysutils/opensbi/Makefile @@ -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 diff --git a/sysutils/opensbi/distinfo b/sysutils/opensbi/distinfo index fbed4ec056d0..27de00840a02 100644 --- a/sysutils/opensbi/distinfo +++ b/sysutils/opensbi/distinfo @@ -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 diff --git a/sysutils/opensbi/files/patch-Makefile b/sysutils/opensbi/files/patch-Makefile deleted file mode 100644 index e98a465c25da..000000000000 --- a/sysutils/opensbi/files/patch-Makefile +++ /dev/null @@ -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 diff --git a/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c b/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c index fa402a00203b..9f776d796e1b 100644 --- a/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c +++ b/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c @@ -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 #include +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; + diff --git a/sysutils/opensbi/pkg-plist b/sysutils/opensbi/pkg-plist index 444198483dc1..cc5e3f421a5b 100644 --- a/sysutils/opensbi/pkg-plist +++ b/sysutils/opensbi/pkg-plist @@ -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 diff --git a/sysutils/u-boot-sifive-fu540/Makefile b/sysutils/u-boot-sifive-fu540/Makefile index 5f79e53b93d8..51643c092390 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_2024.07=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..98d38e935010 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_2024.07=1 + MODEL= sifive-fu740 BOARD_CONFIG= sifive_unmatched_defconfig FAMILY= sifive diff --git a/sysutils/u-boot-starfive-visionfive2/Makefile b/sysutils/u-boot-starfive-visionfive2/Makefile index 101a17f18a02..391d3b2321e6 100644 --- a/sysutils/u-boot-starfive-visionfive2/Makefile +++ b/sysutils/u-boot-starfive-visionfive2/Makefile @@ -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