tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Paul Mackerras <paulus@samba.org>

Paul Mackerras 20f62954 3c3f42d6

+8 -1
+8 -1
arch/powerpc/Makefile
··· 140 140 141 141 defaultimage-$(CONFIG_PPC32) := uImage zImage 142 142 defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux 143 + defaultimage-$(CONFIG_PPC_PSERIES) := zImage 143 144 KBUILD_IMAGE := $(defaultimage-y) 144 145 all: $(KBUILD_IMAGE) 145 146 ··· 155 154 156 155 boot := arch/$(OLDARCH)/boot 157 156 157 + # urk 158 + ifeq ($(CONFIG_PPC64),y) 158 159 $(BOOT_TARGETS): vmlinux 159 - $(Q)$(MAKE) ARCH=$(OLDARCH) $(build)=$(boot) $@ 160 + $(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@) 161 + else 162 + $(BOOT_TARGETS): vmlinux 163 + $(Q)$(MAKE) ARCH=ppc $(build)=$(boot) $@ 164 + endif 160 165 161 166 uImage: vmlinux 162 167 $(Q)$(MAKE) ARCH=$(OLDARCH) $(build)=$(boot)/images $(boot)/images/$@