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

[u-boot] / configs / socrates_defconfig

diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index 96c35dee1cd84f02bd9a276a29754e739a3d9dbc..f07d1a2d14695b539777ab9974bb459c1228ac3e 100644 (file)
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -30,11 +30,9 @@ CONFIG_CMD_DATE=y
 CONFIG_CMD_EXT2=y
 # CONFIG_CMD_IRQ is not set
 CONFIG_ENV_IS_IN_FLASH=y
-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