Enable SBI sysreset properly this time

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2022-06-29 14:33:05 +03:00
parent 7595cc56d4
commit 74f950d09c
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
2 changed files with 34 additions and 18 deletions

View File

@ -1,55 +1,68 @@
From d79143f85f4922ea52387c7cc44ad698a80c1938 Mon Sep 17 00:00:00 2001
From 04441858b575409271ea67d2e65b2f858f0b2522 Mon Sep 17 00:00:00 2001
From: David Abdurachmanov <davidlt@rivosinc.com>
Date: Mon, 27 Jun 2022 16:36:22 +0300
Subject: [PATCH] Enable "sbi" command and SBI reset
Date: Wed, 29 Jun 2022 14:30:30 +0300
Subject: [PATCH] Enable "sbi" command and SBI sysreset
Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
---
configs/qemu-riscv64_defconfig | 2 ++
configs/qemu-riscv64_smode_defconfig | 1 +
configs/sifive_unleashed_defconfig | 2 ++
configs/sifive_unmatched_defconfig | 2 ++
4 files changed, 7 insertions(+)
configs/qemu-riscv64_defconfig | 5 +++++
configs/qemu-riscv64_smode_defconfig | 4 ++++
configs/sifive_unleashed_defconfig | 5 +++++
configs/sifive_unmatched_defconfig | 5 +++++
4 files changed, 19 insertions(+)
diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig
index f7b9de10..f056ed91 100644
index f7b9de10..bb4b8486 100644
--- a/configs/qemu-riscv64_defconfig
+++ b/configs/qemu-riscv64_defconfig
@@ -16,3 +16,5 @@ CONFIG_CMD_NVEDIT_EFI=y
@@ -16,3 +16,8 @@ CONFIG_CMD_NVEDIT_EFI=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_DM_MTD=y
CONFIG_SYS_MAX_FLASH_BANKS=2
+CONFIG_CMD_SBI=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_SBI=y
+CONFIG_CMD_POWEROFF=y
+CONFIG_SYSRESET_CMD_POWEROFF=y
diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
index 4d83570c..97a4ec9e 100644
index 4d83570c..f13f008d 100644
--- a/configs/qemu-riscv64_smode_defconfig
+++ b/configs/qemu-riscv64_smode_defconfig
@@ -20,3 +20,4 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
@@ -19,4 +19,8 @@ CONFIG_CMD_NVEDIT_EFI=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_DM_MTD=y
CONFIG_SYS_MAX_FLASH_BANKS=2
+CONFIG_SYSRESET=y
CONFIG_SYSRESET_SBI=y
+CONFIG_CMD_SBI=y
+CONFIG_CMD_POWEROFF=y
+CONFIG_SYSRESET_CMD_POWEROFF=y
diff --git a/configs/sifive_unleashed_defconfig b/configs/sifive_unleashed_defconfig
index fe2227e5..81df9d06 100644
index fe2227e5..082b23f1 100644
--- a/configs/sifive_unleashed_defconfig
+++ b/configs/sifive_unleashed_defconfig
@@ -30,3 +30,5 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
@@ -30,3 +30,8 @@ CONFIG_SPL_DM_SEQ_ALIAS=y
CONFIG_SPL_CLK=y
CONFIG_DM_MTD=y
CONFIG_DM_RESET=y
+CONFIG_CMD_SBI=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_SBI=y
+CONFIG_CMD_POWEROFF=y
+CONFIG_SYSRESET_CMD_POWEROFF=y
diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig
index 5d070843..f008f0f5 100644
index 5d070843..0dd90856 100644
--- a/configs/sifive_unmatched_defconfig
+++ b/configs/sifive_unmatched_defconfig
@@ -52,3 +52,5 @@ CONFIG_DM_SCSI=y
@@ -52,3 +52,8 @@ CONFIG_DM_SCSI=y
CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y
CONFIG_USB_XHCI_PCI=y
+CONFIG_CMD_SBI=y
+CONFIG_SYSRESET=y
+CONFIG_SYSRESET_SBI=y
+CONFIG_CMD_POWEROFF=y
+CONFIG_SYSRESET_CMD_POWEROFF=y
--
2.35.1

View File

@ -6,7 +6,7 @@
Name: uboot-tools
Version: 2022.07
Release: 0.5%{?candidate:.%{candidate}}.0.riscv64%{?dist}
Release: 0.5%{?candidate:.%{candidate}}.1.riscv64%{?dist}
Summary: U-Boot utilities
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
URL: http://www.denx.de/wiki/U-Boot
@ -33,7 +33,7 @@ Patch8: rockchip-general-fixes.patch
Patch43: 0004-riscv-sifive-unmatched-disable-FDT-and-initrd-reloca.patch
Patch44: 0005-board-sifive-spl-Initialized-the-PWM-setting-in-the-.patch
Patch45: 0006-board-sifive-spl-Set-remote-thermal-of-TMP451-to-85-.patch
Patch46: 0001-Enable-sbi-command-and-SBI-reset.patch
Patch46: 0001-Enable-sbi-command-and-SBI-sysreset.patch
BuildRequires: bc
BuildRequires: bison
@ -249,6 +249,9 @@ cp -p board/sunxi/README.nand builds/docs/README.sunxi-nand
%endif
%changelog
* Wed Jun 29 2022 David Abdurachmanov <davidlt@rivosinc.com> - 2022.07-0.5.rc5.1.riscv64
- Enable SBI command and SBI sysreset (reset and poweroff commands)
* Mon Jun 27 2022 David Abdurachmanov <davidlt@rivosinc.com> - 2022.07-0.5.rc5.0.riscv64
- Enable riscv64