Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a24c8481 authored by Geoff Levand's avatar Geoff Levand Committed by Paul Mackerras
Browse files

[PATCH] ppc64: zimage build fix 



Signed-off-by: default avatarGeoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent dd56fdf2

arch/ppc64/Makefile

+12 −9
Original line number Diff line number Diff line
@@ -89,11 +89,12 @@ drivers-$(CONFIG_OPROFILE) += arch/ppc64/oprofile/ 


boot := arch/ppc64/boot



boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd

boottarget-$(CONFIG_PPC_MAPLE) := zImage zImage.initrd

boottarget-$(CONFIG_PPC_ISERIES) := vmlinux.sminitrd vmlinux.initrd vmlinux.sm

boottarget-$(CONFIG_PPC_BPA) := zImage zImage.initrd

$(boottarget-y): vmlinux

boottargets-$(CONFIG_PPC_PSERIES) += zImage zImage.initrd

boottargets-$(CONFIG_PPC_PMAC) += zImage.vmode zImage.initrd.vmode

boottargets-$(CONFIG_PPC_MAPLE) += zImage zImage.initrd

boottargets-$(CONFIG_PPC_ISERIES) += vmlinux.sminitrd vmlinux.initrd vmlinux.sm

boottargets-$(CONFIG_PPC_BPA) += zImage zImage.initrd

$(boottargets-y): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@



bootimage-$(CONFIG_PPC_PSERIES) := $(boot)/zImage
@@ -131,10 +132,12 @@ include3/asm: 
	$(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm



define archhelp

  echo  '* zImage       - Compressed kernel image (arch/$(ARCH)/boot/zImage)'

  echo  '  zImage.initrd- Compressed kernel image with initrd attached,'

  echo  '  zImage.vmode        - Compressed kernel image (arch/$(ARCH)/boot/zImage.vmode)'

  echo  '  zImage.initrd.vmode - Compressed kernel image with initrd attached,'

  echo  '                        sourced from arch/$(ARCH)/boot/ramdisk.image.gz'

  echo  '		   (arch/$(ARCH)/boot/zImage.initrd)'

  echo  '                        (arch/$(ARCH)/boot/zImage.initrd.vmode)'

  echo  '  zImage              - zImage for pSeries machines'

  echo  '  zImage.initrd       - zImage with initrd for pSeries machines'

endef



CLEAN_FILES += include/asm-ppc64/offsets.h

arch/ppc64/boot/Makefile

+18 −7
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ quiet_cmd_bootcc = BOOTCC $@ 
quiet_cmd_bootas = BOOTAS  $@

      cmd_bootas = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<



quiet_cmd_bootld = BOOTLD  $@

      cmd_bootld = $(CROSS32LD) $(BOOTLFLAGS) -o $@ $(2)



$(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c

	$(call if_changed_dep,bootcc)

$(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S
@@ -53,7 +56,7 @@ src-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.c, $(section))) 
gz-sec  = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.gz, $(section)))



hostprogs-y		:= addnote addRamDisk

targets 		+= zImage zImage.initrd imagesize.c \

targets 		+= zImage.vmode zImage.initrd.vmode zImage zImage.initrd imagesize.c \

			   $(patsubst $(obj)/%,%, $(call obj-sec, $(required) $(initrd))) \

			   $(patsubst $(obj)/%,%, $(call src-sec, $(required) $(initrd))) \

			   $(patsubst $(obj)/%,%, $(call gz-sec, $(required) $(initrd))) \
@@ -76,7 +79,7 @@ addsection = $(CROSS32OBJCOPY) $(1) \ 
		--set-section-flags=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $(1)))=$(OBJCOPYFLAGS)



quiet_cmd_addnote = ADDNOTE $@

      cmd_addnote = $(CROSS32LD) $(BOOTLFLAGS) -o $@ $(obj-boot) && $(obj)/addnote $@

      cmd_addnote = $(obj)/addnote $@



$(call gz-sec, $(required)): $(obj)/kernel-%.gz: % FORCE

	$(call if_changed,gzip)
@@ -91,12 +94,20 @@ $(call obj-sec, $(required) $(initrd)): $(obj)/kernel-%.o: $(obj)/kernel-%.c FOR 
	$(call if_changed_dep,bootcc)

	$(call addsection, $@)



$(obj)/zImage: obj-boot += $(call obj-sec, $(required))

$(obj)/zImage: $(call obj-sec, $(required)) $(obj-boot) $(obj)/addnote FORCE

$(obj)/zImage.vmode: obj-boot += $(call obj-sec, $(required))

$(obj)/zImage.vmode: $(call obj-sec, $(required)) $(obj-boot) FORCE

	$(call cmd,bootld,$(obj-boot))



$(obj)/zImage.initrd.vmode: obj-boot += $(call obj-sec, $(required) $(initrd))

$(obj)/zImage.initrd.vmode: $(call obj-sec, $(required) $(initrd)) $(obj-boot) FORCE

	$(call cmd,bootld,$(obj-boot))



$(obj)/zImage: $(obj)/zImage.vmode $(obj)/addnote FORCE

	@cp -f $< $@

	$(call if_changed,addnote)



$(obj)/zImage.initrd: obj-boot += $(call obj-sec, $(required) $(initrd))

$(obj)/zImage.initrd: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(obj)/addnote FORCE

$(obj)/zImage.initrd: $(obj)/zImage.initrd.vmode $(obj)/addnote FORCE

	@cp -f $< $@

	$(call if_changed,addnote)



$(obj)/imagesize.c: vmlinux.strip