Commit af3b146d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 

* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (23 commits)
  [POWERPC] Add arch/powerpc support for the Motorola PrPMC2800
  [POWERPC] Add bootwrapper support for Motorola PrPMC2800 platform
  [POWERPC] Add DTS file for the Motorola PrPMC2800 platform
  [POWERPC] Check cache coherency of kernel vs firmware
  [POWERPC] Add Marvell mv64x60 PCI bridge support
  [POWERPC] Create Marvell mv64x60 I2C platform_data
  [POWERPC] Create Marvell mv64x60 ethernet platform_data
  [POWERPC] Create Marvell mv64x60 MPSC (serial) platform_data
  [POWERPC] Add interrupt support for Marvell mv64x60 chips
  [POWERPC] Add bootwrapper support for Marvell/mv64x60 I2C
  [POWERPC] Add bootwrapper support for Marvell MPSC
  [POWERPC] Add bootwrapper support for Marvell/mv64x60 hostbridge
  [POWERPC] Add Makefile rules to wrap dts file in zImage
  [POWERPC] Spelling fixes: arch/ppc/
  [POWERPC] U-boot passes the initrd as start/end, not start/size.
  [POWERPC] PS3: Update ps3_defconfig
  [POWERPC] PS3: Fix request_irq warning
  [POWERPC] Don't complain if size-cells == 0 in prom_parse()
  [POWERPC] Simplify smp_space_timers
  [POWERPC] Trivial ps3 warning fixes
  ...
parents c5b7bede fd4ba7e2

arch/powerpc/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -389,6 +389,9 @@ config NOT_COHERENT_CACHE 
	bool

	depends on 4xx || 8xx || E200

	default y



config CONFIG_CHECK_CACHE_COHERENCY

	bool

endmenu



source "init/Kconfig"
@@ -451,7 +454,7 @@ config ARCH_ENABLE_MEMORY_HOTPLUG 


config KEXEC

	bool "kexec system call (EXPERIMENTAL)"

	depends on PPC_MULTIPLATFORM && EXPERIMENTAL

	depends on (PPC_PRPMC2800 || PPC_MULTIPLATFORM) && EXPERIMENTAL

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel.  It is like a reboot

arch/powerpc/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ all: $(KBUILD_IMAGE) 


CPPFLAGS_vmlinux.lds	:= -Upowerpc



BOOT_TARGETS = zImage zImage.initrd uImage

BOOT_TARGETS = zImage zImage.initrd zImage.dts zImage.dts_initrd uImage



PHONY += $(BOOT_TARGETS)

arch/powerpc/boot/Makefile

+27 −3
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ $(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \ 
src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \

		ns16550.c serial.c simple_alloc.c div64.S util.S \

		gunzip_util.c elf_util.c $(zlib) devtree.c \

		44x.c ebony.c

		44x.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c

src-plat := of.c cuboot-83xx.c cuboot-85xx.c holly.c \

		cuboot-ebony.c treeboot-ebony.c

		cuboot-ebony.c treeboot-ebony.c prpmc2800.c

src-boot := $(src-wlib) $(src-plat) empty.c



src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -132,6 +132,7 @@ image-$(CONFIG_PPC_CHRP) += zImage.chrp 
image-$(CONFIG_PPC_EFIKA)		+= zImage.chrp

image-$(CONFIG_PPC_PMAC)		+= zImage.pmac

image-$(CONFIG_PPC_HOLLY)		+= zImage.holly-elf

image-$(CONFIG_PPC_PRPMC2800)		+= zImage.prpmc2800

image-$(CONFIG_DEFAULT_UIMAGE)		+= uImage



ifneq ($(CONFIG_DEVICE_TREE),"")
@@ -154,9 +155,27 @@ targets += $(image-y) $(initrd-y) 


$(addprefix $(obj)/, $(initrd-y)): $(obj)/ramdisk.image.gz



dts-  := $(patsubst zImage%, zImage.dts%, $(image-n) $(image-))

dts-y := $(patsubst zImage%, zImage.dts%, $(image-y))

dts-y := $(filter-out $(image-y), $(dts-y))

targets	+= $(image-y) $(dts-y)



dts_initrd-  := $(patsubst zImage%, zImage.dts_initrd%, $(image-n) $(image-))

dts_initrd-y := $(patsubst zImage%, zImage.dts_initrd%, $(image-y))

dts_initrd-y := $(filter-out $(image-y), $(dts_initrd-y))

targets	+= $(image-y) $(dts_initrd-y)



$(addprefix $(obj)/, $(dts_initrd-y)): $(obj)/ramdisk.image.gz



# Don't put the ramdisk on the pattern rule; when its missing make will try

# the pattern rule with less dependencies that also matches (even with the

# hard dependency listed).

$(obj)/zImage.dts_initrd.%: vmlinux $(wrapperbits) $(dts) $(obj)/ramdisk.image.gz

	$(call if_changed,wrap,$*,$(dts),,$(obj)/ramdisk.image.gz)



$(obj)/zImage.dts.%: vmlinux $(wrapperbits) $(dts)

	$(call if_changed,wrap,$*,$(dts))



$(obj)/zImage.initrd.%: vmlinux $(wrapperbits)

	$(call if_changed,wrap,$*,,,$(obj)/ramdisk.image.gz)
@@ -195,13 +214,18 @@ $(obj)/zImage: $(addprefix $(obj)/, $(image-y)) 
	@rm -f $@; ln $< $@

$(obj)/zImage.initrd:	$(addprefix $(obj)/, $(initrd-y))

	@rm -f $@; ln $< $@

$(obj)/zImage.dts:	$(addprefix $(obj)/, $(dts-y))

	@rm -f $@; ln $< $@

$(obj)/zImage.dts_initrd:	$(addprefix $(obj)/, $(dts_initrd-y))

	@rm -f $@; ln $< $@





install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))

	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $<



# anything not in $(targets)

clean-files += $(image-) $(initrd-) zImage zImage.initrd cuImage.* \

	treeImage.*

	treeImage.* zImage.dts zImage.dts_initrd



# clean up files cached by wrapper

clean-kernel := vmlinux.strip vmlinux.bin

arch/powerpc/boot/cuboot-83xx.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, 


	memcpy(&bd, (bd_t *)r3, sizeof(bd));

	loader_info.initrd_addr = r4;

	loader_info.initrd_size = r4 ? r5 : 0;

	loader_info.initrd_size = r4 ? r5 - r4 : 0;

	loader_info.cmdline = (char *)r6;

	loader_info.cmdline_len = r7 - r6;

arch/powerpc/boot/cuboot-85xx.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, 


	memcpy(&bd, (bd_t *)r3, sizeof(bd));

	loader_info.initrd_addr = r4;

	loader_info.initrd_size = r4 ? r5 : 0;

	loader_info.initrd_size = r4 ? r5 - r4 : 0;

	loader_info.cmdline = (char *)r6;

	loader_info.cmdline_len = r7 - r6;

CRA Git | Maintained and supported by SUSTech CRA and CCSE