Merge git://git.denx.de/u-boot-fsl-qoriq

[oweals/u-boot.git] / configs / woodburn_defconfig

diff --git a/configs/woodburn_defconfig b/configs/woodburn_defconfig
index f01b3b47da04d101872e6e48bb4b1f821afa35cf..2c20f607b956e1c875a4028e4fa68a2dbb46e421 100644 (file)
--- a/configs/woodburn_defconfig
+++ b/configs/woodburn_defconfig
@@ -1,15 +1,16 @@
 CONFIG_ARM=y
 CONFIG_TARGET_WOODBURN=y
-CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_BOARD_EARLY_INIT_F=y
 CONFIG_HUSH_PARSER=y
 CONFIG_SYS_PROMPT="woodburn U-Boot > "
+CONFIG_CMD_IMLS=y
+CONFIG_CMD_GPIO=y
+CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_SPI=y
-CONFIG_CMD_I2C=y
-CONFIG_CMD_GPIO=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
@@ -21,4 +22,7 @@ CONFIG_CMD_FAT=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
+CONFIG_ENV_IS_IN_FLASH=y
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_PHYLIB=y
+CONFIG_PHY_MICREL=y