Merge tag 'mips_4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips

[sfrench/cifs-2.6.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ab98569994f0f61cf61d62b6b8c2757f9533c5e3..449397c60b56eae1fdaef29423588c97ee8f0d09 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -7,8 +7,6 @@ config MIPS
        select ARCH_DISCARD_MEMBLOCK
        select ARCH_HAS_ELF_RANDOMIZE
        select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
-       select ARCH_MIGHT_HAVE_PC_PARPORT
-       select ARCH_MIGHT_HAVE_PC_SERIO
        select ARCH_SUPPORTS_UPROBES
        select ARCH_USE_BUILTIN_BSWAP
        select ARCH_USE_CMPXCHG_LOCKREF if 64BIT
@@ -119,12 +117,12 @@ config MIPS_GENERIC
        select SYS_SUPPORTS_MULTITHREADING
        select SYS_SUPPORTS_RELOCATABLE
        select SYS_SUPPORTS_SMARTMIPS
-       select USB_EHCI_BIG_ENDIAN_DESC if BIG_ENDIAN
-       select USB_EHCI_BIG_ENDIAN_MMIO if BIG_ENDIAN
-       select USB_OHCI_BIG_ENDIAN_DESC if BIG_ENDIAN
-       select USB_OHCI_BIG_ENDIAN_MMIO if BIG_ENDIAN
-       select USB_UHCI_BIG_ENDIAN_DESC if BIG_ENDIAN
-       select USB_UHCI_BIG_ENDIAN_MMIO if BIG_ENDIAN
+       select USB_EHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
+       select USB_EHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
+       select USB_OHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
+       select USB_OHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
+       select USB_UHCI_BIG_ENDIAN_DESC if CPU_BIG_ENDIAN
+       select USB_UHCI_BIG_ENDIAN_MMIO if CPU_BIG_ENDIAN
        select USE_OF
        help
          Select this to build a kernel which aims to support multiple boards,
@@ -253,6 +251,7 @@ config BCM47XX
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SYS_SUPPORTS_MIPS16
+       select SYS_SUPPORTS_ZBOOT
        select SYS_HAS_EARLY_PRINTK
        select USE_GENERIC_EARLY_PRINTK_8250
        select GPIOLIB
@@ -341,6 +340,8 @@ config MACH_DECSTATION
 
 config MACH_JAZZ
        bool "Jazz family of machines"
+       select ARCH_MIGHT_HAVE_PC_PARPORT
+       select ARCH_MIGHT_HAVE_PC_SERIO
        select FW_ARC
        select FW_ARC32
        select ARCH_MAY_HAVE_PC_FDC
@@ -476,6 +477,8 @@ config MACH_PISTACHIO
 config MIPS_MALTA
        bool "MIPS Malta board"
        select ARCH_MAY_HAVE_PC_FDC
+       select ARCH_MIGHT_HAVE_PC_PARPORT
+       select ARCH_MIGHT_HAVE_PC_SERIO
        select BOOT_ELF32
        select BOOT_RAW
        select BUILTIN_DTB
@@ -613,6 +616,7 @@ config SGI_IP22
        bool "SGI IP22 (Indy/Indigo2)"
        select FW_ARC
        select FW_ARC32
+       select ARCH_MIGHT_HAVE_PC_SERIO
        select BOOT_ELF32
        select CEVT_R4K
        select CSRC_R4K
@@ -675,6 +679,7 @@ config SGI_IP28
        bool "SGI IP28 (Indigo2 R10k)"
        select FW_ARC
        select FW_ARC64
+       select ARCH_MIGHT_HAVE_PC_SERIO
        select BOOT_ELF64
        select CEVT_R4K
        select CSRC_R4K
@@ -824,6 +829,8 @@ config SNI_RM
        select FW_ARC32 if CPU_LITTLE_ENDIAN
        select FW_SNIPROM if CPU_BIG_ENDIAN
        select ARCH_MAY_HAVE_PC_FDC
+       select ARCH_MIGHT_HAVE_PC_PARPORT
+       select ARCH_MIGHT_HAVE_PC_SERIO
        select BOOT_ELF32
        select CEVT_R4K
        select CSRC_R4K