From nobody Mon Jan 15 17:33:47 2024 X-Original-To: dev-commits-ports-all@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 4TDK4W4Cjtz579dj; Mon, 15 Jan 2024 17:33:47 +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 4TDK4W3bgGz49fw; Mon, 15 Jan 2024 17:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705340027; 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=nOmqxK+EdJ69fnMSITluE38YAmmmiLF0FpQ5Gq2IQ2c=; b=kS51fUPhfZ1I6W3zEu38DBB17F4GkOD/gsjRmfnMT4KOsOVuusDKf/KKA+S3rxni7JDswp 9jfWAkiuF7vxH1nQJJgXHZSCEio7tZ8y/jiRgwKMt+urmDwA43u9TAdpY91vjHYgyKhzUc i0cKm0hgAhjE9eLXmQ5/MaRSu/HxAnbmtoqaW7Ks8JCyu28HMt6nMp9cU/sS4vzqecr9Sa CBqjyADQgMTGRRMOBhL5sSwTEBOxszAejmSSz/useyMAwfi/DQv+PrYyRIm5enB2ZMp5zt BEvKE4PdFTxPMFkwEZurd7Cd14qquqQ0r49+7cx+jxIbassUxRLOfXUJyqjvZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705340027; 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=nOmqxK+EdJ69fnMSITluE38YAmmmiLF0FpQ5Gq2IQ2c=; b=nqnwS7gKu1KZzx0jwyf8Jh4RAAYhgK+kpfav5PMT0Hy+YhBq4sAvXTEb85pRg23xTucMb1 0eUxYz5PVRux62AGLmGTNxRbQHXo5ZJxRHEX5sIL/Ug8e7/KaOtnT4wnwoNWhQ9Uah1d+O U+/NAxe6usSfd+gC8Nd/a2wBk7gWNfvwoIXm5eaBoT67h79xx+Mkovy522wzFs1kXwLRWG HTQOQdmvrOD8mV8JewWyZOS9FoGjaQIMXhYGvv0kEqICp9BjRxJW1RRV9OLgoGt40iH/67 sAkflAtW2HWZv0eh3VmA9MADszwcOGWxdnUuflDxQid9d1w9XDcdN8raKeM3Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705340027; a=rsa-sha256; cv=none; b=sPPSZvzxEL05SOfSQuejajvonq96ElxtdHrZj5VxYBHgZDbIGA0uaTN0iPU1QKE+VmK4J6 U91F/JBdF8Pf2aZ5xuiO4zk0cRwqHW7EndkNz4xh3bURaylUvBfsUZOoi0t7cpwI9uc/qD /+qzcsKUkVjES4PSn8+jiI21RnzHS9IczveGak9HP1R6DAEeNiftPGf9Yz40L4QrXK3kGp bsJkbRuVyUqyuVMbYxH4VCCVSf/LdiJ4bj/tuSVrk81VVvLf5SD608lyTdBa+rQjOLwfAq +P2CuyHNV3b+MCPGw6s+2Twe4zPEd/AmL5LZxRVhUlbgkh+OUwKT30hihAkRpA== 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 4TDK4W2LZfz15k8; Mon, 15 Jan 2024 17:33:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40FHXlql028558; Mon, 15 Jan 2024 17:33:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40FHXlH9028555; Mon, 15 Jan 2024 17:33:47 GMT (envelope-from git) Date: Mon, 15 Jan 2024 17:33:47 GMT Message-Id: <202401151733.40FHXlH9028555@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: 3d68246d28be - main - sysutils/opensbi: update to v1.4 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 3d68246d28be42fd4c86a277ec44013a60fda71e Auto-Submitted: auto-generated The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/ports/commit/?id=3d68246d28be42fd4c86a277ec44013a60fda71e commit 3d68246d28be42fd4c86a277ec44013a60fda71e Author: Mitchell Horne AuthorDate: 2024-01-11 18:20:51 +0000 Commit: Mitchell Horne CommitDate: 2024-01-15 17:33:30 +0000 sysutils/opensbi: update to v1.4 Release notes/info: https://github.com/riscv-software-src/opensbi/releases/tag/v1.4 Bump dependent u-boot ports. Sponsored by: The FreeBSD Foundation --- sysutils/opensbi/Makefile | 2 +- sysutils/opensbi/distinfo | 6 +++--- sysutils/opensbi/files/patch-firmware_fw__base.S | 22 ---------------------- sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c | 8 ++++---- sysutils/u-boot-sifive-fu540/Makefile | 2 +- sysutils/u-boot-sifive-fu740/Makefile | 2 ++ 6 files changed, 11 insertions(+), 31 deletions(-) diff --git a/sysutils/opensbi/Makefile b/sysutils/opensbi/Makefile index efd368442ccf..745ca761c7de 100644 --- a/sysutils/opensbi/Makefile +++ b/sysutils/opensbi/Makefile @@ -1,6 +1,6 @@ PORTNAME= opensbi DISTVERSIONPREFIX=v -DISTVERSION= 1.3.1 +DISTVERSION= 1.4 CATEGORIES= sysutils MAINTAINER= mhorne@FreeBSD.org diff --git a/sysutils/opensbi/distinfo b/sysutils/opensbi/distinfo index a0ad587457f6..fbed4ec056d0 100644 --- a/sysutils/opensbi/distinfo +++ b/sysutils/opensbi/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691077727 -SHA256 (riscv-software-src-opensbi-v1.3.1_GH0.tar.gz) = ee5be2c582f9a837e9db88368220758e014dd694b566bb6c8efe1e50cfad0004 -SIZE (riscv-software-src-opensbi-v1.3.1_GH0.tar.gz) = 399131 +TIMESTAMP = 1704470709 +SHA256 (riscv-software-src-opensbi-v1.4_GH0.tar.gz) = 319b62a4186fbce9b81a0c5f0ec9f003a10c808397a72138bc9745d9b87b1eb1 +SIZE (riscv-software-src-opensbi-v1.4_GH0.tar.gz) = 409903 diff --git a/sysutils/opensbi/files/patch-firmware_fw__base.S b/sysutils/opensbi/files/patch-firmware_fw__base.S deleted file mode 100644 index 44185f571360..000000000000 --- a/sysutils/opensbi/files/patch-firmware_fw__base.S +++ /dev/null @@ -1,22 +0,0 @@ ---- firmware/fw_base.S.orig 2023-07-17 15:17:18 UTC -+++ firmware/fw_base.S -@@ -309,8 +309,8 @@ _scratch_init: - REG_S a5, SBI_SCRATCH_FW_SIZE_OFFSET(tp) - - /* Store R/W section's offset in scratch space */ -- lla a4, __fw_rw_offset -- REG_L a5, 0(a4) -+ lla a5, _fw_rw_start -+ sub a5, a5, a4 - REG_S a5, SBI_SCRATCH_FW_RW_OFFSET(tp) - - /* Store fw_heap_offset and fw_heap_size in scratch space */ -@@ -536,8 +536,6 @@ _link_end: - RISCV_PTR FW_TEXT_START - _link_end: - RISCV_PTR _fw_reloc_end --__fw_rw_offset: -- RISCV_PTR _fw_rw_start - _fw_start - - .section .entry, "ax", %progbits - .align 3 diff --git a/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c b/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c index e9b4ed6abde2..73263b9d2715 100644 --- a/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c +++ b/sysutils/opensbi/files/patch-lib_sbi_sbi__hart.c @@ -1,6 +1,6 @@ ---- lib/sbi/sbi_hart.c.orig 2021-12-24 11:57:44 UTC -+++ lib/sbi/sbi_hart.c -@@ -203,6 +203,16 @@ int sbi_hart_pmp_configure(struct sbi_scratch *scratch +--- lib/sbi/sbi_hart.c.orig 2023-12-27 03:02:58.000000000 -0400 ++++ lib/sbi/sbi_hart.c 2024-01-11 14:10:09.723340000 -0400 +@@ -523,6 +523,16 @@ if (!pmp_count) return 0; @@ -14,6 +14,6 @@ + return 0; + } + - pmp_gran_log2 = log2roundup(sbi_hart_pmp_granularity(scratch)); + pmp_log2gran = sbi_hart_pmp_log2gran(scratch); pmp_bits = sbi_hart_pmp_addrbits(scratch) - 1; pmp_addr_max = (1UL << pmp_bits) | ((1UL << pmp_bits) - 1); diff --git a/sysutils/u-boot-sifive-fu540/Makefile b/sysutils/u-boot-sifive-fu540/Makefile index 7bd809ba6b4d..f6f4a81b6e4b 100644 --- a/sysutils/u-boot-sifive-fu540/Makefile +++ b/sysutils/u-boot-sifive-fu540/Makefile @@ -1,6 +1,6 @@ MASTERDIR= ${.CURDIR}/../u-boot-master -U_BOOT_SLAVE_PORTREVISION_2023.01= 1 +U_BOOT_SLAVE_PORTREVISION_2024.01= 1 MODEL= sifive-fu540 BOARD_CONFIG= sifive_unleashed_defconfig diff --git a/sysutils/u-boot-sifive-fu740/Makefile b/sysutils/u-boot-sifive-fu740/Makefile index 3902e50d6394..93e585e7659f 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.01= 1 + MODEL= sifive-fu740 BOARD_CONFIG= sifive_unmatched_defconfig FAMILY= sifive