* [PATCH v2 1/2] Revert "riscv: Allow use of reset drivers"
@ 2020-07-20 3:06 Bin Meng
2020-07-20 3:06 ` [PATCH v2 2/2] Revert "Revert "riscv: sifive: fu540: Add gpio-restart support"" Bin Meng
0 siblings, 1 reply; 2+ messages in thread
From: Bin Meng @ 2020-07-20 3:06 UTC (permalink / raw)
To: u-boot
From: Bin Meng <bin.meng@windriver.com>
This reverts commit 958a3f464c7f8ef7e10db9feb663e9e80445ce2f.
A more appropriate change below is already in mainline.
Commit fd31e4fd184f ("riscv: Do not build reset.c if SYSRESET is on")
Revert this patch, so that U-Boot can be built successfully for
SiFive Fu540 board.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Sean Anderson <seanga2@gmail.com>
Reviewed-by: Leo Liang <ycliang@andestech.com>
---
(no changes since v1)
arch/riscv/lib/reset.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/riscv/lib/reset.c b/arch/riscv/lib/reset.c
index 6008bbe..8779c61 100644
--- a/arch/riscv/lib/reset.c
+++ b/arch/riscv/lib/reset.c
@@ -7,7 +7,6 @@
#include <command.h>
#include <hang.h>
-#ifndef CONFIG_SYSRESET
int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
printf("resetting ...\n");
@@ -17,4 +16,3 @@ int do_reset(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
return 0;
}
-#endif
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v2 2/2] Revert "Revert "riscv: sifive: fu540: Add gpio-restart support""
2020-07-20 3:06 [PATCH v2 1/2] Revert "riscv: Allow use of reset drivers" Bin Meng
@ 2020-07-20 3:06 ` Bin Meng
0 siblings, 0 replies; 2+ messages in thread
From: Bin Meng @ 2020-07-20 3:06 UTC (permalink / raw)
To: u-boot
From: Bin Meng <bin.meng@windriver.com>
This reverts commit 23da3c682a84a2ad67a67287979dd4f5259ff607.
Now the build failure of sifive_fu540_defconfig board has been fixed,
revert this "revert patch".
Signed-off-by: Bin Meng <bin.meng@windriver.com>
---
Changes in v2:
- rebase on top of u-boot-riscv/master
board/sifive/fu540/Kconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/board/sifive/fu540/Kconfig b/board/sifive/fu540/Kconfig
index 4aa1e4c..f3217f6 100644
--- a/board/sifive/fu540/Kconfig
+++ b/board/sifive/fu540/Kconfig
@@ -68,5 +68,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
imply SIFIVE_OTP
imply DM_PWM
imply PWM_SIFIVE
+ imply SYSRESET
+ imply SYSRESET_GPIO
endif
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-20 3:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-20 3:06 [PATCH v2 1/2] Revert "riscv: Allow use of reset drivers" Bin Meng
2020-07-20 3:06 ` [PATCH v2 2/2] Revert "Revert "riscv: sifive: fu540: Add gpio-restart support"" Bin Meng
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.