x86: Support SPL and TPL

At present only chromebook_link64 supports SPL. It is useful to eb able to
support both TPL and SPL to implement verified boot on x86.

Enable the options for both along with some suitable default options
needed to boot through these phases.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/arch/Kconfig b/arch/Kconfig
index 760023b19a817e45490058ea5de8ecc5d0633a72..2914567248cda271e2e69582ad1e8a2121ebba82 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -126,6 +126,8 @@ config SH
 
 config X86
        bool "x86 architecture"
+       select SUPPORT_SPL
+       select SUPPORT_TPL
        select CREATE_ARCH_SYMLINK
        select DM
        select DM_PCI
@@ -164,6 +166,35 @@ config X86
        imply USB_HOST_ETHER
        imply PCH
 
+       # Thing to enable for when SPL/TPL are enabled: SPL
+       imply SPL_DM
+       imply SPL_OF_LIBFDT
+       imply SPL_DRIVERS_MISC_SUPPORT
+       imply SPL_GPIO_SUPPORT
+       imply SPL_LIBCOMMON_SUPPORT
+       imply SPL_LIBGENERIC_SUPPORT
+       imply SPL_SERIAL_SUPPORT
+       imply SPL_SPI_FLASH_SUPPORT
+       imply SPL_SPI_SUPPORT
+       imply SPL_OF_CONTROL
+       imply SPL_TIMER
+       imply SPL_REGMAP
+       imply SPL_SYSCON
+       # TPL
+       imply TPL_DM
+       imply TPL_OF_LIBFDT
+       imply TPL_DRIVERS_MISC_SUPPORT
+       imply TPL_GPIO_SUPPORT
+       imply TPL_LIBCOMMON_SUPPORT
+       imply TPL_LIBGENERIC_SUPPORT
+       imply TPL_SERIAL_SUPPORT
+       imply TPL_SPI_FLASH_SUPPORT
+       imply TPL_SPI_SUPPORT
+       imply TPL_OF_CONTROL
+       imply TPL_TIMER
+       imply TPL_REGMAP
+       imply TPL_SYSCON
+
 config XTENSA
        bool "Xtensa architecture"
        select CREATE_ARCH_SYMLINK

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e0520937751076aa3971153ceb242f2ad6290938..185f0ef8c40fae839d5fb13bce0a99223da5d034 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -32,7 +32,6 @@ config X86_RUN_32BIT
 config X86_RUN_64BIT
        bool "64-bit"
        select X86_64
-       select SUPPORT_SPL
        select SPL
        select SPL_SEPARATE_BSS
        help