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

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

diff --git a/configs/pb1000_defconfig b/configs/pb1000_defconfig
index 5a7fa80e0dba6d830350d936ba909eabf16f10dc..46a2b3ebfbfae1b102f67cdcd484c2e40e0be14c 100644 (file)
--- a/configs/pb1000_defconfig
+++ b/configs/pb1000_defconfig
@@ -6,11 +6,13 @@ CONFIG_SYS_PROMPT="Pb1x00 # "
 # CONFIG_CMD_ELF is not set
 # CONFIG_CMD_RUN is not set
 # CONFIG_CMD_SAVEENV is not set
-# CONFIG_CMD_LOADB is not set
-# CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_FLASH is not set
 # CONFIG_CMD_FPGA is not set
+# CONFIG_CMD_LOADB is not set
+# CONFIG_CMD_LOADS is not set
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
+# CONFIG_ISO_PARTITION is not set
+CONFIG_MTD_NOR_FLASH=y