summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2016-02-02 05:58:03 -0800
committerBin Meng <bmeng.cn@gmail.com>2016-02-05 12:47:23 +0800
commite1d1b62be1c0412be9f919c95142acd1d6c381f2 (patch)
treee5ae8c47b0a2447d893bad9d6a28717d6e0c88d5
parent5a257df702e5702f46fca548d0899c65e90df947 (diff)
efi: app: Clean up defconfig
Move some #undef from efi-x86.h to efi-x86_defconfig as these are already Kconfig options. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--configs/efi-x86_defconfig2
-rw-r--r--include/configs/efi-x86.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/configs/efi-x86_defconfig b/configs/efi-x86_defconfig
index 943ef07638..b4cbd5fc5d 100644
--- a/configs/efi-x86_defconfig
+++ b/configs/efi-x86_defconfig
@@ -3,6 +3,7 @@ CONFIG_VENDOR_EFI=y
CONFIG_DEFAULT_DEVICE_TREE="efi"
CONFIG_TARGET_EFI=y
# CONFIG_CMD_BOOTM is not set
+# CONFIG_CMD_IMLS is not set
CONFIG_CMD_GPIO=y
# CONFIG_CMD_NET is not set
CONFIG_OF_CONTROL=y
@@ -13,6 +14,5 @@ CONFIG_DEBUG_EFI_CONSOLE=y
CONFIG_DEBUG_UART_BASE=0
CONFIG_DEBUG_UART_CLOCK=0
CONFIG_ICH_SPI=y
-# CONFIG_X86_SERIAL is not set
CONFIG_TIMER=y
CONFIG_EFI=y
diff --git a/include/configs/efi-x86.h b/include/configs/efi-x86.h
index 258a83f9de..7fb37f06b8 100644
--- a/include/configs/efi-x86.h
+++ b/include/configs/efi-x86.h
@@ -13,9 +13,6 @@
#undef CONFIG_TPM_TIS_BASE_ADDRESS
-#undef CONFIG_CMD_IMLS
-
-#undef CONFIG_X86_SERIAL
#undef CONFIG_ENV_IS_IN_SPI_FLASH
#define CONFIG_ENV_IS_NOWHERE
#undef CONFIG_VIDEO