x86: sysreset: Allow reset driver to be included in SPL/TPL

At present this driver is always included in SPL and TPL, if U-Boot proper
enables it. Update the Makefile to provide full control using the existing
Kconfig options.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
[bmeng: make the Kconfig help text a little bit clearer]
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig
index f565ae031095c3d40f95675acafc357320b243f3..5e6293ae69b949aca2b52aabe8e3667bd7f492f7 100644 (file)
--- a/drivers/sysreset/Kconfig
+++ b/drivers/sysreset/Kconfig
@@ -107,6 +107,18 @@ config SYSRESET_X86
        help
          Reboot support for generic x86 processor reset.
 
+config SYSRESET_SPL_X86
+       bool "Enable support for x86 processor reboot driver in SPL"
+       depends on X86
+       help
+         Reboot support for generic x86 processor reset in SPL.
+
+config SYSRESET_TPL_X86
+       bool "Enable support for x86 processor reboot driver in TPL"
+       depends on X86
+       help
+         Reboot support for generic x86 processor reset in TPL.
+
 config SYSRESET_MCP83XX
        bool "Enable support MPC83xx SoC family reboot driver"
        help

diff --git a/drivers/sysreset/Makefile b/drivers/sysreset/Makefile
index cf01492295f7dccbafaa6a3fd6198e68c37c2cef..fff4a184a02fd47922fe60b02436fe4ab69f3d90 100644 (file)
--- a/drivers/sysreset/Makefile
+++ b/drivers/sysreset/Makefile
@@ -16,5 +16,5 @@ obj-$(CONFIG_SYSRESET_SOCFPGA_S10) += sysreset_socfpga_s10.o
 obj-$(CONFIG_SYSRESET_TI_SCI) += sysreset-ti-sci.o
 obj-$(CONFIG_SYSRESET_SYSCON) += sysreset_syscon.o
 obj-$(CONFIG_SYSRESET_WATCHDOG) += sysreset_watchdog.o
-obj-$(CONFIG_SYSRESET_X86) += sysreset_x86.o
+obj-$(CONFIG_$(SPL_TPL_)SYSRESET_X86) += sysreset_x86.o
 obj-$(CONFIG_TARGET_XTFPGA) += sysreset_xtfpga.o