Merge branch 'upstream-fixes' (67cb6e84) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/powerpc/Makefile

+7 −18

Original line number	Original line	Diff line number	Diff line
	@@ -14,10 +14,6 @@

	HAS_BIARCH := $(call cc-option-yn, -m32)		HAS_BIARCH := $(call cc-option-yn, -m32)

	ifeq ($(CONFIG_PPC64),y)
	OLDARCH := ppc64
	SZ := 64

	# Set default 32 bits cross compilers for vdso and boot wrapper		# Set default 32 bits cross compilers for vdso and boot wrapper
	CROSS32_COMPILE ?=		CROSS32_COMPILE ?=

	@@ -37,6 +33,10 @@ endif

	export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY		export CROSS32CC CROSS32AS CROSS32LD CROSS32OBJCOPY

			ifeq ($(CONFIG_PPC64),y)
			OLDARCH := ppc64
			SZ := 64

	new_nm := $(shell if $(NM) --help 2>&1 \| grep -- '--synthetic' > /dev/null; then echo y; else echo n; fi)		new_nm := $(shell if $(NM) --help 2>&1 \| grep -- '--synthetic' > /dev/null; then echo y; else echo n; fi)

	ifeq ($(new_nm),y)		ifeq ($(new_nm),y)
	@@ -139,7 +139,7 @@ drivers-$(CONFIG_CPM2) += arch/ppc/8260_io/

	drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/		drivers-$(CONFIG_OPROFILE) += arch/powerpc/oprofile/

	defaultimage-$(CONFIG_PPC32) := uImage zImage		defaultimage-$(CONFIG_PPC32) := zImage
	defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux		defaultimage-$(CONFIG_PPC_ISERIES) := vmlinux
	defaultimage-$(CONFIG_PPC_PSERIES) := zImage		defaultimage-$(CONFIG_PPC_PSERIES) := zImage
	KBUILD_IMAGE := $(defaultimage-y)		KBUILD_IMAGE := $(defaultimage-y)
	@@ -154,23 +154,13 @@ BOOT_TARGETS = zImage zImage.initrd znetboot znetboot.initrd vmlinux.sm

	.PHONY: $(BOOT_TARGETS)		.PHONY: $(BOOT_TARGETS)

	boot := arch/$(OLDARCH)/boot		boot := arch/$(ARCH)/boot

	# urk
	ifeq ($(CONFIG_PPC64),y)
	$(BOOT_TARGETS): vmlinux		$(BOOT_TARGETS): vmlinux
	$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)		$(Q)$(MAKE) ARCH=ppc64 $(build)=$(boot) $(patsubst %,$(boot)/%,$@)
	else
	$(BOOT_TARGETS): vmlinux
	$(Q)$(MAKE) ARCH=ppc $(build)=$(boot) $@
	endif

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

	define archhelp		define archhelp
	@echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/images/zImage.*)'		@echo '* zImage - Compressed kernel image (arch/$(ARCH)/boot/zImage.*)'
	@echo ' uImage - Create a bootable image for U-Boot / PPCBoot'
	@echo ' install - Install kernel using'		@echo ' install - Install kernel using'
	@echo ' (your) ~/bin/installkernel or'		@echo ' (your) ~/bin/installkernel or'
	@echo ' (distribution) /sbin/installkernel or'		@echo ' (distribution) /sbin/installkernel or'
	@@ -180,7 +170,6 @@ endef

	archclean:		archclean:
	$(Q)$(MAKE) $(clean)=$(boot)		$(Q)$(MAKE) $(clean)=$(boot)
	# Temporary hack until we have migrated to asm-powerpc
	$(Q)rm -rf arch/$(ARCH)/include		$(Q)rm -rf arch/$(ARCH)/include

	archprepare: checkbin		archprepare: checkbin

arch/ppc64/boot/Makefile→arch/powerpc/boot/Makefile

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,8 @@


	HOSTCC := gcc		HOSTCC := gcc
	BOOTCFLAGS := $(HOSTCFLAGS) -fno-builtin -nostdinc -isystem $(shell $(CROSS32CC) -print-file-name=include) -fPIC		BOOTCFLAGS := $(HOSTCFLAGS) -fno-builtin -nostdinc -isystem \
			$(shell $(CROSS32CC) -print-file-name=include) -fPIC
	BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc		BOOTAFLAGS := -D__ASSEMBLY__ $(BOOTCFLAGS) -traditional -nostdinc
	BOOTLFLAGS := -T $(srctree)/$(src)/zImage.lds		BOOTLFLAGS := -T $(srctree)/$(src)/zImage.lds
	OBJCOPYFLAGS := contents,alloc,load,readonly,data		OBJCOPYFLAGS := contents,alloc,load,readonly,data
	@@ -98,7 +99,7 @@ quiet_cmd_ramdisk = RAMDISK $@
	cmd_ramdisk = $(obj)/addRamDisk $(obj)/ramdisk.image.gz $< $@		cmd_ramdisk = $(obj)/addRamDisk $(obj)/ramdisk.image.gz $< $@

	quiet_cmd_stripvm = STRIP $@		quiet_cmd_stripvm = STRIP $@
	cmd_stripvm = $(STRIP) -s $< -o $@		cmd_stripvm = $(STRIP) -s -R .comment $< -o $@

	vmlinux.strip: vmlinux		vmlinux.strip: vmlinux
	$(call if_changed,stripvm)		$(call if_changed,stripvm)

arch/ppc64/boot/README→arch/powerpc/boot/README

+0 −0

File moved.

View file

arch/ppc64/boot/addRamDisk.c→arch/powerpc/boot/addRamDisk.c

+0 −0

File moved.

View file

arch/ppc64/boot/addnote.c→arch/powerpc/boot/addnote.c

+0 −0

File moved.

View file