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

Commit 98750261 authored by Kumar Gala's avatar Kumar Gala
Browse files

[POWERPC] Miscellaneous arch/powerpc Kconfig and platform/Kconfig cleanup 



* Cleaned up some whitespace in arch/powerpc/Kconfig
* Moved sourcing of platforms/embedded6xx/Kconfig into platform/Kconfig
* Moved sourcing of platforms/4xx/Kconfig into platform/Kconfig and disabled it
* Removed EMBEDDEDBOOT since its not supported in arch/powerpc
* Removed PC_KEYBOARD since its not used anywhere
* Moved a few CONFIG options around in platform/Kconfig
* Moved interrupt controllers into platform/Kconfig out of bus section

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent db947808

arch/powerpc/Kconfig

+5 −32
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,9 +374,6 @@ source "init/Kconfig" 


source "arch/powerpc/platforms/Kconfig"



source arch/powerpc/platforms/embedded6xx/Kconfig

source arch/powerpc/platforms/4xx/Kconfig



menu "Kernel options"



config HIGHMEM
@@ -459,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
@@ -481,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
@@ -614,18 +600,6 @@ 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
@@ -857,7 +831,6 @@ source "fs/Kconfig" 


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





source "lib/Kconfig"



menu "Instrumentation Support"

arch/powerpc/platforms/Kconfig

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

	depends on PPC64 || CLASSIC32 || PPC_8xx || PPC_82xx || PPC_83xx || \

			PPC_85xx || PPC_86xx



choice

	prompt "Machine type"
@@ -27,14 +25,6 @@ config APUS 
	  <http://linux-apus.sourceforge.net/>.

endchoice



config QUICC_ENGINE

	bool

	help

	  The QUICC Engine (QE) is a new generation of communications

	  coprocessors on Freescale embedded CPUs (akin to CPM in older chips).

	  Selecting this option means that you wish to build a kernel

	  for a machine with a QE coprocessor.



source "arch/powerpc/platforms/pseries/Kconfig"

source "arch/powerpc/platforms/iseries/Kconfig"

source "arch/powerpc/platforms/chrp/Kconfig"
@@ -43,14 +33,16 @@ source "arch/powerpc/platforms/powermac/Kconfig" 
source "arch/powerpc/platforms/prep/Kconfig"

source "arch/powerpc/platforms/maple/Kconfig"

source "arch/powerpc/platforms/pasemi/Kconfig"

source arch/powerpc/platforms/celleb/Kconfig

source arch/powerpc/platforms/ps3/Kconfig

source arch/powerpc/platforms/cell/Kconfig

source "arch/powerpc/platforms/celleb/Kconfig"

source "arch/powerpc/platforms/ps3/Kconfig"

source "arch/powerpc/platforms/cell/Kconfig"

source "arch/powerpc/platforms/8xx/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/embedded6xx/Kconfig"

#source "arch/powerpc/platforms/4xx/Kconfig



config PPC_NATIVE

	bool
@@ -75,6 +67,18 @@ config XICS 
	bool

	default y



config MPIC

	bool

	default n



config MPIC_WEIRD

	bool

	default n



config PPC_I8259

	bool

	default n



config U3_DART

	bool

	depends on PPC_MULTIPLATFORM && PPC64
@@ -225,6 +229,14 @@ config TAU_AVERAGE 


	  If in doubt, say N here.



config QUICC_ENGINE

	bool

	help

	  The QUICC Engine (QE) is a new generation of communications

	  coprocessors on Freescale embedded CPUs (akin to CPM in older chips).

	  Selecting this option means that you wish to build a kernel

	  for a machine with a QE coprocessor.



config CPM2

	bool

	default n