1 files changed, 37 insertions, 1 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index b3e10fdd389..75042901853 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -209,6 +209,7 @@ config MACH_JZ4740
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
+        select SYS_SUPPORTS_ZBOOT_UART16550
         select DMA_NONCOHERENT
         select IRQ_CPU
         select GENERIC_GPIO
@@ -264,6 +265,16 @@ config MACH_LOONGSON
           Chinese Academy of Sciences (CAS) in the People's Republic
           of China. The chief architect is Professor Weiwu Hu.
 
+config MACH_LOONGSON1
+        bool "Loongson 1 family of machines"
+        select SYS_SUPPORTS_ZBOOT
+        help
+          This enables support for the Loongson 1 based machines.
+
+          Loongson 1 is a family of 32-bit MIPS-compatible SoCs developed by
+          the ICT (Institute of Computing Technology) and the Chinese Academy
+          of Sciences.
+
 config MIPS_MALTA
         bool "MIPS Malta board"
         select ARCH_MAY_HAVE_PC_FDC
@@ -787,6 +798,8 @@ config NLM_XLR_BOARD
         select ZONE_DMA if 64BIT
         select SYNC_R4K
         select SYS_HAS_EARLY_PRINTK
+        select USB_ARCH_HAS_OHCI if USB_SUPPORT
+        select USB_ARCH_HAS_EHCI if USB_SUPPORT
         help
           Support for systems based on Netlogic XLR and XLS processors.
           Say Y here if you have a XLR or XLS based board.
@@ -799,7 +812,6 @@ config NLM_XLP_BOARD
         select SYS_HAS_CPU_XLP
         select SYS_SUPPORTS_SMP
         select HW_HAS_PCI
-        select SWAP_IO_SPACE
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
         select 64BIT_PHYS_ADDR
@@ -836,6 +848,7 @@ source "arch/mips/txx9/Kconfig"
 source "arch/mips/vr41xx/Kconfig"
 source "arch/mips/cavium-octeon/Kconfig"
 source "arch/mips/loongson/Kconfig"
+source "arch/mips/loongson1/Kconfig"
 source "arch/mips/netlogic/Kconfig"
 
 endmenu
@@ -1217,6 +1230,14 @@ config CPU_LOONGSON2F
           have a similar programming interface with FPGA northbridge used in
           Loongson2E.
 
+config CPU_LOONGSON1B
+        bool "Loongson 1B"
+        depends on SYS_HAS_CPU_LOONGSON1B
+        select CPU_LOONGSON1
+        help
+          The Loongson 1B is a 32-bit SoC, which implements the MIPS32
+          release 2 instruction set.
+
 config CPU_MIPS32_R1
         bool "MIPS32 Release 1"
         depends on SYS_HAS_CPU_MIPS32_R1
@@ -1432,6 +1453,8 @@ config CPU_CAVIUM_OCTEON
         select WEAK_ORDERING
         select CPU_SUPPORTS_HIGHMEM
         select CPU_SUPPORTS_HUGEPAGES
+        select LIBFDT
+        select USE_OF
         help
           The Cavium Octeon processor is a highly integrated chip containing
           many ethernet hardware widgets for networking tasks. The processor
@@ -1544,6 +1567,14 @@ config CPU_LOONGSON2
         select CPU_SUPPORTS_64BIT_KERNEL
         select CPU_SUPPORTS_HIGHMEM
 
+config CPU_LOONGSON1
+        bool
+        select CPU_MIPS32
+        select CPU_MIPSR2
+        select CPU_HAS_PREFETCH
+        select CPU_SUPPORTS_32BIT_KERNEL
+        select CPU_SUPPORTS_HIGHMEM
+
 config CPU_BMIPS
         bool
         select CPU_MIPS32
@@ -1562,6 +1593,9 @@ config SYS_HAS_CPU_LOONGSON2F
         select CPU_SUPPORTS_ADDRWINCFG if 64BIT
         select CPU_SUPPORTS_UNCACHED_ACCELERATED
 
+config SYS_HAS_CPU_LOONGSON1B
+        bool
+
 config SYS_HAS_CPU_MIPS32_R1
         bool
 
@@ -2366,6 +2400,8 @@ config PCI_DOMAINS
 
 source "drivers/pci/Kconfig"
 
+source "drivers/pci/pcie/Kconfig"
+
 #
 # ISA support is now enabled via select.  Too many systems still have the one
 # or other ISA chip on the board that users don't know about so don't expect