From: Bin Meng Date: Tue, 2 Feb 2016 13:58:03 +0000 (-0800) Subject: efi: app: Clean up defconfig X-Git-Tag: v2016.03-rc2~100 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e1d1b62be1c0412be9f919c95142acd1d6c381f2;p=oweals%2Fu-boot.git 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 Reviewed-by: Simon Glass --- 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