Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / configs / mx35pdk_defconfig

diff --git a/configs/mx35pdk_defconfig b/configs/mx35pdk_defconfig
index 9f27c94d2d1d0e68d4d299452dfcc0776fdfb9f5..468b540a14e8f6bf53c8caf0cf785819d2a74a08 100644 (file)
--- a/configs/mx35pdk_defconfig
+++ b/configs/mx35pdk_defconfig
@@ -24,16 +24,15 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=mxc_nand:1m(boot),5m(linux),96m(root),8m(cfg),
 CONFIG_EFI_PARTITION=y
 # CONFIG_PARTITION_UUIDS is not set
 CONFIG_ENV_IS_IN_FLASH=y
-CONFIG_BOOTP_DNS=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_SUBNETMASK=y
 CONFIG_MXC_GPIO=y
+CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
 CONFIG_NAND=y
 CONFIG_NAND_MXC=y
 CONFIG_NETDEVICES=y
 CONFIG_SMC911X=y
 CONFIG_SMC911X_BASE=0xB6000000
+CONFIG_SPI=y
 CONFIG_MXC_SPI=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y