MIPS: Alchemy: Unify Devboard support.

This patch merges support for all DB1xxx and PB1xxx
boards into a single image, along with a new single defconfig
for them.

Run-tested on DB1300 and DB1500.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Cc: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/6577/
Patchwork: https://patchwork.linux-mips.org/patch/6659/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 8 insertions, 11 deletions

diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig
index 41386723f9fa..b9628983d620 100644
--- a/arch/mips/alchemy/Kconfig
+++ b/arch/mips/alchemy/Kconfig
@@ -16,7 +16,7 @@ config ALCHEMY_GPIO_INDIRECT
 choice
         prompt "Machine type"
         depends on MIPS_ALCHEMY
-        default MIPS_DB1000
+        default MIPS_DB1XXX
 
 config MIPS_MTX1
         bool "4G Systems MTX-1 board"
@@ -25,20 +25,17 @@ config MIPS_MTX1
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
 
-config MIPS_DB1000
-        bool "Alchemy DB1000/DB1500/DB1100 PB1500/1100 boards"
-        select ALCHEMY_GPIOINT_AU1000
-        select HW_HAS_PCI
-        select SYS_SUPPORTS_BIG_ENDIAN
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-        select SYS_HAS_EARLY_PRINTK
-
-config MIPS_DB1235
-        bool "Alchemy DB1200/PB1200/DB1300/DB1550/PB1550 boards"
+config MIPS_DB1XXX
+        bool "Alchemy DB1XXX / PB1XXX boards"
         select ARCH_REQUIRE_GPIOLIB
         select HW_HAS_PCI
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
+        help
+          Select this option if you have one of the following Alchemy
+          development boards:  DB1000 DB1500 DB1100 DB1550 DB1200 DB1300
+                               PB1500 PB1100 PB1550 PB1200
+          Board type is autodetected during boot.
 
 config MIPS_XXS1500
         bool "MyCable XXS1500 board"