[POWERPC] Move embedded6xx into multiplatform
The various embedded 6xx systems can easily coexist in one kernel together with the other 6xx based systems, so there is no strict reason to keep them separate. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
a7fb7ea76e
commit
a35e370cfd
|
@ -12,10 +12,6 @@ config PPC_MULTIPLATFORM
|
||||||
RS/6000 machine, an Apple machine, or a PReP, CHRP,
|
RS/6000 machine, an Apple machine, or a PReP, CHRP,
|
||||||
Maple or Cell-based machine.
|
Maple or Cell-based machine.
|
||||||
|
|
||||||
config EMBEDDED6xx
|
|
||||||
bool "Embedded 6xx/7xx/7xxx-based board"
|
|
||||||
depends on PPC32 && (BROKEN||BROKEN_ON_SMP)
|
|
||||||
|
|
||||||
config PPC_82xx
|
config PPC_82xx
|
||||||
bool "Freescale 82xx"
|
bool "Freescale 82xx"
|
||||||
depends on 6xx
|
depends on 6xx
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
choice
|
config EMBEDDED6xx
|
||||||
prompt "Machine Type"
|
bool "Embedded 6xx/7xx/7xxx-based boards"
|
||||||
depends on EMBEDDED6xx
|
depends on PPC32 && BROKEN_ON_SMP && PPC_MULTIPLATFORM
|
||||||
|
|
||||||
config LINKSTATION
|
config LINKSTATION
|
||||||
bool "Linkstation / Kurobox(HG) from Buffalo"
|
bool "Linkstation / Kurobox(HG) from Buffalo"
|
||||||
|
depends on EMBEDDED6xx
|
||||||
select MPIC
|
select MPIC
|
||||||
select FSL_SOC
|
select FSL_SOC
|
||||||
select PPC_UDBG_16550 if SERIAL_8250
|
select PPC_UDBG_16550 if SERIAL_8250
|
||||||
|
@ -17,6 +18,7 @@ config LINKSTATION
|
||||||
|
|
||||||
config MPC7448HPC2
|
config MPC7448HPC2
|
||||||
bool "Freescale MPC7448HPC2(Taiga)"
|
bool "Freescale MPC7448HPC2(Taiga)"
|
||||||
|
depends on EMBEDDED6xx
|
||||||
select TSI108_BRIDGE
|
select TSI108_BRIDGE
|
||||||
select DEFAULT_UIMAGE
|
select DEFAULT_UIMAGE
|
||||||
select PPC_UDBG_16550
|
select PPC_UDBG_16550
|
||||||
|
@ -26,6 +28,7 @@ config MPC7448HPC2
|
||||||
|
|
||||||
config PPC_HOLLY
|
config PPC_HOLLY
|
||||||
bool "PPC750GX/CL with TSI10x bridge (Hickory/Holly)"
|
bool "PPC750GX/CL with TSI10x bridge (Hickory/Holly)"
|
||||||
|
depends on EMBEDDED6xx
|
||||||
select TSI108_BRIDGE
|
select TSI108_BRIDGE
|
||||||
select PPC_UDBG_16550
|
select PPC_UDBG_16550
|
||||||
select WANT_DEVICE_TREE
|
select WANT_DEVICE_TREE
|
||||||
|
@ -35,12 +38,12 @@ config PPC_HOLLY
|
||||||
|
|
||||||
config PPC_PRPMC2800
|
config PPC_PRPMC2800
|
||||||
bool "Motorola-PrPMC2800"
|
bool "Motorola-PrPMC2800"
|
||||||
|
depends on EMBEDDED6xx
|
||||||
select MV64X60
|
select MV64X60
|
||||||
select NOT_COHERENT_CACHE
|
select NOT_COHERENT_CACHE
|
||||||
select WANT_DEVICE_TREE
|
select WANT_DEVICE_TREE
|
||||||
help
|
help
|
||||||
This option enables support for the Motorola PrPMC2800 board
|
This option enables support for the Motorola PrPMC2800 board
|
||||||
endchoice
|
|
||||||
|
|
||||||
config TSI108_BRIDGE
|
config TSI108_BRIDGE
|
||||||
bool
|
bool
|
||||||
|
|
Loading…
Reference in New Issue