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

[u-boot] / configs / gplugd_defconfig

diff --git a/configs/gplugd_defconfig b/configs/gplugd_defconfig
index 9fee96aee0232b858e1359e913d9995574a09e33..97bb976803a875305261470af9bda7bf485110f8 100644 (file)
--- a/configs/gplugd_defconfig
+++ b/configs/gplugd_defconfig
@@ -1,10 +1,11 @@
 CONFIG_ARM=y
 CONFIG_TARGET_GPLUGD=y
+CONFIG_IDENT_STRING="\nMarvell-gplugD"
 CONFIG_BOOTDELAY=3
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_BOARD_EARLY_INIT_F=y
 # CONFIG_CMD_IMLS is not set
-CONFIG_CMD_ASKENV=y
 # CONFIG_CMD_FLASH is not set
-CONFIG_CMD_SF=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_FPGA is not set
@@ -14,8 +15,9 @@ CONFIG_CMD_MII=y
 CONFIG_CMD_PING=y
 CONFIG_CMD_EXT2=y
 CONFIG_CMD_FAT=y
-CONFIG_SPI_FLASH=y
-CONFIG_SPI_FLASH_ATMEL=y
-CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_ISO_PARTITION=y
+# CONFIG_MMC is not set
 CONFIG_SYS_NS16550=y
+CONFIG_USB=y
+CONFIG_USB_STORAGE=y
 CONFIG_OF_LIBFDT=y