From nobody Tue Jun 28 20:16:22 2022 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 4AD1F86398E; Tue, 28 Jun 2022 20:16:23 +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 4LXbTL6hRrz3tl9; Tue, 28 Jun 2022 20:16:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656447382; 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=Q+pzqD4QZFU5hTQ4beneEFvqVDsE1e/yXCuuxHBw9YM=; b=et2elQkE0VKNdibjZcuhWBB54WbJYeiYZmcyAoKXC8DydZc6+6qoB+G3pvT0a7+ORy71oh k5EDGKA9Dw4WdwqEFdjvdvBq5vqQ91NVcVFFfoqLFFd56OCkhRU4YE2BurGHw8i3sA8ZCa v67KL9om94kyv1DKLWuTwmfUzTB7Rf3NOa4v80//B3DmExuQcRe63V4CoVUqBym2Sjz9WJ RHEujoy6973Z8qQuwYp8ossRsPwd0C1CiHesFkBjxf0zjPMaiibHJk1Jgz/mJVVfkL7PCR JhcnGa1XyKeJ0O1lujlFRkYYj1pXf/EcBUhPUCXsK/r9Wm4A0Z4her9gOcDqKA== 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 C6C2A2394B; Tue, 28 Jun 2022 20:16:22 +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 25SKGMji031190; Tue, 28 Jun 2022 20:16:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25SKGMp7031189; Tue, 28 Jun 2022 20:16:22 GMT (envelope-from git) Date: Tue, 28 Jun 2022 20:16:22 GMT Message-Id: <202206282016.25SKGMp7031189@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: 8a0d40f973db - main - sysutils/opensbi: update to version 1.1 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: 8a0d40f973dbc5961cbb8a44123c8c2317031d33 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656447382; 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=Q+pzqD4QZFU5hTQ4beneEFvqVDsE1e/yXCuuxHBw9YM=; b=HXzCtHijv3mQs0iM0gtGruwaJKCc0tLRwguOMeQl0uGK+nPt9zqFnQ6tdGz1G42xjWbO66 E3uhBabIaNqZui9GoMN9zeC21wWMqmohvT4LQTRIuEGUQR3qShoqtSpAjRUdanfxSZgbx3 xOMmCzxhKf6qrAqWqLryPoQkRizN2bcN9PPPUpHtdYzvo0lm3MXb2jbD+d/Xj9zY8toCN0 I66bqMzlBb4FCZ2BX3qTQKDdzSYIDGl1XvLISUjuFHu79nTLBPf5CI7h60CviXGRKzXAHl +tY/Tem3MQ8Nm+nb1aiydIEDHRc+UDuPeu+wbZsFcrc78Aljpif5AYdL4VnTnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656447382; a=rsa-sha256; cv=none; b=yXEGVQHvubQNjPB7EfqXuRfC3Dt/q0nzoyuaXclJQlH2oYd/L62aQxA7esVGY+LQkdhDpy dWmUuXWkjq3a2YK/4SKdIjrjef3CObnfO9hmJn086FWeNMar9Lb5BQ2SW0iomJliGy1K0+ fwEhDoJe2DTLg2TR7tphzrSfojAslVIY/wwDGCXx3umw/4Nn+wtzw6rs59aqYDETLW9Ao0 LDMxPatRDLPctn2SlAuSoR1vPJBBpVS+pNCroqkUkRVIYCgWTIyGmBRGlQzIzPFtxMW5XT LLKM/3PVirs9vCqpVS6Y7PDbmUw3MaTbamJUfiE/z5yREgxQkOAeBxRXR+at4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=8a0d40f973dbc5961cbb8a44123c8c2317031d33 commit 8a0d40f973dbc5961cbb8a44123c8c2317031d33 Author: Mitchell Horne AuthorDate: 2022-06-26 14:38:22 +0000 Commit: Mitchell Horne CommitDate: 2022-06-28 20:15:40 +0000 sysutils/opensbi: update to version 1.1 Bump the PORTREVISION of dependent u-boot ports. Reviewed by: lwhsu Approved by: lwhsu (ports) Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D35616 --- sysutils/opensbi/Makefile | 8 ++++++-- sysutils/opensbi/distinfo | 6 +++--- sysutils/opensbi/files/patch-platform_generic_platform.c | 10 +++++----- ...c_sifive__fu540.c => patch-platform_generic_sifive_fu540.c} | 6 +++--- sysutils/u-boot-sifive-fu540/Makefile | 2 ++ sysutils/u-boot-sifive-fu740/Makefile | 2 ++ 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/sysutils/opensbi/Makefile b/sysutils/opensbi/Makefile index fb8b248abac6..090a90e55c67 100644 --- a/sysutils/opensbi/Makefile +++ b/sysutils/opensbi/Makefile @@ -1,6 +1,6 @@ PORTNAME= opensbi DISTVERSIONPREFIX=v -DISTVERSION= 1.0 +DISTVERSION= 1.1 CATEGORIES= sysutils MAINTAINER= mhorne@FreeBSD.org @@ -8,7 +8,11 @@ COMMENT= RISC-V SBI bootloader and firmware LICENSE= BSD2CLAUSE -USES= gmake +BUILD_DEPENDS= bash:shells/bash + +USES= gmake shebangfix +SHEBANG_FILES= scripts/*.sh + USE_GITHUB= yes GH_ACCOUNT= riscv diff --git a/sysutils/opensbi/distinfo b/sysutils/opensbi/distinfo index 6a679cea4bfb..393e22ea3ab1 100644 --- a/sysutils/opensbi/distinfo +++ b/sysutils/opensbi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1641325249 -SHA256 (riscv-opensbi-v1.0_GH0.tar.gz) = a5efaeb24f5ee88d13d5788e4e00623ff312ee12c0bf736aa75a6ad9a850fb76 -SIZE (riscv-opensbi-v1.0_GH0.tar.gz) = 225774 +TIMESTAMP = 1656188838 +SHA256 (riscv-opensbi-v1.1_GH0.tar.gz) = d183cb890130983a4f01e75fc03ee4f7ea0e16a7923b8af9c6dff7deb2fedaec +SIZE (riscv-opensbi-v1.1_GH0.tar.gz) = 241383 diff --git a/sysutils/opensbi/files/patch-platform_generic_platform.c b/sysutils/opensbi/files/patch-platform_generic_platform.c index 5d39f954ee76..46fe653c5bc9 100644 --- a/sysutils/opensbi/files/patch-platform_generic_platform.c +++ b/sysutils/opensbi/files/patch-platform_generic_platform.c @@ -1,11 +1,11 @@ ---- platform/generic/platform.c.orig 2021-12-24 11:57:44 UTC +--- platform/generic/platform.c.orig 2022-06-25 03:42:10 UTC +++ platform/generic/platform.c -@@ -23,6 +23,8 @@ +@@ -24,6 +24,8 @@ #include #include +int need_pmp_war = FALSE; + - extern const struct platform_override sifive_fu540; - extern const struct platform_override sifive_fu740; - + /* List of platform override modules generated at compile time */ + extern const struct platform_override *platform_override_modules[]; + extern unsigned long platform_override_modules_size; diff --git a/sysutils/opensbi/files/patch-platform_generic_sifive__fu540.c b/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c similarity index 76% rename from sysutils/opensbi/files/patch-platform_generic_sifive__fu540.c rename to sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c index bdd0dce39569..29fd138f269e 100644 --- a/sysutils/opensbi/files/patch-platform_generic_sifive__fu540.c +++ b/sysutils/opensbi/files/patch-platform_generic_sifive_fu540.c @@ -1,5 +1,5 @@ ---- platform/generic/sifive_fu540.c.orig 2021-12-24 11:57:44 UTC -+++ platform/generic/sifive_fu540.c +--- platform/generic/sifive/fu540.c.orig 2022-06-26 14:27:30 UTC ++++ platform/generic/sifive/fu540.c @@ -11,6 +11,15 @@ #include #include @@ -16,7 +16,7 @@ static u64 sifive_fu540_tlbr_flush_limit(const struct fdt_match *match) { /* -@@ -41,6 +50,7 @@ static const struct fdt_match sifive_fu540_match[] = { +@@ -41,6 +50,7 @@ const struct platform_override sifive_fu540 = { }; const struct platform_override sifive_fu540 = { diff --git a/sysutils/u-boot-sifive-fu540/Makefile b/sysutils/u-boot-sifive-fu540/Makefile index 5f79e53b93d8..bdbf228d4178 100644 --- a/sysutils/u-boot-sifive-fu540/Makefile +++ b/sysutils/u-boot-sifive-fu540/Makefile @@ -5,6 +5,8 @@ BOARD_CONFIG= sifive_unleashed_defconfig FAMILY= sifive UBOOT_ARCH= riscv64 +U_BOOT_SLAVE_PORTREVISION_2022.04= 2 + # The FIT image will embed an OpenSBI firmware binary OPENSBI_FIRM= ${LOCALBASE}/share/opensbi/lp64/generic/firmware/fw_dynamic.bin BUILD_DEPENDS+= ${OPENSBI_FIRM}:sysutils/opensbi diff --git a/sysutils/u-boot-sifive-fu740/Makefile b/sysutils/u-boot-sifive-fu740/Makefile index 3902e50d6394..64008f9bfa0d 100644 --- a/sysutils/u-boot-sifive-fu740/Makefile +++ b/sysutils/u-boot-sifive-fu740/Makefile @@ -5,6 +5,8 @@ BOARD_CONFIG= sifive_unmatched_defconfig FAMILY= sifive UBOOT_ARCH= riscv64 +U_BOOT_SLAVE_PORTREVISION_2022.04= 2 + # The FIT image will embed an OpenSBI firmware binary OPENSBI_FIRM= ${LOCALBASE}/share/opensbi/lp64/generic/firmware/fw_dynamic.bin BUILD_DEPENDS+= ${OPENSBI_FIRM}:sysutils/opensbi