Merge branch 'next' of git://git.denx.de/u-boot-video into next

[u-boot] / board / freescale / mpc8315erdb / config.mk

diff --git a/board/freescale/mpc8315erdb/config.mk b/board/freescale/mpc8315erdb/config.mk
index f76826495ef6a4fff49dafd222ad01d713693793..bf972fbe56fbabbb816a050f3c71d640c88cbc47 100644 (file)
--- a/board/freescale/mpc8315erdb/config.mk
+++ b/board/freescale/mpc8315erdb/config.mk
@@ -1 +1,9 @@
+ifndef NAND_SPL
+ifeq ($(CONFIG_MK_NAND), y)
+TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+endif
+endif
+
+ifndef TEXT_BASE
 TEXT_BASE = 0xFE000000
+endif