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

[oweals/u-boot.git] / board / freescale / mpc8569mds / config.mk

diff --git a/board/freescale/mpc8569mds/config.mk b/board/freescale/mpc8569mds/config.mk
index 36b344e2526891597748eccf8127a54d65f09515..86f138c19ca292258aae0bc19bac7f41af9b6c28 100644 (file)
--- a/board/freescale/mpc8569mds/config.mk
+++ b/board/freescale/mpc8569mds/config.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2009 Freescale Semiconductor, Inc. All rights reserved.
+# Copyright (C) 2009 Freescale Semiconductor, Inc.
 #
 # See file CREDITS for list of people who contributed to this
 # project.
@@ -23,8 +23,13 @@
 #
 # mpc8569mds board
 #
-TEXT_BASE = 0xfff80000
+ifndef NAND_SPL
+ifeq ($(CONFIG_MK_NAND), y)
+TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
+endif
+endif
 
-PLATFORM_CPPFLAGS += -DCONFIG_E500=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC85xx=1
-PLATFORM_CPPFLAGS += -DCONFIG_MPC8569=1
+ifndef TEXT_BASE
+TEXT_BASE = 0xfff80000
+endif