Merge branch 'master' into next

[u-boot] / board / amcc / bamboo / config.mk

diff --git a/board/amcc/bamboo/config.mk b/board/amcc/bamboo/config.mk
index a37636a0a1452e44047a28b6ca89e98797b68787..72b6bc0c09a7d284ab6e5f315b562e087a2c8e38 100644 (file)
--- a/board/amcc/bamboo/config.mk
+++ b/board/amcc/bamboo/config.mk
@@ -36,3 +36,7 @@ endif
 ifeq ($(dbcr),1)
 PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8cff0000
 endif
+
+ifdef CONFIG_NAND_U_BOOT
+LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
+endif