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

[platform/kernel/u-boot.git] / nand_spl / board / amcc / canyonlands / Makefile

diff --git a/nand_spl/board/amcc/canyonlands/Makefile b/nand_spl/board/amcc/canyonlands/Makefile
index 1ec1112..84b1454 100644 (file)
--- a/nand_spl/board/amcc/canyonlands/Makefile
+++ b/nand_spl/board/amcc/canyonlands/Makefile
@@ -30,7 +30,7 @@ AFLAGS        += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 SOBJS  := start.o
-SOBJS  += init.o resetvec.o
+SOBJS  += init.o
 SOBJS  += resetvec.o
 COBJS  := ddr2_fixed.o
 COBJS  += nand_boot.o
@@ -55,7 +55,7 @@ $(nandobj)u-boot-spl.bin:     $(nandobj)u-boot-spl
        $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
 
 $(nandobj)u-boot-spl:  $(OBJS)
-       cd $(LNDIR) && $(LD) $(LDFLAGS) $$UNDEF_SYM $(__OBJS) \
+       cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) \
                -Map $(nandobj)u-boot-spl.map \
                -o $(nandobj)u-boot-spl
 
@@ -64,7 +64,7 @@ $(nandobj)u-boot-spl: $(OBJS)
 # from cpu directory
 $(obj)ndfc.c:
        @rm -f $(obj)ndfc.c
-       ln -s $(SRCTREE)/cpu/ppc4xx/ndfc.c $(obj)ndfc.c
+       ln -s $(SRCTREE)/drivers/mtd/nand/ndfc.c $(obj)ndfc.c
 
 $(obj)resetvec.S:
        @rm -f $(obj)resetvec.S
@@ -89,6 +89,12 @@ $(obj)nand_ecc.c:
        @rm -f $(obj)nand_ecc.c
        ln -s $(SRCTREE)/drivers/mtd/nand/nand_ecc.c $(obj)nand_ecc.c
 
+ifneq ($(OBJTREE), $(SRCTREE))
+$(obj)ddr2_fixed.c:
+       @rm -f $(obj)ddr2_fixed.c
+       ln -s $(SRCTREE)/nand_spl/board/$(BOARDDIR)/ddr2_fixed.c $(obj)ddr2_fixed.c
+endif
+
 #########################################################################
 
 $(obj)%.o:     $(obj)%.S