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

[u-boot] / board / renesas / sh7785lcr / config.mk

diff --git a/board/renesas/sh7785lcr/config.mk b/board/renesas/sh7785lcr/config.mk
index 20807dfc528d551a786dccba1bec243825589579..66d35cb21d5103c5bb754e48a6302ffa54b0821e 100644 (file)
--- a/board/renesas/sh7785lcr/config.mk
+++ b/board/renesas/sh7785lcr/config.mk
@@ -22,4 +22,8 @@
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
+
+ifndef TEXT_BASE
 TEXT_BASE = 0x0ff80000
+endif