diff mbox series

[1/3] ARM: reset: use do_reset in SPL/TPL if SYSRESET was not enabled for them

Message ID 62c163018998fcf476f0ad2edf83d1787d69445d.1583328917.git.hws@denx.de
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show
Series ARM: Fix reset in SPL if SYSRESET is not used | expand

Commit Message

Harald Seiler March 4, 2020, 2:23 p.m. UTC 
From: Claudius Heine <ch@denx.de>

In case CONFIG_SYSRESET is set, do_reset from reset.c will not be available
anywere, even if SYSRESET is disabled for SPL/TPL.

'do_reset' is called from SPL for instance from the panic handler and
PANIC_HANG is not set

Signed-off-by: Claudius Heine <ch@denx.de>
---
 arch/arm/lib/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Marek Vasut March 4, 2020, 2:26 p.m. UTC | #1 
On 3/4/20 3:23 PM, Harald Seiler wrote:
> From: Claudius Heine <ch@denx.de>
> 
> In case CONFIG_SYSRESET is set, do_reset from reset.c will not be available
> anywere, even if SYSRESET is disabled for SPL/TPL.
> 
> 'do_reset' is called from SPL for instance from the panic handler and
> PANIC_HANG is not set
> 
> Signed-off-by: Claudius Heine <ch@denx.de>

Reviewed-by: Marek Vasut <marex@denx.de>
Stefano Babic May 1, 2020, 4:31 p.m. UTC | #2 
> From: Claudius Heine <ch@denx.de>
> In case CONFIG_SYSRESET is set, do_reset from reset.c will not be available
> anywere, even if SYSRESET is disabled for SPL/TPL.
> 'do_reset' is called from SPL for instance from the panic handler and
> PANIC_HANG is not set
> Signed-off-by: Claudius Heine <ch@denx.de>
> Reviewed-by: Marek Vasut <marex@denx.de>
Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic
diff mbox series

Patch

diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 8482f5446c5c..b839aa7a5096 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -57,7 +57,7 @@  obj-y	+= interrupts_64.o
 else
 obj-y	+= interrupts.o
 endif
-ifndef CONFIG_SYSRESET
+ifndef CONFIG_$(SPL_TPL_)SYSRESET
 obj-y	+= reset.o
 endif