Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[u-boot] / configs / malta_defconfig

diff --git a/configs/malta_defconfig b/configs/malta_defconfig
index fd9fa8b7cecdbf7052f6093b3f076af2e42d804e..6c7034e11d03b4798865e43fa6b8ffdce7f669a2 100644 (file)
--- a/configs/malta_defconfig
+++ b/configs/malta_defconfig
@@ -5,10 +5,10 @@ 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
@@ -20,3 +20,4 @@ CONFIG_OF_EMBED=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_PCI=y
 CONFIG_SYS_NS16550=y
+CONFIG_ENV_IS_IN_FLASH=y