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

Commit 445c9b55 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'kconfig' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.22

parents 390cbb56 98750261

arch/powerpc/Kconfig

+10 −37
Original line number Diff line number Diff line
@@ -192,7 +192,6 @@ config 44x 
	bool "AMCC 44x"

	select PPC_DCR_NATIVE





config E200

	bool "Freescale e200"
@@ -375,14 +374,6 @@ source "init/Kconfig" 


source "arch/powerpc/platforms/Kconfig"



source arch/powerpc/platforms/embedded6xx/Kconfig

source arch/powerpc/platforms/4xx/Kconfig

source arch/powerpc/platforms/82xx/Kconfig

source arch/powerpc/platforms/83xx/Kconfig

source arch/powerpc/platforms/85xx/Kconfig

source arch/powerpc/platforms/86xx/Kconfig

source arch/powerpc/platforms/8xx/Kconfig



menu "Kernel options"



config HIGHMEM
@@ -464,15 +455,6 @@ config CRASH_DUMP 


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



config EMBEDDEDBOOT

	bool

	depends on 8xx || 8260

	default y



config PC_KEYBOARD

	bool "PC PS/2 style Keyboard"

	depends on 4xx || CPM2



config PPCBUG_NVRAM

	bool "Enable reading PPCBUG NVRAM during boot" if PPLUS || LOPEC

	default y if PPC_PREP
@@ -486,7 +468,6 @@ config IRQ_ALL_CPUS 
	  CPU.  Generally saying Y is safe, although some problems have been

	  reported with SMP Power Macintoshes with this option enabled.





config NUMA

	bool "NUMA support"

	depends on PPC64
@@ -619,24 +600,17 @@ config GENERIC_ISA_DMA 
	depends on PPC64 || POWER4 || 6xx && !CPM2

	default y



config MPIC

	bool

	default n



config MPIC_WEIRD

	bool

	default n



config PPC_I8259

	bool

	default n



config PPC_INDIRECT_PCI

	bool

	depends on PCI

	default y if 40x || 44x

	default n



config PPC_INDIRECT_PCI_BE

	bool

	depends PPC_INDIRECT_PCI

	default n



config EISA

	bool
@@ -857,7 +831,6 @@ source "fs/Kconfig" 


source "arch/powerpc/sysdev/qe_lib/Kconfig"





source "lib/Kconfig"



menu "Instrumentation Support"

arch/powerpc/platforms/82xx/Kconfig

+15 −35
Original line number Diff line number Diff line 
menu "Platform support"

       depends on PPC_82xx



choice

	prompt "Machine Type"

	depends on PPC_82xx

	default MPC82xx_ADS



config MPC82xx_ADS
@@ -11,7 +9,6 @@ config MPC82xx_ADS 
	select PQ2ADS

	select 8272

	select 8260

       select CPM2

	select FSL_SOC

	help

	This option enables support for the MPC8272 ADS board
@@ -20,37 +17,20 @@ endchoice 


config PQ2ADS

	bool

	depends on ADS8272

	default y



config ADS8272

	bool

	default n



config 8260

	bool "CPM2 Support" if WILLOW

	bool

	depends on 6xx

	default y if PQ2FADS

	select CPM2

	help

	  The MPC8260 is a typical embedded CPU made by Motorola.  Selecting

	  The MPC8260 is a typical embedded CPU made by Freescale.  Selecting

	  this option means that you wish to build a kernel for a machine with

	  an 8260 class CPU.



config 8272

	bool

	depends on 6xx

	default y if ADS8272

	select 8260

	help

	  The MPC8272 CPM has a different internal dpram setup than other CPM2

	  devices
 


config CPM2

	bool

	depends on 8260 || MPC8560 || MPC8555

	default y

	help

	  The CPM2 (Communications Processor Module) is a coprocessor on

	  embedded CPUs made by Motorola.  Selecting this option means that

	  you wish to build a kernel for a machine with a CPM2 coprocessor

	  on it (826x, 827x, 8560).

endmenu

arch/powerpc/platforms/83xx/Kconfig

+1 −5
Original line number Diff line number Diff line 
menu "Platform support"

	depends on PPC_83xx



choice

	prompt "Machine Type"

	depends on PPC_83xx

	default MPC834x_MDS



config MPC8313_RDB
@@ -77,5 +75,3 @@ config PPC_MPC836x 
	select PPC_UDBG_16550

	select PPC_INDIRECT_PCI

	default y if MPC836x_MDS
 


endmenu

arch/powerpc/platforms/85xx/Kconfig

+4 −25
Original line number Diff line number Diff line 
menu "Platform support"

	depends on PPC_85xx



choice

	prompt "Machine Type"

	depends on PPC_85xx

	default MPC8540_ADS



config MPC8540_ADS
@@ -46,34 +44,15 @@ config MPC8540 


config MPC8560

	bool

	select PPC_INDIRECT_PCI

	select CPM2

	default y if MPC8560_ADS



config MPC85xx

	bool

	select PPC_UDBG_16550

	select PPC_INDIRECT_PCI

	select PPC_INDIRECT_PCI_BE

	select MPIC

	select SERIAL_8250_SHARE_IRQ if SERIAL_8250

	default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \

		|| MPC85xx_MDS || MPC8544_DS
 


config PPC_INDIRECT_PCI_BE

	bool

	depends on PPC_85xx

	default y



config MPIC

	bool

	default y



config CPM2

	bool

	depends on MPC8560

	default y

	help

	  The CPM2 (Communications Processor Module) is a coprocessor on

	  embedded CPUs made by Motorola.  Selecting this option means that

	  you wish to build a kernel for a machine with a CPM2 coprocessor

	  on it.



endmenu

arch/powerpc/platforms/86xx/Kconfig

+3 −15
Original line number Diff line number Diff line 
menu "Platform Support"

	depends on PPC_86xx



choice

	prompt "Machine Type"

	depends on PPC_86xx

	default MPC8641_HPCN



config MPC8641_HPCN
@@ -14,20 +12,10 @@ config MPC8641_HPCN 


endchoice





config MPC8641

	bool

	select PPC_INDIRECT_PCI

	select PPC_INDIRECT_PCI_BE

	select PPC_UDBG_16550

	select MPIC

	default y if MPC8641_HPCN
 


config MPIC

	bool

	default y



config PPC_INDIRECT_PCI_BE

	bool

	depends on PPC_86xx

	default y



endmenu