diff options
| author | Manuel Lauss <manuel.lauss@gmail.com> | 2012-09-14 14:47:10 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-10-11 11:11:20 +0200 |
| commit | 24e8c1a611a706f51d4d9dc39b2c9977e25a54c4 (patch) | |
| tree | 91696346623fb7693b290730d65d2208fa47b88a /arch/mips/alchemy/Kconfig | |
| parent | bd8510df881f63a9e7768824cf0e33c4702dcde1 (diff) | |
MIPS: Alchemy: merge PB1550 support into DB1550 code
The PB1550 is more or less a DB1550 without the PCI IDE controller,
a more complicated (read: configurable) Flash setup and some other
minor changes. Like the DB1550 it can be automatically detected by
reading the CPLD ID register bits.
This patch adds PB1550 detection and setup to the DB1550 code.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/4337/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/alchemy/Kconfig')
| -rw-r--r-- | arch/mips/alchemy/Kconfig | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig index b4929b94cd7c..6eb66a90a83a 100644 --- a/arch/mips/alchemy/Kconfig +++ b/arch/mips/alchemy/Kconfig @@ -37,7 +37,7 @@ config MIPS_DB1000 select SYS_HAS_EARLY_PRINTK config MIPS_DB1235 - bool "Alchemy DB1200/PB1200/DB1300/DB1550 boards" + bool "Alchemy DB1200/PB1200/DB1300/DB1550/PB1550 boards" select ARCH_REQUIRE_GPIOLIB select HW_HAS_PCI select DMA_COHERENT @@ -62,15 +62,6 @@ config MIPS_PB1500 select SYS_SUPPORTS_LITTLE_ENDIAN select SYS_HAS_EARLY_PRINTK -config MIPS_PB1550 - bool "Alchemy PB1550 board" - select ALCHEMY_GPIOINT_AU1000 - select DMA_NONCOHERENT - select HW_HAS_PCI - select MIPS_DISABLE_OBSOLETE_IDE - select SYS_SUPPORTS_LITTLE_ENDIAN - select SYS_HAS_EARLY_PRINTK - config MIPS_XXS1500 bool "MyCable XXS1500 board" select DMA_NONCOHERENT |