diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2017-07-31 20:21:01 +0200 |
|---|---|---|
| committer | Lucas Stach <l.stach@pengutronix.de> | 2017-07-31 20:21:01 +0200 |
| commit | d6d7441e90d7859c60cba8b9bc160d7d24692452 (patch) | |
| tree | 31337dbe64d7006b5a1a399879c1915819041140 /arch | |
| parent | fcad2a76f7981320ef14592599c7955e985c264d (diff) | |
| parent | 69d50079bb0bf5cc6db2c3376fec691208b25c40 (diff) | |
| download | barebox-d6d7441e90d7859c60cba8b9bc160d7d24692452.tar.gz barebox-d6d7441e90d7859c60cba8b9bc160d7d24692452.tar.xz | |
Merge branch 'for-next/efi'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/configs/efi_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/configs/efi_defconfig b/arch/x86/configs/efi_defconfig index 0d9a44a4d2..3e83fd92d9 100644 --- a/arch/x86/configs/efi_defconfig +++ b/arch/x86/configs/efi_defconfig @@ -15,12 +15,12 @@ CONFIG_CONSOLE_ACTIVATE_ALL=y CONFIG_PARTITION_DISK_EFI=y CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y CONFIG_POLLER=y +CONFIG_STATE=y CONFIG_DEBUG_INFO=y CONFIG_DEBUG_LL=y CONFIG_LONGHELP=y CONFIG_CMD_IOMEM=y CONFIG_CMD_MEMINFO=y -# CONFIG_CMD_LINUX16 is not set CONFIG_CMD_GO=y CONFIG_CMD_LOADB=y CONFIG_CMD_RESET=y @@ -61,6 +61,7 @@ CONFIG_CMD_OF_NODE=y CONFIG_CMD_OF_PROPERTY=y CONFIG_CMD_OFTREE=y CONFIG_CMD_TIME=y +CONFIG_CMD_STATE=y CONFIG_NET=y CONFIG_NET_NFS=y CONFIG_NET_NETCONSOLE=y |