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

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

diff --git a/board/renesas/sh7785lcr/config.mk b/board/renesas/sh7785lcr/config.mk
index 20807dfc528d551a786dccba1bec243825589579..6853d2b28beaf29a65f89fb73d6da467f70e3615 100644 (file)
--- a/board/renesas/sh7785lcr/config.mk
+++ b/board/renesas/sh7785lcr/config.mk
@@ -18,8 +18,14 @@
 # MA 02111-1307 USA
 
 #
-# TEXT_BASE refers to image _after_ relocation.
+# CONFIG_SYS_TEXT_BASE refers to image _after_ relocation.
 #
 # NOTE: Must match value used in u-boot.lds (in this directory).
 #
-TEXT_BASE = 0x0ff80000
+sinclude $(OBJTREE)/board/$(BOARDDIR)/config.tmp
+
+ifdef CONFIG_SH_32BIT
+CONFIG_SYS_TEXT_BASE = 0x8FF80000
+else
+CONFIG_SYS_TEXT_BASE = 0x0ff80000
+endif