x86: Move Chrome OS options to defconfig

Drop these from the header file and use Kconfig instead.

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

diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index e394dab719b9c3106b177e9023c386b3ee14abf8..b987f3f52f690c30afffe6ffcf7f10f22b53dd11 100644 (file)
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -14,6 +14,9 @@ CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM_PCI=y
 CONFIG_SPI_FLASH=y
+CONFIG_CMD_CROS_EC=y
+CONFIG_CROS_EC=y
+CONFIG_CROS_EC_LPC=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y

diff --git a/configs/chromebox_panther_defconfig b/configs/chromebox_panther_defconfig
index 340510f71a6af0f72a6f67cc157f8fe1a97f109c..e82c8ecf64e90e44795e0ec2a662917f3ed2c4b1 100644 (file)
--- a/configs/chromebox_panther_defconfig
+++ b/configs/chromebox_panther_defconfig
@@ -14,6 +14,9 @@ CONFIG_CMD_BOOTSTAGE=y
 CONFIG_OF_CONTROL=y
 CONFIG_DM_PCI=y
 CONFIG_SPI_FLASH=y
+CONFIG_CMD_CROS_EC=y
+CONFIG_CROS_EC=y
+CONFIG_CROS_EC_LPC=y
 CONFIG_VIDEO_VESA=y
 CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
 CONFIG_FRAMEBUFFER_VESA_MODE_11A=y

diff --git a/include/configs/x86-chromebook.h b/include/configs/x86-chromebook.h
index 408cbb19577eb7154dd9bc4dfd8d8b18d0c37a28..e8f0bac01c4937ea08a9e38cd7c84a3e3b09b6ab 100644 (file)
--- a/include/configs/x86-chromebook.h
+++ b/include/configs/x86-chromebook.h
@@ -45,9 +45,6 @@
 #define VIDEO_IO_OFFSET                                0
 #define CONFIG_X86EMU_RAW_IO
 
-#define CONFIG_CROS_EC
-#define CONFIG_CROS_EC_LPC
-#define CONFIG_CMD_CROS_EC
 #define CONFIG_ARCH_EARLY_INIT_R
 
 #undef CONFIG_ENV_IS_NOWHERE