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

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

[POWERPC] Convert 8xx platform to unified platform Kconfig 



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

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

arch/powerpc/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -378,7 +378,6 @@ source "arch/powerpc/platforms/Kconfig" 
source arch/powerpc/platforms/embedded6xx/Kconfig

source arch/powerpc/platforms/4xx/Kconfig

source arch/powerpc/platforms/85xx/Kconfig

source arch/powerpc/platforms/8xx/Kconfig



menu "Kernel options"

arch/powerpc/platforms/8xx/Kconfig

+31 −36
Original line number Diff line number Diff line 
menu "Platform support"

        depends on PPC_8xx



config FADS

	bool
@@ -9,6 +6,7 @@ config CPM1 


choice

	prompt "8xx Machine Type"

	depends on PPC_8xx

	depends on 8xx

	default MPC885ADS
@@ -69,8 +67,6 @@ menu "Freescale Ethernet driver platform-specific options" 


endmenu



endmenu



#

# MPC8xx Communication options

#
@@ -98,7 +94,7 @@ config 8xx_CPU6 
	  require workarounds for Linux (and most other OSes to work).  If you

	  get a BUG() very early in boot, this might fix the problem.  For

	  more details read the document entitled "MPC860 Family Device Errata

	  Reference" on Motorola's website.  This option also incurs a

	  Reference" on Freescale's website.  This option also incurs a

	  performance hit.



	  If in doubt, say N here.
@@ -135,4 +131,3 @@ config UCODE_PATCH 
	depends on !NO_UCODE_PATCH



endmenu

arch/powerpc/platforms/Kconfig

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

	depends on PPC64 || CLASSIC32 || PPC_82xx || PPC_83xx || PPC_86xx

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

			PPC_86xx



choice

	prompt "Machine type"
@@ -45,6 +46,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/8xx/Kconfig"

source "arch/powerpc/platforms/82xx/Kconfig"

source "arch/powerpc/platforms/83xx/Kconfig"

source "arch/powerpc/platforms/86xx/Kconfig"