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

Commit 7e4e574c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

parents a4fc7ab1 97b1b999

arch/powerpc/Kconfig

+49 −34
Original line number Diff line number Diff line
@@ -71,15 +71,39 @@ config ARCH_MAY_HAVE_PC_FDC 
	bool

	default y



config PPC_OF

	def_bool y



config PPC_UDBG_16550

	bool

	default n



config CRASH_DUMP

	bool "kernel crash dumps (EXPERIMENTAL)"

	depends on PPC_MULTIPLATFORM

	depends on EXPERIMENTAL

	help

	  Build a kernel suitable for use as a kdump capture kernel.

	  The kernel will be linked at a different address than normal, and

	  so can only be used for Kdump.



	  Don't change this unless you know what you are doing.



config GENERIC_TBSYNC

	bool

	default y if PPC32 && SMP

	default n



menu "Processor support"

choice

	prompt "Processor Type"

	depends on PPC32

	default 6xx



config 6xx

config CLASSIC32

	bool "6xx/7xx/74xx"

	select PPC_FPU

	select 6xx

	help

	  There are four families of PowerPC chips supported.  The more common

	  types (601, 603, 604, 740, 750, 7400), the Motorola embedded
@@ -93,12 +117,20 @@ config 6xx 


config PPC_52xx

	bool "Freescale 52xx"

	select 6xx

	select PPC_FPU

	

config PPC_82xx

	bool "Freescale 82xx"

	select 6xx

	select PPC_FPU



config PPC_83xx

	bool "Freescale 83xx"

	select 6xx

	select FSL_SOC

	select 83xx

	select PPC_FPU



config 40x

	bool "AMCC 40x"
@@ -134,6 +166,13 @@ config POWER4 
	depends on PPC64

	def_bool y



config 6xx

	bool



# this is temp to handle compat with arch=ppc

config 83xx

	bool



config PPC_FPU

	bool

	default y if PPC64
@@ -166,7 +205,7 @@ config PHYS_64BIT 


config ALTIVEC

	bool "AltiVec Support"

	depends on 6xx || POWER4

	depends on CLASSIC32 || POWER4

	---help---

	  This option enables kernel support for the Altivec extensions to the

	  PowerPC processor. The kernel currently supports saving and restoring
@@ -239,7 +278,7 @@ endmenu 
source "init/Kconfig"



menu "Platform support"

	depends on PPC64 || 6xx

	depends on PPC64 || CLASSIC32



choice

	prompt "Machine type"
@@ -330,9 +369,6 @@ config PPC_CELL 
	select MMIO_NVRAM

	select PPC_UDBG_16550



config PPC_OF

	def_bool y



config XICS

	depends on PPC_PSERIES

	bool
@@ -375,26 +411,11 @@ config MPIC_BROKEN_U3 
	depends on PPC_MAPLE

	default y



config PPC_UDBG_16550

	bool

	default n



config CELL_IIC

	depends on PPC_CELL

	bool

	default y



config CRASH_DUMP

	bool "kernel crash dumps (EXPERIMENTAL)"

	depends on PPC_MULTIPLATFORM

	depends on EXPERIMENTAL

	help

	  Build a kernel suitable for use as a kdump capture kernel.

	  The kernel will be linked at a different address than normal, and

	  so can only be used for Kdump.



	  Don't change this unless you know what you are doing.



config IBMVIO

	depends on PPC_PSERIES || PPC_ISERIES

	bool
@@ -410,11 +431,6 @@ config PPC_MPC106 
	bool

	default n



config GENERIC_TBSYNC

	bool

	default y if PPC32 && SMP

	default n



source "drivers/cpufreq/Kconfig"



config CPU_FREQ_PMAC
@@ -495,6 +511,7 @@ endmenu 


source arch/powerpc/platforms/embedded6xx/Kconfig

source arch/powerpc/platforms/4xx/Kconfig

source arch/powerpc/platforms/83xx/Kconfig

source arch/powerpc/platforms/85xx/Kconfig

source arch/powerpc/platforms/8xx/Kconfig

source arch/powerpc/platforms/cell/Kconfig
@@ -718,7 +735,7 @@ config PPC_I8259 
config PPC_INDIRECT_PCI

	bool

	depends on PCI

	default y if 40x || 44x || 85xx || 83xx

	default y if 40x || 44x || 85xx

	default n



config EISA
@@ -727,13 +744,16 @@ config EISA 
config SBUS

	bool



config FSL_SOC

	bool



# Yes MCA RS/6000s exist but Linux-PPC does not currently support any

config MCA

	bool



config PCI

	bool "PCI support" if 40x || CPM2 || 83xx || 85xx || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES)

	default y if !40x && !CPM2 && !8xx && !APUS && !83xx && !85xx

	bool "PCI support" if 40x || CPM2 || PPC_83xx || 85xx || PPC_MPC52xx || (EMBEDDED && PPC_ISERIES)

	default y if !40x && !CPM2 && !8xx && !APUS && !PPC_83xx && !85xx

	default PCI_PERMEDIA if !4xx && !CPM2 && !8xx && APUS

	default PCI_QSPAN if !4xx && !CPM2 && 8xx

	help
@@ -746,11 +766,6 @@ config PCI_DOMAINS 
	bool

	default PCI



config MPC83xx_PCI2

	bool "  Supprt for 2nd PCI host controller"

	depends on PCI && MPC834x

	default y if MPC834x_SYS



config PCI_QSPAN

	bool "QSpan PCI"

	depends on !4xx && !CPM2 && 8xx

arch/powerpc/Kconfig.debug

+42 −0
Original line number Diff line number Diff line
@@ -115,4 +115,46 @@ config PPC_OCP 
	depends on IBM_OCP || XILINX_OCP

	default y



choice

	prompt "Early debugging (dangerous)"

	bool

	optional

	help

	  Enable early debugging. Careful, if you enable debugging for the

	  wrong type of machine your kernel _will not boot_.



config PPC_EARLY_DEBUG_LPAR

	bool "LPAR HV Console"

	depends on PPC_PSERIES

	help

	  Select this to enable early debugging for a machine with a HVC

	  console on vterm 0.



config PPC_EARLY_DEBUG_G5

	bool "Apple G5"

	depends on PPC_PMAC64

	help

	  Select this to enable early debugging for Apple G5 machines.



config PPC_EARLY_DEBUG_RTAS

	bool "RTAS Panel"

	depends on PPC_RTAS

	help

	  Select this to enable early debugging via the RTAS panel.



config PPC_EARLY_DEBUG_MAPLE

	bool "Maple real mode"

	depends on PPC_MAPLE

	help

	  Select this to enable early debugging for Maple.



config PPC_EARLY_DEBUG_ISERIES

	bool "iSeries HV Console"

	depends on PPC_ISERIES

	help

	  Select this to enable early debugging for legacy iSeries. You need

	  to hit "Ctrl-x Ctrl-x" to see the messages on the console.



endchoice



endmenu

arch/powerpc/boot/.gitignore

0 → 100644
+20 −0
Original line number Diff line number Diff line 
addnote

infblock.c

infblock.h

infcodes.c

infcodes.h

inffast.c

inffast.h

inflate.c

inftrees.c

inftrees.h

infutil.c

infutil.h

kernel-vmlinux.strip.c

kernel-vmlinux.strip.gz

uImage

zImage

zImage.vmode

zconf.h

zlib.h

zutil.h

arch/powerpc/boot/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -176,4 +176,4 @@ $(obj)/uImage: $(obj)/vmlinux.gz 
install: $(CONFIGURE) $(BOOTIMAGE)

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



clean-files := $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip)
 
clean-files += $(addprefix $(objtree)/, $(obj-boot) vmlinux.strip)

arch/powerpc/configs/ppc64_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ CONFIG_HVCS=m 
#

# CONFIG_WATCHDOG is not set

# CONFIG_RTC is not set

# CONFIG_GEN_RTC is not set

CONFIG_GEN_RTC=y

# CONFIG_DTLK is not set

# CONFIG_R3964 is not set

# CONFIG_APPLICOM is not set