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

Commit a35e370c authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Paul Mackerras
Browse files

[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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent a7fb7ea7

arch/powerpc/platforms/Kconfig

+0 −4
Original line number Original line Diff line number Diff line
@@ -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

arch/powerpc/platforms/embedded6xx/Kconfig

+7 −4
Original line number Original line Diff line number Diff line 
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