1 files changed, 25 insertions, 24 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 9becc44d9d7a..9eb7eaa355ba 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -106,12 +106,14 @@ config ATH79
 config BCM47XX
         bool "Broadcom BCM47XX based boards"
         select ARCH_WANT_OPTIONAL_GPIOLIB
+        select BOOT_RAW
         select CEVT_R4K
         select CSRC_R4K
         select DMA_NONCOHERENT
         select FW_CFE
         select HW_HAS_PCI
         select IRQ_CPU
+        select NO_EXCEPT_FILL
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
         select SYS_HAS_EARLY_PRINTK
@@ -293,6 +295,7 @@ config MIPS_MALTA
         select BOOT_RAW
         select CEVT_R4K
         select CSRC_R4K
+        select CSRC_GIC
         select DMA_NONCOHERENT
         select GENERIC_ISA_DMA
         select HAVE_PCSPKR_PLATFORM
@@ -352,6 +355,7 @@ config MIPS_SEAD3
         select USB_ARCH_HAS_EHCI
         select USB_EHCI_BIG_ENDIAN_DESC
         select USB_EHCI_BIG_ENDIAN_MMIO
+        select USE_OF
         help
           This enables support for the MIPS Technologies SEAD3 evaluation
           board.
@@ -383,16 +387,6 @@ config NXP_STB225
         help
          Support for NXP Semiconductors STB225 Development Board.
 
-config PNX8550_JBS
-        bool "NXP PNX8550 based JBS board"
-        select PNX8550
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-
-config PNX8550_STB810
-        bool "NXP PNX8550 based STB810 board"
-        select PNX8550
-        select SYS_SUPPORTS_LITTLE_ENDIAN
-
 config PMC_MSP
         bool "PMC-Sierra MSP chipsets"
         depends on EXPERIMENTAL
@@ -433,6 +427,22 @@ config POWERTV
         help
           This enables support for the Cisco PowerTV Platform.
 
+config RALINK
+        bool "Ralink based machines"
+        select CEVT_R4K
+        select CSRC_R4K
+        select BOOT_RAW
+        select DMA_NONCOHERENT
+        select IRQ_CPU
+        select USE_OF
+        select SYS_HAS_CPU_MIPS32_R1
+        select SYS_HAS_CPU_MIPS32_R2
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_LITTLE_ENDIAN
+        select SYS_HAS_EARLY_PRINTK
+        select HAVE_MACH_CLKDEV
+        select CLKDEV_LOOKUP
+
 config SGI_IP22
         bool "SGI IP22 (Indy/Indigo2)"
         select FW_ARC
@@ -843,8 +853,9 @@ source "arch/mips/jazz/Kconfig"
 source "arch/mips/jz4740/Kconfig"
 source "arch/mips/lantiq/Kconfig"
 source "arch/mips/lasat/Kconfig"
-source "arch/mips/pmc-sierra/Kconfig"
+source "arch/mips/pmcs-msp71xx/Kconfig"
 source "arch/mips/powertv/Kconfig"
+source "arch/mips/ralink/Kconfig"
 source "arch/mips/sgi-ip27/Kconfig"
 source "arch/mips/sibyte/Kconfig"
 source "arch/mips/txx9/Kconfig"
@@ -925,6 +936,9 @@ config CSRC_POWERTV
 config CSRC_R4K
         bool
 
+config CSRC_GIC
+        bool
+
 config CSRC_SB1250
         bool
 
@@ -1111,19 +1125,6 @@ config SOC_PNX8335
         bool
         select SOC_PNX833X
 
-config PNX8550
-        bool
-        select SOC_PNX8550
-
-config SOC_PNX8550
-        bool
-        select DMA_NONCOHERENT
-        select HW_HAS_PCI
-        select SYS_HAS_CPU_MIPS32_R1
-        select SYS_HAS_EARLY_PRINTK
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select GENERIC_GPIO
-
 config SWAP_IO_SPACE
         bool