summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2015-07-27 15:47:22 -0600
committerSimon Glass <sjg@chromium.org>2015-08-05 08:42:42 -0600
commitca4435ef28d13371c31b98cfd41fb8fa28aeabc9 (patch)
tree7b7a0289f6b783137311e32095d7ef2f45011d6f
parent3f416f336e0d87519217777a460516c5cc1310e3 (diff)
downloadu-boot-imx-ca4435ef28d13371c31b98cfd41fb8fa28aeabc9.zip
u-boot-imx-ca4435ef28d13371c31b98cfd41fb8fa28aeabc9.tar.gz
u-boot-imx-ca4435ef28d13371c31b98cfd41fb8fa28aeabc9.tar.bz2
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>
-rw-r--r--configs/chromebook_link_defconfig3
-rw-r--r--configs/chromebox_panther_defconfig3
-rw-r--r--include/configs/x86-chromebook.h3
3 files changed, 6 insertions, 3 deletions
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index e394dab..b987f3f 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 340510f..e82c8ec 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 408cbb1..e8f0bac 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