diff mbox series

Revert "riscv: sifive: fu540: Add gpio-restart support"

Message ID 20200706220051.26388-1-trini@konsulko.com
State Accepted
Commit 23da3c682a84a2ad67a67287979dd4f5259ff607
Headers show
Series Revert "riscv: sifive: fu540: Add gpio-restart support" | expand

Commit Message

Tom Rini July 6, 2020, 10 p.m. UTC
As part of merging the next branch in to master, the sifive_fu540 will
fail to link:
riscv64-linux-ld.bfd: lib/built-in.o: in function `panic_finish':
lib/panic.c:28: undefined reference to `do_reset'
make[2]: *** [spl/u-boot-spl] Error 1
make[1]: *** [spl/u-boot-spl] Error 2
make: *** [sub-make] Error 2

And while the "fix the build" option of enabling CONFIG_SPL_SYSRESET may
solve the issue, it is unclear that it is the correct path exactly.  For
the moment, I am reverting this commit and take a "revert the revert"
and proper fix as soon as it's available.

This reverts commit cdae446461191714d692190da1ad4344398adc57.

Cc: Paul Walmsley <paul.walmsley at sifive.com>
Cc: Palmer Dabbelt <palmer at dabbelt.com>
Cc: Anup Patel <anup.patel at wdc.com>
Cc: Atish Patra <atish.patra at wdc.com>
Cc: Bin Meng <bin.meng at windriver.com>
Signed-off-by: Tom Rini <trini at konsulko.com>
---
 board/sifive/fu540/Kconfig | 2 --
 1 file changed, 2 deletions(-)

Comments

Tom Rini July 7, 2020, 2:12 p.m. UTC | #1
On Mon, Jul 06, 2020 at 06:00:51PM -0400, Tom Rini wrote:

> As part of merging the next branch in to master, the sifive_fu540 will
> fail to link:
> riscv64-linux-ld.bfd: lib/built-in.o: in function `panic_finish':
> lib/panic.c:28: undefined reference to `do_reset'
> make[2]: *** [spl/u-boot-spl] Error 1
> make[1]: *** [spl/u-boot-spl] Error 2
> make: *** [sub-make] Error 2
> 
> And while the "fix the build" option of enabling CONFIG_SPL_SYSRESET may
> solve the issue, it is unclear that it is the correct path exactly.  For
> the moment, I am reverting this commit and take a "revert the revert"
> and proper fix as soon as it's available.
> 
> This reverts commit cdae446461191714d692190da1ad4344398adc57.
> 
> Cc: Paul Walmsley <paul.walmsley at sifive.com>
> Cc: Palmer Dabbelt <palmer at dabbelt.com>
> Cc: Anup Patel <anup.patel at wdc.com>
> Cc: Atish Patra <atish.patra at wdc.com>
> Cc: Bin Meng <bin.meng at windriver.com>
> Signed-off-by: Tom Rini <trini at konsulko.com>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/board/sifive/fu540/Kconfig b/board/sifive/fu540/Kconfig
index 6f6568196561..86193d7668be 100644
--- a/board/sifive/fu540/Kconfig
+++ b/board/sifive/fu540/Kconfig
@@ -65,7 +65,5 @@  config BOARD_SPECIFIC_OPTIONS # dummy
 	imply SMP
 	imply MISC
 	imply SIFIVE_OTP
-	imply SYSRESET
-	imply SYSRESET_GPIO
 
 endif