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

[J-u-boot.git] / configs / socrates_defconfig

diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig
index 6bbfc7155f71a13816575dd28eb791735c7d0808..aad7ef371446d8e16a0452a996263a8bd9355d19 100644 (file)
--- a/configs/socrates_defconfig
+++ b/configs/socrates_defconfig
@@ -1,5 +1,5 @@
 CONFIG_PPC=y
-CONFIG_VIDEO=y
+CONFIG_SYS_TEXT_BASE=0xfff80000
 CONFIG_MPC85xx=y
 # CONFIG_CMD_ERRATA is not set
 CONFIG_TARGET_SOCRATES=y
@@ -9,6 +9,7 @@ CONFIG_OF_BOARD_SETUP=y
 CONFIG_BOOTDELAY=1
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
+CONFIG_BOARD_EARLY_INIT_R=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_REGINFO=y
 CONFIG_CMD_IMLS=y
@@ -31,10 +32,12 @@ CONFIG_CMD_EXT2=y
 CONFIG_ENV_IS_IN_FLASH=y
 # CONFIG_MMC is not set
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_PHYLIB=y
+CONFIG_NETDEVICES=y
+CONFIG_TSEC_ENET=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 # CONFIG_USB_EHCI_HCD is not set
 CONFIG_USB_STORAGE=y
+CONFIG_VIDEO=y
 CONFIG_CONSOLE_EXTRA_INFO=y
 CONFIG_OF_LIBFDT=y