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

Commit 20f62954 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

powerpc: Make building the boot image work for both 32-bit and 64-bit 



At the moment we don't have a merged arch/powerpc/boot, so we build the
boot images in arch/ppc/boot and arch/ppc64/boot.  Unfortunately the
makefile targets are different in those two directories, so this makes
a change to accommodate both for the moment.

Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3c3f42d6

arch/powerpc/Makefile

+8 −1
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ 


defaultimage-$(CONFIG_PPC32)	:= uImage zImage

defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux

defaultimage-$(CONFIG_PPC_PSERIES) := zImage

KBUILD_IMAGE := $(defaultimage-y)

all: $(KBUILD_IMAGE)
@@ -154,8 +155,14 @@ BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm 


boot := arch/$(OLDARCH)/boot



# urk

ifeq ($(CONFIG_PPC64),y)

$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)

else

$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) ARCH=$(OLDARCH) $(build)=$(boot) $@

	$(Q)$(MAKE) ARCH=ppc $(build)=$(boot) $@

endif



uImage: vmlinux

	$(Q)$(MAKE) ARCH=$(OLDARCH) $(build)=$(boot)/images $(boot)/images/$@