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

[u-boot] / configs / nsa310s_defconfig

diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
index 5e111cb3399f6f712049cc95bd13e2c531507040..4e3921a671a5b06b1b1afe2cf3a0dd3b7d8ff811 100644 (file)
--- a/configs/nsa310s_defconfig
+++ b/configs/nsa310s_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_KIRKWOOD=y
+CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_NSA310S=y
 CONFIG_BOOTDELAY=3
 # CONFIG_DISPLAY_BOARDINFO is not set
@@ -23,6 +24,8 @@ CONFIG_ISO_PARTITION=y
 CONFIG_ENV_IS_IN_NAND=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
+CONFIG_NETDEVICES=y
+CONFIG_MVGBE=y
 CONFIG_SYS_NS16550=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y