summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2018-12-31 08:08:33 -0500
committerTom Rini <trini@konsulko.com>2018-12-31 08:08:33 -0500
commit51ae59228c443d2f7e1d567a3cc83130465d1426 (patch)
tree940bca6eca4099b28edd7f36dfe82f747ccd6034 /configs
parent9735326fff8488663e27350917ccf01f2e71730a (diff)
parent881bb9ab398419c33c9021ee8b2bbd8412882230 (diff)
Merge git://git.denx.de/u-boot-x86
This includes x86 edison defconfig file clean up, and coreboot file system (cbfs) fixes.
Diffstat (limited to 'configs')
-rw-r--r--configs/edison_defconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/configs/edison_defconfig b/configs/edison_defconfig
index eb9f9a089f1..234dbac4e87 100644
--- a/configs/edison_defconfig
+++ b/configs/edison_defconfig
@@ -18,7 +18,6 @@ CONFIG_CMD_DFU=y
CONFIG_CMD_GPT=y
CONFIG_CMD_MMC=y
CONFIG_CMD_PART=y
-# CONFIG_CMD_PCI is not set
# CONFIG_CMD_NFS is not set
CONFIG_CMD_TIMER=y
CONFIG_CMD_HASH=y