1 files changed, 112 insertions, 49 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index fd7620f025fa..7e6fd1cbd3f8 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -5,9 +5,12 @@ config MIPS
         select HAVE_IDE
         select HAVE_OPROFILE
         select HAVE_ARCH_KGDB
-        # Horrible source of confusion.  Die, die, die ...
-        select EMBEDDED
-        select RTC_LIB if !LEMOTE_FULOONG2E
+        select HAVE_FUNCTION_TRACER
+        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
+        select HAVE_DYNAMIC_FTRACE
+        select HAVE_FTRACE_MCOUNT_RECORD
+        select HAVE_FUNCTION_GRAPH_TRACER
+        select RTC_LIB if !MACH_LOONGSON
 
 mainmenu "Linux/MIPS Kernel Configuration"
 
@@ -22,6 +25,7 @@ choice
 
 config MACH_ALCHEMY
         bool "Alchemy processor based machines"
+        select SYS_SUPPORTS_ZBOOT
 
 config AR7
         bool "Texas Instruments AR7"
@@ -36,32 +40,16 @@ config AR7
         select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
-        select GENERIC_GPIO
+        select SYS_SUPPORTS_ZBOOT_UART16550
+        select ARCH_REQUIRE_GPIOLIB
         select GCD
         select VLYNQ
         help
           Support for the Texas Instruments AR7 System-on-a-Chip
           family: TNETD7100, 7200 and 7300.
 
-config BASLER_EXCITE
-        bool "Basler eXcite smart camera"
-        select CEVT_R4K
-        select CSRC_R4K
-        select DMA_COHERENT
-        select HW_HAS_PCI
-        select IRQ_CPU
-        select IRQ_CPU_RM7K
-        select IRQ_CPU_RM9K
-        select MIPS_RM9122
-        select SYS_HAS_CPU_RM9000
-        select SYS_SUPPORTS_32BIT_KERNEL
-        select SYS_SUPPORTS_BIG_ENDIAN
-        help
-          The eXcite is a smart camera platform manufactured by
-          Basler Vision Technologies AG.
-
 config BCM47XX
-        bool "BCM47XX based boards"
+        bool "Broadcom BCM47XX based boards"
         select CEVT_R4K
         select CSRC_R4K
         select DMA_NONCOHERENT
@@ -192,6 +180,7 @@ config LASAT
 
 config MACH_LOONGSON
         bool "Loongson family of machines"
+        select SYS_SUPPORTS_ZBOOT
         help
           This enables the support of Loongson family of machines.
 
@@ -233,6 +222,7 @@ config MIPS_MALTA
         select SYS_SUPPORTS_MIPS_CMP
         select SYS_SUPPORTS_MULTITHREADING
         select SYS_SUPPORTS_SMARTMIPS
+        select SYS_SUPPORTS_ZBOOT
         help
           This enables support for the MIPS Technologies Malta evaluation
           board.
@@ -334,6 +324,24 @@ config PMC_YOSEMITE
           Yosemite is an evaluation board for the RM9000x2 processor
           manufactured by PMC-Sierra.
 
+config POWERTV
+        bool "Cisco PowerTV"
+        select BOOT_ELF32
+        select CEVT_R4K
+        select CPU_MIPSR2_IRQ_VI
+        select CPU_MIPSR2_IRQ_EI
+        select CSRC_POWERTV
+        select DMA_NONCOHERENT
+        select HW_HAS_PCI
+        select SYS_HAS_EARLY_PRINTK
+        select SYS_HAS_CPU_MIPS32_R2
+        select SYS_SUPPORTS_32BIT_KERNEL
+        select SYS_SUPPORTS_BIG_ENDIAN
+        select SYS_SUPPORTS_HIGHMEM
+        select USB_OHCI_LITTLE_ENDIAN
+        help
+          This enables support for the Cisco PowerTV Platform.
+
 config SGI_IP22
         bool "SGI IP22 (Indy/Indigo2)"
         select ARC
@@ -501,6 +509,7 @@ config SIBYTE_SWARM
         bool "Sibyte BCM91250A-SWARM"
         select BOOT_ELF32
         select DMA_COHERENT
+        select HAVE_PATA_PLATFORM
         select NR_CPUS_DEFAULT_2
         select SIBYTE_SB1250
         select SWAP_IO_SPACE
@@ -515,6 +524,7 @@ config SIBYTE_LITTLESUR
         depends on EXPERIMENTAL
         select BOOT_ELF32
         select DMA_COHERENT
+        select HAVE_PATA_PLATFORM
         select NR_CPUS_DEFAULT_2
         select SIBYTE_SB1250
         select SWAP_IO_SPACE
@@ -674,11 +684,11 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
 endchoice
 
 source "arch/mips/alchemy/Kconfig"
-source "arch/mips/basler/excite/Kconfig"
 source "arch/mips/bcm63xx/Kconfig"
 source "arch/mips/jazz/Kconfig"
 source "arch/mips/lasat/Kconfig"
 source "arch/mips/pmc-sierra/Kconfig"
+source "arch/mips/powertv/Kconfig"
 source "arch/mips/sgi-ip27/Kconfig"
 source "arch/mips/sibyte/Kconfig"
 source "arch/mips/txx9/Kconfig"
@@ -778,6 +788,9 @@ config CSRC_BCM1480
 config CSRC_IOASIC
         bool
 
+config CSRC_POWERTV
+        bool
+
 config CSRC_R4K_LIB
         bool
 
@@ -801,25 +814,11 @@ config DMA_COHERENT
 
 config DMA_NONCOHERENT
         bool
-        select DMA_NEED_PCI_MAP_STATE
+        select NEED_DMA_MAP_STATE
 
-config DMA_NEED_PCI_MAP_STATE
+config NEED_DMA_MAP_STATE
         bool
 
-config EARLY_PRINTK
-        bool "Early printk" if EMBEDDED && DEBUG_KERNEL
-        depends on SYS_HAS_EARLY_PRINTK
-        default y
-        help
-          This option enables special console drivers which allow the kernel
-          to print messages very early in the bootup process.
-
-          This is useful for kernel debugging when your machine crashes very
-          early before the console code is initialized. For normal operation,
-          it is not recommended because it looks ugly on some machines and
-          doesn't cooperate with an X server. You should normally say N here,
-          unless you want to debug such a crash.
-
 config SYS_HAS_EARLY_PRINTK
         bool
 
@@ -1069,6 +1068,21 @@ config CPU_LOONGSON2E
           The Loongson 2E processor implements the MIPS III instruction set
           with many extensions.
 
+          It has an internal FPGA northbridge, which is compatiable to
+          bonito64.
+
+config CPU_LOONGSON2F
+        bool "Loongson 2F"
+        depends on SYS_HAS_CPU_LOONGSON2F
+        select CPU_LOONGSON2
+        help
+          The Loongson 2F processor implements the MIPS III instruction set
+          with many extensions.
+
+          Loongson2F have built-in DDR2 and PCIX controller. The PCIX controller
+          have a similar programming interface with FPGA northbridge used in
+          Loongson2E.
+
 config CPU_MIPS32_R1
         bool "MIPS32 Release 1"
         depends on SYS_HAS_CPU_MIPS32_R1
@@ -1283,7 +1297,6 @@ config CPU_CAVIUM_OCTEON
         select SYS_SUPPORTS_SMP
         select NR_CPUS_DEFAULT_16
         select WEAK_ORDERING
-        select WEAK_REORDERING_BEYOND_LLSC
         select CPU_SUPPORTS_HIGHMEM
         select CPU_SUPPORTS_HUGEPAGES
         help
@@ -1294,6 +1307,44 @@ config CPU_CAVIUM_OCTEON
 
 endchoice
 
+if CPU_LOONGSON2F
+config CPU_NOP_WORKAROUNDS
+        bool
+
+config CPU_JUMP_WORKAROUNDS
+        bool
+
+config CPU_LOONGSON2F_WORKAROUNDS
+        bool "Loongson 2F Workarounds"
+        default y
+        select CPU_NOP_WORKAROUNDS
+        select CPU_JUMP_WORKAROUNDS
+        help
+          Loongson 2F01 / 2F02 processors have the NOP & JUMP issues which
+          require workarounds.  Without workarounds the system may hang
+          unexpectedly.  For more information please refer to the gas
+          -mfix-loongson2f-nop and -mfix-loongson2f-jump options.
+
+          Loongson 2F03 and later have fixed these issues and no workarounds
+          are needed.  The workarounds have no significant side effect on them
+          but may decrease the performance of the system so this option should
+          be disabled unless the kernel is intended to be run on 2F01 or 2F02
+          systems.
+
+          If unsure, please say Y.
+endif # CPU_LOONGSON2F
+
+config SYS_SUPPORTS_ZBOOT
+        bool
+        select HAVE_KERNEL_GZIP
+        select HAVE_KERNEL_BZIP2
+        select HAVE_KERNEL_LZMA
+        select HAVE_KERNEL_LZO
+
+config SYS_SUPPORTS_ZBOOT_UART16550
+        bool
+        select SYS_SUPPORTS_ZBOOT
+
 config CPU_LOONGSON2
         bool
         select CPU_SUPPORTS_32BIT_KERNEL
@@ -1303,6 +1354,12 @@ config CPU_LOONGSON2
 config SYS_HAS_CPU_LOONGSON2E
         bool
 
+config SYS_HAS_CPU_LOONGSON2F
+        bool
+        select CPU_SUPPORTS_CPUFREQ
+        select CPU_SUPPORTS_ADDRWINCFG if 64BIT
+        select CPU_SUPPORTS_UNCACHED_ACCELERATED
+
 config SYS_HAS_CPU_MIPS32_R1
         bool
 
@@ -1411,8 +1468,17 @@ config CPU_SUPPORTS_32BIT_KERNEL
         bool
 config CPU_SUPPORTS_64BIT_KERNEL
         bool
+config CPU_SUPPORTS_CPUFREQ
+        bool
+config CPU_SUPPORTS_ADDRWINCFG
+        bool
 config CPU_SUPPORTS_HUGEPAGES
         bool
+config CPU_SUPPORTS_UNCACHED_ACCELERATED
+        bool
+config MIPS_PGD_C0_CONTEXT
+        bool
+        default y if 64BIT && CPU_MIPSR2
 
 #
 # Set to y for ptrace access to watch registers.
@@ -1688,6 +1754,9 @@ config SB1_PASS_2_1_WORKAROUNDS
 config 64BIT_PHYS_ADDR
         bool
 
+config ARCH_PHYS_ADDR_T_64BIT
+       def_bool 64BIT_PHYS_ADDR
+
 config CPU_HAS_SMARTMIPS
         depends on SYS_SUPPORTS_SMARTMIPS
         bool "Support for the SmartMIPS ASE"
@@ -2024,15 +2093,6 @@ config STACKTRACE_SUPPORT
 
 source "init/Kconfig"
 
-config PROBE_INITRD_HEADER
-        bool "Probe initrd header created by addinitrd"
-        depends on BLK_DEV_INITRD
-        help
-          Probe initrd header at the last page of kernel image.
-          Say Y here if you are using arch/mips/boot/addinitrd.c to
-          add initrd or initramfs image to the kernel image.
-          Otherwise, say N.
-
 source "kernel/Kconfig.freezer"
 
 menu "Bus options (PCI, PCMCIA, EISA, ISA, TC)"
@@ -2104,6 +2164,7 @@ config MMU
 
 config I8253
         bool
+        select MIPS_EXTERNAL_TIMER
 
 config ZONE_DMA32
         bool
@@ -2180,6 +2241,8 @@ source "kernel/power/Kconfig"
 
 endmenu
 
+source "arch/mips/kernel/cpufreq/Kconfig"
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"