1 files changed, 11 insertions, 21 deletions

diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index 74779b92ff36..7e76ddbd5821 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -1,7 +1,14 @@
-choice
-        prompt "Machine Type"
+menuconfig MPC85xx
+        bool "Machine Type"
         depends on PPC_85xx
-        default MPC8540_ADS
+        select PPC_UDBG_16550
+        select PPC_INDIRECT_PCI if PCI
+        select MPIC
+        select FSL_PCI if PCI
+        select SERIAL_8250_SHARE_IRQ if SERIAL_8250
+        default y
+
+if MPC85xx
 
 config MPC8540_ADS
         bool "Freescale MPC8540 ADS"
@@ -96,24 +103,7 @@ config SBC8560
         help
           This option enables support for the Wind River SBC8560 board
 
-endchoice
+endif # MPC85xx
 
 config TQM85xx
         bool
-        select MPC85xx
-
-config MPC8540
-        bool
-        select PPC_UDBG_16550
-        select PPC_INDIRECT_PCI
-        default y if MPC8540_ADS || MPC85xx_CDS || SBC8548
-
-config MPC85xx
-        bool
-        select PPC_UDBG_16550
-        select PPC_INDIRECT_PCI if PCI
-        select MPIC
-        select FSL_PCI if PCI
-        select SERIAL_8250_SHARE_IRQ if SERIAL_8250
-        default y if MPC8540_ADS || MPC85xx_CDS || MPC8560_ADS \
-                || MPC85xx_MDS || MPC85xx_DS || STX_GP3 || SBC8560 || SBC8548