From 50d34f0eaaee6fcdbb30a36097c7a0ecf20c3b87 Mon Sep 17 00:00:00 2001 From: Weijie Gao Date: Thu, 12 Nov 2020 16:35:38 +0800 Subject: [PATCH] mips: enable _machine_restart for spl The sysreset driver has a config CONFIG_SPL_SYSRESET for the spl stage. Change CONFIG_SYSRESET to CONFIG_IS_ENABLED(SYSRESET) will give spl a chance to use _machine_restart instead of the sysreset driver. Reviewed-by: Stefan Roese Reviewed-by: Simon Glass Signed-off-by: Weijie Gao --- arch/mips/cpu/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/cpu/cpu.c b/arch/mips/cpu/cpu.c index 7d5c9fd83a..b304026a67 100644 --- a/arch/mips/cpu/cpu.c +++ b/arch/mips/cpu/cpu.c @@ -12,7 +12,7 @@ #include #include -#ifndef CONFIG_SYSRESET +#if !CONFIG_IS_ENABLED(SYSRESET) void __weak _machine_restart(void) { fprintf(stderr, "*** reset failed ***\n");