projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-arm
[oweals/u-boot.git]
/
board
/
freescale
/
mpc8569mds
/
config.mk
diff --git
a/board/freescale/mpc8569mds/config.mk
b/board/freescale/mpc8569mds/config.mk
index 962f79b747732abb8bbb9024e690dd78d85c107b..7de0f7cf7d6cb2382114debb911ff18f6afadc20 100644
(file)
--- a/
board/freescale/mpc8569mds/config.mk
+++ b/
board/freescale/mpc8569mds/config.mk
@@
-23,4
+23,13
@@
#
# mpc8569mds board
#
#
# mpc8569mds board
#
+ifndef NAND_SPL
+ifeq ($(CONFIG_MK_NAND), y)
+TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+LDSCRIPT := $(TOPDIR)/cpu/$(CPU)/u-boot-nand.lds
+endif
+endif
+
+ifndef TEXT_BASE
TEXT_BASE = 0xfff80000
TEXT_BASE = 0xfff80000
+endif