From: Tom Rini Fix arch/ppc/boot/ so that everything now works with 'make O='. Partially by: Geoffrey LEVAND . Signed-off-by: Tom Rini Signed-off-by: Andrew Morton --- 25-akpm/arch/ppc/boot/Makefile | 6 +++--- 25-akpm/arch/ppc/boot/openfirmware/Makefile | 21 ++++++++++++--------- 25-akpm/arch/ppc/boot/simple/Makefile | 2 +- 3 files changed, 16 insertions(+), 13 deletions(-) diff -puN arch/ppc/boot/Makefile~ppc32-fix-make-o-equals arch/ppc/boot/Makefile --- 25/arch/ppc/boot/Makefile~ppc32-fix-make-o-equals Wed May 26 15:44:52 2004 +++ 25-akpm/arch/ppc/boot/Makefile Wed May 26 15:44:52 2004 @@ -17,11 +17,11 @@ BOOT_TARGETS = zImage zImage.initrd znet bootdir-y := simple bootdir-$(CONFIG_PPC_OF) += openfirmware -subdir-y := lib/ common/ images/ -subdir-$(CONFIG_PPC_OF) += of1275/ +subdir-y := lib common images +subdir-$(CONFIG_PPC_OF) += of1275 # for cleaning -subdir- += simple/ openfirmware/ +subdir- += simple openfirmware host-progs := $(addprefix utils/, addnote mknote hack-coff mkprep mkbugboot mktree) diff -puN arch/ppc/boot/openfirmware/Makefile~ppc32-fix-make-o-equals arch/ppc/boot/openfirmware/Makefile --- 25/arch/ppc/boot/openfirmware/Makefile~ppc32-fix-make-o-equals Wed May 26 15:44:52 2004 +++ 25-akpm/arch/ppc/boot/openfirmware/Makefile Wed May 26 15:44:52 2004 @@ -22,9 +22,10 @@ of1275 := $(boot)/of1275 images := $(boot)/images OBJCOPY_ARGS := -O aixcoff-rs6000 -R .stab -R .stabstr -R .comment -COFF_LD_ARGS := -T $(boot)/ld.script -e _start -Ttext 0x00500000 -Bstatic -CHRP_LD_ARGS := -T $(boot)/ld.script -e _start -Ttext 0x00800000 -NEWWORLD_LD_ARGS:= -T $(boot)/ld.script -e _start -Ttext 0x01000000 +COFF_LD_ARGS := -T $(srctree)/$(boot)/ld.script -e _start -Ttext 0x00500000 \ + -Bstatic +CHRP_LD_ARGS := -T $(srctree)/$(boot)/ld.script -e _start -Ttext 0x00800000 +NEWWORLD_LD_ARGS:= -T $(srctree)/$(boot)/ld.script -e _start -Ttext 0x01000000 COMMONOBJS := start.o misc.o common.o COFFOBJS := coffcrt0.o $(COMMONOBJS) coffmain.o @@ -92,11 +93,11 @@ quiet_cmd_gencoffb = COFF $@ cmd_gencoffb = $(LD) -o $@ $(COFF_LD_ARGS) $(COFFOBJS) $< $(LIBS) && \ $(OBJCOPY) $@ $@ -R .comment $(del-ramdisk-sec) targets += coffboot -$(obj)/coffboot: $(obj)/image.o $(COFFOBJS) $(LIBS) $(boot)/ld.script FORCE +$(obj)/coffboot: $(obj)/image.o $(COFFOBJS) $(LIBS) $(srctree)/$(boot)/ld.script FORCE $(call if_changed,gencoffb) targets += coffboot.initrd $(obj)/coffboot.initrd: $(obj)/image.initrd.o $(COFFOBJS) $(LIBS) \ - $(boot)/ld.script FORCE + $(srctree)/$(boot)/ld.script FORCE $(call if_changed,gencoffb) @@ -118,20 +119,22 @@ quiet_cmd_gen-elf-pmac = ELF $@ -R .comment $(del-ramdisk-sec) $(images)/vmlinux.elf-pmac: $(obj)/image.o $(NEWWORLDOBJS) $(LIBS) \ - $(obj)/note $(boot)/ld.script + $(obj)/note $(srctree)/$(boot)/ld.script $(call cmd,gen-elf-pmac) $(images)/vmlinux.initrd.elf-pmac: $(obj)/image.initrd.o $(NEWWORLDOBJS) \ - $(LIBS) $(obj)/note $(boot)/ld.script + $(LIBS) $(obj)/note \ + $(srctree)/$(boot)/ld.script $(call cmd,gen-elf-pmac) quiet_cmd_gen-chrp = CHRP $@ cmd_gen-chrp = $(LD) $(CHRP_LD_ARGS) -o $@ $(CHRPOBJS) $< $(LIBS) && \ $(OBJCOPY) $@ $@ -R .comment $(del-ramdisk-sec) -$(images)/zImage.chrp: $(obj)/image.o $(CHRPOBJS) $(LIBS) $(boot)/ld.script +$(images)/zImage.chrp: $(obj)/image.o $(CHRPOBJS) $(LIBS) \ + $(srctree)/$(boot)/ld.script $(call cmd,gen-chrp) $(images)/zImage.initrd.chrp: $(obj)/image.initrd.o $(CHRPOBJS) $(LIBS) \ - $(boot)/ld.script + $(srctree)/$(boot)/ld.script $(call cmd,gen-chrp) quiet_cmd_addnote = ADDNOTE $@ diff -puN arch/ppc/boot/simple/Makefile~ppc32-fix-make-o-equals arch/ppc/boot/simple/Makefile --- 25/arch/ppc/boot/simple/Makefile~ppc32-fix-make-o-equals Wed May 26 15:44:52 2004 +++ 25-akpm/arch/ppc/boot/simple/Makefile Wed May 26 15:44:52 2004 @@ -41,7 +41,7 @@ end-y := elf # if present on 'classic' PPC. cacheflag-y := -DCLEAR_CACHES="" # This file will flush / disable the L2, and L3 if present. -clear_L2_L3 := $(srctree)/$(boot)/simple/clear.S +clear_L2_L3 := $(boot)/simple/clear.S # # See arch/ppc/kconfig and arch/ppc/platforms/Kconfig _