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

[karo-tx-uboot.git] / nand_spl / board / sheldon / simpc8313 / Makefile

diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile
index b0967a30b151058a5fd9b6456c5d26d7e21e88ba..2da61420a8d067df26c9df64fabed2dff272ca90 100644 (file)
--- a/nand_spl/board/sheldon/simpc8313/Makefile
+++ b/nand_spl/board/sheldon/simpc8313/Makefile
@@ -29,12 +29,13 @@ TEXT_BASE := 0xfff00000
 include $(TOPDIR)/config.mk
 
 LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
-LDFLAGS        = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
+LDFLAGS        = -Bstatic -T $(nandobj)u-boot.lds -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS)
 AFLAGS += -DCONFIG_NAND_SPL
 CFLAGS += -DCONFIG_NAND_SPL
 
 SOBJS  = start.o ticks.o
-COBJS  = nand_boot_fsl_elbc.o $(BOARD).o sdram.o ns16550.o nand_init.o time.o
+COBJS  = nand_boot_fsl_elbc.o $(BOARD).o sdram.o ns16550.o nand_init.o \
+         time.o cache.o
 
 SRCS   := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c))
 OBJS   := $(addprefix $(obj),$(SOBJS) $(COBJS))
@@ -53,36 +54,51 @@ $(nandobj)u-boot-spl-16k.bin:       $(nandobj)u-boot-spl
 $(nandobj)u-boot-spl.bin:      $(nandobj)u-boot-spl
        $(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
 
-$(nandobj)u-boot-spl:  $(OBJS)
+$(nandobj)u-boot-spl:  $(OBJS) $(nandobj)u-boot.lds
        cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) \
                -Map $(nandobj)u-boot-spl.map \
                -o $(nandobj)u-boot-spl
 
+$(nandobj)u-boot.lds: $(LDSCRIPT)
+       $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
+
 # create symbolic links for common files
 
 $(obj)start.S:
-       ln -sf $(SRCTREE)/cpu/mpc83xx/start.S $<
+       @rm -f $@
+       ln -s $(SRCTREE)/arch/powerpc/cpu/mpc83xx/start.S $@
 
 $(obj)nand_boot_fsl_elbc.c:
-       ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c $<
+       @rm -f $@
+       ln -s $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c $@
 
 $(obj)sdram.c:
-       ln -sf $(SRCTREE)/board/$(BOARDDIR)/sdram.c $<
+       @rm -f $@
+       ln -s $(SRCTREE)/board/$(BOARDDIR)/sdram.c $@
 
 $(obj)$(BOARD).c:
-       ln -sf $(SRCTREE)/board/$(BOARDDIR)/$(BOARD).c $<
+       @rm -f $@
+       ln -s $(SRCTREE)/board/$(BOARDDIR)/$(BOARD).c $@
 
 $(obj)ns16550.c:
-       ln -sf $(SRCTREE)/drivers/serial/ns16550.c $<
+       @rm -f $@
+       ln -s $(SRCTREE)/drivers/serial/ns16550.c $@
 
 $(obj)nand_init.c:
-       ln -sf $(SRCTREE)/cpu/mpc83xx/nand_init.c $<
+       @rm -f $@
+       ln -s $(SRCTREE)/arch/powerpc/cpu/mpc83xx/nand_init.c $@
+
+$(obj)cache.c:
+       @rm -f $@
+       ln -s $(SRCTREE)/arch/powerpc/lib/cache.c $@
 
 $(obj)time.c:
-       ln -sf $(SRCTREE)/lib_ppc/time.c $<
+       @rm -f $@
+       ln -s $(SRCTREE)/arch/powerpc/lib/time.c $@
 
 $(obj)ticks.S:
-       ln -sf $(SRCTREE)/lib_ppc/ticks.S $<
+       @rm -f $@
+       ln -s $(SRCTREE)/arch/powerpc/lib/ticks.S $@
 
 #########################################################################