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

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

[POWERPC] Convert 82xx platform to unified platform Kconfig



Moved 82xx platform Kconfig over to being sourced by the unified
arch/powerpc/platforms/Kconfig.  Also, cleaned up whitespace issues in 82xx
Kconfig.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent b5a48346
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -377,7 +377,6 @@ 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/85xx/Kconfig
source arch/powerpc/platforms/8xx/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
+11 −1
Original line number Diff line number Diff line
menu "Platform support"
	depends on PPC64 || CLASSIC32 || PPC_83xx || PPC_86xx
	depends on PPC64 || CLASSIC32 || PPC_82xx || PPC_83xx || PPC_86xx

choice
	prompt "Machine type"
@@ -45,6 +45,7 @@ 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/82xx/Kconfig"
source "arch/powerpc/platforms/83xx/Kconfig"
source "arch/powerpc/platforms/86xx/Kconfig"

@@ -221,4 +222,13 @@ config TAU_AVERAGE

	  If in doubt, say N here.

config CPM2
	bool
	default n
	help
	  The CPM2 (Communications Processor Module) is a coprocessor on
	  embedded CPUs made by Freescale.  Selecting this option means that
	  you wish to build a kernel for a machine with a CPM2 coprocessor
	  on it (826x, 827x, 8560).

endmenu