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

Commit e32e78c5 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Benjamin Herrenschmidt
Browse files

powerpc: fix build with make 3.82 



Thomas Backlund reported that the powerpc build broke with make 3.82.
It failed with the following message:

    arch/powerpc/Makefile:183: *** mixed implicit and normal rules.  Stop.

The fix is to avoid mixing non-wildcard and wildcard targets.

Reported-by: default avatarThomas Backlund <tmb@mandriva.org>
Tested-by: default avatarThomas Backlund <tmb@mandriva.org>
Cc: Michal Marek <mmarek@suse.cz>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 6e49c1a4

arch/powerpc/Makefile

+12 −4
Original line number Original line Diff line number Diff line
@@ -163,9 +163,11 @@ drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/ 
# Default to zImage, override when needed

# Default to zImage, override when needed

all: zImage

all: zImage





BOOT_TARGETS = zImage zImage.initrd uImage zImage% dtbImage% treeImage.% cuImage.% simpleImage.%

# With make 3.82 we cannot mix normal and wildcard targets

BOOT_TARGETS1 := zImage zImage.initrd uImaged

BOOT_TARGETS2 := zImage% dtbImage% treeImage.% cuImage.% simpleImage.%





PHONY += $(BOOT_TARGETS)

PHONY += $(BOOT_TARGETS1) $(BOOT_TARGETS2)





boot := arch/$(ARCH)/boot

boot := arch/$(ARCH)/boot
@@ -180,10 +182,16 @@ relocs_check: arch/powerpc/relocs_check.pl vmlinux 
zImage: relocs_check

zImage: relocs_check

endif

endif





$(BOOT_TARGETS): vmlinux

$(BOOT_TARGETS1): vmlinux

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

$(BOOT_TARGETS2): vmlinux

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





bootwrapper_install:

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

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





bootwrapper_install %.dtb:

%.dtb:

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

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





define archhelp

define archhelp