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

[oweals/u-boot.git] / configs / bcm958712k_defconfig

diff --git a/configs/bcm958712k_defconfig b/configs/bcm958712k_defconfig
index a2640d7fb03aaf7e1be154eaa20833a72ed84251..343a3e1dfa8a66217f0ac4c0e921a4f8b0af8a9e 100644 (file)
--- a/configs/bcm958712k_defconfig
+++ b/configs/bcm958712k_defconfig
@@ -1,11 +1,12 @@
 CONFIG_ARM=y
 CONFIG_TARGET_BCMNS2=y
+CONFIG_SYS_TEXT_BASE=0x85000000
 CONFIG_IDENT_STRING=" Broadcom Northstar 2"
 CONFIG_DISTRO_DEFAULTS=y
-CONFIG_ENV_IS_NOWHERE=y
+CONFIG_NR_DRAM_BANKS=2
 CONFIG_BOOTDELAY=5
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SYS_PROMPT="u-boot> "
-# CONFIG_CMD_IMLS is not set
+CONFIG_CONS_INDEX=4
 CONFIG_SYS_NS16550=y
 CONFIG_OF_LIBFDT=y