Merge tag 'signed-rpi-next' of git://github.com/agraf/u-boot

[u-boot] / configs / rpi_2_defconfig

diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig
index aaddf62d3b36863a2f80f4e060494ebb4bf76063..dd3c60cc93d324a89e33b2f9c6aab3e8fa8a07b3 100644 (file)
--- a/configs/rpi_2_defconfig
+++ b/configs/rpi_2_defconfig
@@ -1,5 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_BCM283X=y
+CONFIG_SYS_TEXT_BASE=0x00008000
 CONFIG_TARGET_RPI_2=y
 CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
 CONFIG_DISTRO_DEFAULTS=y
@@ -33,3 +34,4 @@ CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_CONSOLE_SCROLL_LINES=10
 CONFIG_PHYS_TO_BUS=y
 CONFIG_OF_LIBFDT_OVERLAY=y
+# CONFIG_REQUIRE_SERIAL_CONSOLE is not set