[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: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
parent
d6071f881f
commit
c8a55f3dda
|
@ -378,7 +378,6 @@ source "arch/powerpc/platforms/Kconfig"
|
||||||
source arch/powerpc/platforms/embedded6xx/Kconfig
|
source arch/powerpc/platforms/embedded6xx/Kconfig
|
||||||
source arch/powerpc/platforms/4xx/Kconfig
|
source arch/powerpc/platforms/4xx/Kconfig
|
||||||
source arch/powerpc/platforms/85xx/Kconfig
|
source arch/powerpc/platforms/85xx/Kconfig
|
||||||
source arch/powerpc/platforms/8xx/Kconfig
|
|
||||||
|
|
||||||
menu "Kernel options"
|
menu "Kernel options"
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,3 @@
|
||||||
menu "Platform support"
|
|
||||||
depends on PPC_8xx
|
|
||||||
|
|
||||||
config FADS
|
config FADS
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
@ -9,6 +6,7 @@ config CPM1
|
||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "8xx Machine Type"
|
prompt "8xx Machine Type"
|
||||||
|
depends on PPC_8xx
|
||||||
depends on 8xx
|
depends on 8xx
|
||||||
default MPC885ADS
|
default MPC885ADS
|
||||||
|
|
||||||
|
@ -69,8 +67,6 @@ menu "Freescale Ethernet driver platform-specific options"
|
||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
endmenu
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# MPC8xx Communication options
|
# MPC8xx Communication options
|
||||||
#
|
#
|
||||||
|
@ -98,7 +94,7 @@ config 8xx_CPU6
|
||||||
require workarounds for Linux (and most other OSes to work). If you
|
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
|
get a BUG() very early in boot, this might fix the problem. For
|
||||||
more details read the document entitled "MPC860 Family Device Errata
|
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.
|
performance hit.
|
||||||
|
|
||||||
If in doubt, say N here.
|
If in doubt, say N here.
|
||||||
|
@ -135,4 +131,3 @@ config UCODE_PATCH
|
||||||
depends on !NO_UCODE_PATCH
|
depends on !NO_UCODE_PATCH
|
||||||
|
|
||||||
endmenu
|
endmenu
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
menu "Platform support"
|
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
|
choice
|
||||||
prompt "Machine type"
|
prompt "Machine type"
|
||||||
|
@ -45,6 +46,7 @@ source "arch/powerpc/platforms/pasemi/Kconfig"
|
||||||
source arch/powerpc/platforms/celleb/Kconfig
|
source arch/powerpc/platforms/celleb/Kconfig
|
||||||
source arch/powerpc/platforms/ps3/Kconfig
|
source arch/powerpc/platforms/ps3/Kconfig
|
||||||
source arch/powerpc/platforms/cell/Kconfig
|
source arch/powerpc/platforms/cell/Kconfig
|
||||||
|
source "arch/powerpc/platforms/8xx/Kconfig"
|
||||||
source "arch/powerpc/platforms/82xx/Kconfig"
|
source "arch/powerpc/platforms/82xx/Kconfig"
|
||||||
source "arch/powerpc/platforms/83xx/Kconfig"
|
source "arch/powerpc/platforms/83xx/Kconfig"
|
||||||
source "arch/powerpc/platforms/86xx/Kconfig"
|
source "arch/powerpc/platforms/86xx/Kconfig"
|
||||||
|
|
Loading…
Reference in New Issue