X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=board%2Famcc%2Fcanyonlands%2Fconfig.mk;h=7a5866550c60935d2e34d6d644433441a44ab1b6;hb=35e3717772c8c3534c18d8aac69e4b822777c23b;hp=7e7953679811559e3f74cc712421f0fb78a0271e;hpb=cda2a4a9961fd4341b7db305cb22fc05957e8b77;p=platform%2Fkernel%2Fu-boot.git

diff --git a/board/amcc/canyonlands/config.mk b/board/amcc/canyonlands/config.mk
index 7e79536..7a58665 100644
--- a/board/amcc/canyonlands/config.mk
+++ b/board/amcc/canyonlands/config.mk
@@ -30,14 +30,6 @@ ifndef TEXT_BASE
 TEXT_BASE = 0xFFFA0000
 endif
 
-ifeq ($(CONFIG_NAND_U_BOOT),y)
-LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
-endif
-
-ifeq ($(CONFIG_PCIBOOT_U_BOOT),y)
-LDSCRIPT = $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
-endif
-
 PLATFORM_CPPFLAGS += -DCONFIG_440=1
 
 ifeq ($(debug),1)
@@ -45,5 +37,9 @@ PLATFORM_CPPFLAGS += -DDEBUG
 endif
 
 ifeq ($(dbcr),1)
-PLATFORM_CPPFLAGS += -DCFG_INIT_DBCR=0x8cff0000
+PLATFORM_CPPFLAGS += -DCONFIG_SYS_INIT_DBCR=0x8cff0000
+endif
+
+ifdef CONFIG_NAND_U_BOOT
+LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
 endif