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

[u-boot] / configs / TQM834x_defconfig

diff --git a/configs/TQM834x_defconfig b/configs/TQM834x_defconfig
index 4fb0c197c5cff5d2ae824e1e5a9780e8e7754c9f..4d730e24edffacf6995a0c965f2f091e13bd9f72 100644 (file)
--- a/configs/TQM834x_defconfig
+++ b/configs/TQM834x_defconfig
@@ -22,11 +22,9 @@ CONFIG_CMD_JFFS2=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nor0=TQM834x-0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=TQM834x-0:256k(u-boot),256k(env),1m(kernel),2m(initrd),-(user);"
-CONFIG_BOOTP_BOOTPATH=y
-CONFIG_BOOTP_GATEWAY=y
-CONFIG_BOOTP_HOSTNAME=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
+CONFIG_PHY_MARVELL=y
 CONFIG_NETDEVICES=y
 CONFIG_TSEC_ENET=y
 CONFIG_SYS_NS16550=y