X-Git-Url: https://git.kernelconcepts.de/?a=blobdiff_plain;f=nand_spl%2Fboard%2Ffreescale%2Fmpc8572ds%2FMakefile;h=9f338024ea2afe50d42ed8f159a0e3e659524c10;hb=2f7b27caf4e6bdc6cb4047ef3ee4021f20e14c5f;hp=f0beaedf1a523b4bd93c180df586dc598ff6d05a;hpb=4c89a369c7cd6e7ad3adec4601cfa69fec476164;p=karo-tx-uboot.git

diff --git a/nand_spl/board/freescale/mpc8572ds/Makefile b/nand_spl/board/freescale/mpc8572ds/Makefile
index f0beaedf1a..9f338024ea 100644
--- a/nand_spl/board/freescale/mpc8572ds/Makefile
+++ b/nand_spl/board/freescale/mpc8572ds/Makefile
@@ -10,9 +10,9 @@
 CONFIG_SYS_TEXT_BASE_SPL := 0xfff00000
 PAD_TO := 0xfff01000
 
-nandobj	:= $(OBJTREE)/nand_spl/
+nandobj	:= $(objtree)/nand_spl/
 
-LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds
+LDSCRIPT= $(srctree)/$(CPUDIR)/u-boot-nand_spl.lds
 LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \
 		$(LDFLAGS) $(LDFLAGS_FINAL)
 asflags-y += -DCONFIG_NAND_SPL
@@ -31,10 +31,10 @@ targets += $(__OBJS)
 all: $(nandobj)u-boot-spl.bin $(nandobj)u-boot-spl-16k.bin
 
 $(nandobj)u-boot-spl-16k.bin: $(nandobj)u-boot-spl
-	$(OBJCOPY) ${OBJCFLAGS} --pad-to=$(PAD_TO) -O binary $< $@
+	$(OBJCOPY) $(OBJCOPYFLAGS) --pad-to=$(PAD_TO) -O binary $< $@
 
 $(nandobj)u-boot-spl.bin:	$(nandobj)u-boot-spl
-	$(OBJCOPY) ${OBJCFLAGS} -O binary $< $@
+	$(OBJCOPY) $(OBJCOPYFLAGS) -O binary $< $@
 
 $(nandobj)u-boot-spl:	$(OBJS) $(nandobj)u-boot-nand_spl.lds
 	cd $(LNDIR) && $(LD) $(LDFLAGS) $(__OBJS) $(PLATFORM_LIBS) \
@@ -48,48 +48,44 @@ $(nandobj)u-boot-nand_spl.lds: $(LDSCRIPT)
 
 $(obj)/cache.c:
 	@rm -f $@
-	ln -sf $(SRCTREE)/arch/powerpc/lib/cache.c $@
+	ln -sf $(srctree)/arch/powerpc/lib/cache.c $@
 
 $(obj)/cpu_init_early.c:
 	@rm -f $@
-	ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/cpu_init_early.c $@
+	ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/cpu_init_early.c $@
 
 $(obj)/spl_minimal.c:
 	@rm -f $@
-	ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/spl_minimal.c $@
+	ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/spl_minimal.c $@
 
 $(obj)/fsl_law.c:
 	@rm -f $@
-	ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc8xxx/law.c $@
+	ln -sf $(srctree)/arch/powerpc/cpu/mpc8xxx/law.c $@
 
 $(obj)/law.c:
 	@rm -f $@
-	ln -sf $(SRCTREE)/board/$(BOARDDIR)/law.c $@
+	ln -sf $(srctree)/board/$(BOARDDIR)/law.c $@
 
 $(obj)/nand_boot_fsl_elbc.c:
 	@rm -f $@
-	ln -sf $(SRCTREE)/nand_spl/nand_boot_fsl_elbc.c $@
+	ln -sf $(srctree)/nand_spl/nand_boot_fsl_elbc.c $@
 
 $(obj)/ns16550.c:
 	@rm -f $@
-	ln -sf $(SRCTREE)/drivers/serial/ns16550.c $@
+	ln -sf $(srctree)/drivers/serial/ns16550.c $@
 
 $(obj)/resetvec.S:
 	@rm -f $@
-	ln -s $(SRCTREE)/$(CPUDIR)/resetvec.S $@
+	ln -s $(srctree)/$(CPUDIR)/resetvec.S $@
 
-$(obj)/fixed_ivor.S:
+$(obj)/start.S:
 	@rm -f $@
-	ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/fixed_ivor.S $@
-
-$(obj)/start.S: $(obj)/fixed_ivor.S
-	@rm -f $@
-	ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/start.S $@
+	ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/start.S $@
 
 $(obj)/tlb.c:
 	@rm -f $@
-	ln -sf $(SRCTREE)/arch/powerpc/cpu/mpc85xx/tlb.c $@
+	ln -sf $(srctree)/arch/powerpc/cpu/mpc85xx/tlb.c $@
 
 $(obj)/tlb_table.c:
 	@rm -f $@
-	ln -sf $(SRCTREE)/board/$(BOARDDIR)/tlb.c $@
+	ln -sf $(srctree)/board/$(BOARDDIR)/tlb.c $@