Merge git://git.denx.de/u-boot-dm

[people/ms/u-boot.git] / configs / malta_defconfig

diff --git a/configs/malta_defconfig b/configs/malta_defconfig
index e4e21d0f0fc2d53cd4d1add583eca32250b0cc5e..39e875a8999ee4999b9d437c61cc23e78a879d1f 100644 (file)
--- a/configs/malta_defconfig
+++ b/configs/malta_defconfig
@@ -5,10 +5,11 @@ CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="malta # "
 # CONFIG_AUTOBOOT is not set
+# CONFIG_CMD_FPGA is not set
 CONFIG_CMD_IDE=y
 # CONFIG_CMD_LOADB is not set
 # CONFIG_CMD_LOADS is not set
-# CONFIG_CMD_FPGA is not set
+CONFIG_CMD_PCI=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 # CONFIG_CMD_NFS is not set
@@ -16,6 +17,7 @@ CONFIG_CMD_PING=y
 CONFIG_CMD_DATE=y
 # CONFIG_ISO_PARTITION is not set
 CONFIG_OF_EMBED=y
+CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PCI=y
 CONFIG_SYS_NS16550=y