sysreset: enable driver support in SPL/TPL

SPL/TPL also need use sysreset for some feature like panic callback.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/Kconfig b/arch/Kconfig
index 760023b19a817e45490058ea5de8ecc5d0633a72..03277dd2c166dd7cd4753a45030ee51641fcbd43 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -158,6 +158,7 @@ config X86
        imply DM_USB
        imply DM_VIDEO
        imply SYSRESET
+       imply SPL_SYSRESET
        imply SYSRESET_X86
        imply USB_ETHER_ASIX
        imply USB_ETHER_SMSC95XX

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index a3d67e43f009d70187e98ece20c6f2426eee2641..3c4af1f29913fcb27f7e2245f0fb6823a30485e6 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1436,6 +1436,7 @@ config ARCH_STM32MP
        select SYSCON
        select SYSRESET
        select SYS_THUMB_BUILD
+       imply SPL_SYSRESET
        imply CMD_DM
        imply CMD_POWEROFF
        imply ENV_VARS_UBOOT_RUNTIME_CONFIG

diff --git a/configs/am65x_evm_a53_defconfig b/configs/am65x_evm_a53_defconfig
index 101fae145681804f5a46111bb54bdc2fe34aa78c..41cf0100fa3a63e9056bfccaa97999e1868913c2 100644 (file)
--- a/configs/am65x_evm_a53_defconfig
+++ b/configs/am65x_evm_a53_defconfig
@@ -72,4 +72,5 @@ CONFIG_RESET_TI_SCI=y
 CONFIG_DM_SERIAL=y
 CONFIG_SOC_TI=y
 CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
 CONFIG_SYSRESET_TI_SCI=y

diff --git a/configs/am65x_evm_r5_defconfig b/configs/am65x_evm_r5_defconfig
index 8dce577cf7c7383993252ff051bc8eefc6a3fd32..3814872ec7a18b9e6366ff33d152f426a5229915 100644 (file)
--- a/configs/am65x_evm_r5_defconfig
+++ b/configs/am65x_evm_r5_defconfig
@@ -83,6 +83,7 @@ CONFIG_DM_RESET=y
 CONFIG_RESET_TI_SCI=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
 CONFIG_SYSRESET_TI_SCI=y
 CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y

diff --git a/configs/am65x_hs_evm_a53_defconfig b/configs/am65x_hs_evm_a53_defconfig
index 7af0046ee3b567f3210fb4ce0cf60a7ad331fc17..9c55cd37f65ef9fe88140320450a22b6ad3f8b7f 100644 (file)
--- a/configs/am65x_hs_evm_a53_defconfig
+++ b/configs/am65x_hs_evm_a53_defconfig
@@ -75,4 +75,5 @@ CONFIG_RESET_TI_SCI=y
 CONFIG_DM_SERIAL=y
 CONFIG_SOC_TI=y
 CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
 CONFIG_SYSRESET_TI_SCI=y

diff --git a/configs/am65x_hs_evm_r5_defconfig b/configs/am65x_hs_evm_r5_defconfig
index 8d5d3590b28db969b0cb7d7e097f372b1ae7197f..0b12f15782ef9c6d25d30105c74ab70781bf8b19 100644 (file)
--- a/configs/am65x_hs_evm_r5_defconfig
+++ b/configs/am65x_hs_evm_r5_defconfig
@@ -85,6 +85,7 @@ CONFIG_DM_RESET=y
 CONFIG_RESET_TI_SCI=y
 CONFIG_DM_SERIAL=y
 CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
 CONFIG_SYSRESET_TI_SCI=y
 CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y

diff --git a/configs/mt7629_rfb_defconfig b/configs/mt7629_rfb_defconfig
index 01b952fc15b031feca9574c9667eb3daa71a5198..0dceafdaa676894738d9bcfe35bc1c3437179285 100644 (file)
--- a/configs/mt7629_rfb_defconfig
+++ b/configs/mt7629_rfb_defconfig
@@ -65,6 +65,7 @@ CONFIG_SPI=y
 CONFIG_DM_SPI=y
 CONFIG_MTK_QSPI=y
 CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
 CONFIG_SYSRESET_WATCHDOG=y
 CONFIG_TIMER=y
 CONFIG_SPL_TIMER=y

diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig
index a46edee63400310ee18806463f17eb9c23d88cc7..e2826a6a9590ca9c8ca359403fdf397d17feb36b 100644 (file)
--- a/configs/sandbox_spl_defconfig
+++ b/configs/sandbox_spl_defconfig
@@ -174,6 +174,7 @@ CONFIG_SANDBOX_SPI=y
 CONFIG_SPMI=y
 CONFIG_SPMI_SANDBOX=y
 CONFIG_SYSRESET=y
+CONFIG_SPL_SYSRESET=y
 CONFIG_TIMER=y
 CONFIG_TIMER_EARLY=y
 CONFIG_SANDBOX_TIMER=y

diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig
index 8ce3e2e20761e55f25b924c97004fdf413a2383b..d456f0ce36b383d4ccae91fe713ae01b278179e7 100644 (file)
--- a/drivers/sysreset/Kconfig
+++ b/drivers/sysreset/Kconfig
@@ -13,6 +13,24 @@ config SYSRESET
          to effect a reset. The uclass will try all available drivers when
          reset_walk() is called.
 
+config SPL_SYSRESET
+       bool "Enable support for system reset drivers in SPL mode"
+       depends on SYSRESET && SPL_DM
+       help
+         Enable system reset drivers which can be used to reset the CPU or
+         board. Each driver can provide a reset method which will be called
+         to effect a reset. The uclass will try all available drivers when
+         reset_walk() is called.
+
+config TPL_SYSRESET
+       bool "Enable support for system reset drivers in TPL mode"
+       depends on SYSRESET && TPL_DM
+       help
+         Enable system reset drivers which can be used to reset the CPU or
+         board. Each driver can provide a reset method which will be called
+         to effect a reset. The uclass will try all available drivers when
+         reset_walk() is called.
+
 if SYSRESET
 
 config SYSRESET_GPIO

diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile
index b3728ac17faeba7090e248dda94b873ea3b1c7dc..8e1c845dfefeca6341d1274cacb03ea5c43e3982 100644 (file)
--- a/drivers/sysreset/Makefile
+++ b/drivers/sysreset/Makefile
@@ -2,7 +2,7 @@
 #
 # (C) Copyright 2016 Cadence Design Systems Inc.
 
-obj-$(CONFIG_SYSRESET) += sysreset-uclass.o
+obj-$(CONFIG_$(SPL_TPL_)SYSRESET) += sysreset-uclass.o
 obj-$(CONFIG_ARCH_ASPEED) += sysreset_ast.o
 obj-$(CONFIG_ARCH_ROCKCHIP) += sysreset_rockchip.o
 obj-$(CONFIG_ARCH_STI) += sysreset_sti.o