git: 8a0d40f973db - main - sysutils/opensbi: update to version 1.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 28 Jun 2022 20:16:22 UTC
The branch main has been updated by mhorne (src committer):
URL: https://cgit.FreeBSD.org/ports/commit/?id=8a0d40f973dbc5961cbb8a44123c8c2317031d33
commit 8a0d40f973dbc5961cbb8a44123c8c2317031d33
Author: Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2022-06-26 14:38:22 +0000
Commit: Mitchell Horne <mhorne@FreeBSD.org>
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 <sbi_utils/ipi/fdt_ipi.h>
#include <sbi_utils/reset/fdt_reset.h>
+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 <sbi_utils/fdt/fdt_helper.h>
#include <sbi_utils/fdt/fdt_fixup.h>
@@ -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