From ca4435ef28d13371c31b98cfd41fb8fa28aeabc9 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 27 Jul 2015 15:47:22 -0600 Subject: [PATCH] x86: Move Chrome OS options to defconfig Drop these from the header file and use Kconfig instead. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- configs/chromebook_link_defconfig | 3 +++ configs/chromebox_panther_defconfig | 3 +++ include/configs/x86-chromebook.h | 3 --- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig index e394dab719..b987f3f52f 100644 --- 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 340510f71a..e82c8ecf64 100644 --- 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 408cbb1957..e8f0bac01c 100644 --- 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 -- 2.30.2