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

Commit 1989425a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: fix build with make 3.82
  Revert "Input: appletouch - fix integer overflow issue"
  memblock: Fix memblock_is_region_reserved() to return a boolean
  powerpc: Trim defconfigs
  powerpc: fix i8042 module build error
  sound/soc: mpc5200_psc_ac97: Use gpio pins for cold reset
  powerpc/5200: add mpc5200_psc_ac97_gpio_reset
parents 0fc2f137 e32e78c5

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

arch/powerpc/configs/40x/acadia_defconfig

+1 −1002

File changed.

Preview size limit exceeded, changes collapsed.

arch/powerpc/configs/40x/ep405_defconfig

+1 −1211

File changed.

Preview size limit exceeded, changes collapsed.

arch/powerpc/configs/40x/hcu4_defconfig

+1 −1064

File changed.

Preview size limit exceeded, changes collapsed.

arch/powerpc/configs/40x/kilauea_defconfig

+1 −1197

File changed.

Preview size limit exceeded, changes collapsed.