1 files changed, 97 insertions, 49 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 705a7a9170f3..8b5d174685f0 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -1,12 +1,16 @@
 config MIPS
         bool
         default y
+        select HAVE_GENERIC_DMA_COHERENT
         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"
 
@@ -21,6 +25,7 @@ choice
 
 config MACH_ALCHEMY
         bool "Alchemy processor based machines"
+        select SYS_SUPPORTS_ZBOOT
 
 config AR7
         bool "Texas Instruments AR7"
@@ -35,6 +40,7 @@ config AR7
         select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_LITTLE_ENDIAN
+        select SYS_SUPPORTS_ZBOOT_UART16550
         select GENERIC_GPIO
         select GCD
         select VLYNQ
@@ -42,23 +48,6 @@ config AR7
           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"
         select CEVT_R4K
@@ -191,6 +180,7 @@ config LASAT
 
 config MACH_LOONGSON
         bool "Loongson family of machines"
+        select SYS_SUPPORTS_ZBOOT_UART16550
         help
           This enables the support of Loongson family of machines.
 
@@ -232,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.
@@ -333,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
@@ -357,7 +366,14 @@ config SGI_IP22
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_R4X00
         select SYS_HAS_CPU_R5000
-        select SYS_HAS_EARLY_PRINTK
+        #
+        # Disable EARLY_PRINTK for now since it leads to overwritten prom
+        # memory during early boot on some machines.
+        #
+        # See http://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-mips&i=20091119164009.GA15038%40deprecation.cyrius.com
+        # for a more details discussion
+        #
+        # select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
@@ -409,7 +425,14 @@ config SGI_IP28
         select SGI_HAS_ZILOG
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_R10000
-        select SYS_HAS_EARLY_PRINTK
+        #
+        # Disable EARLY_PRINTK for now since it leads to overwritten prom
+        # memory during early boot on some machines.
+        #
+        # See http://www.linux-mips.org/cgi-bin/mesg.cgi?a=linux-mips&i=20091119164009.GA15038%40deprecation.cyrius.com
+        # for a more details discussion
+        #
+        # select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_64BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
       help
@@ -659,11 +682,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"
@@ -763,6 +786,9 @@ config CSRC_BCM1480
 config CSRC_IOASIC
         bool
 
+config CSRC_POWERTV
+        bool
+
 config CSRC_R4K_LIB
         bool
 
@@ -791,20 +817,6 @@ config DMA_NONCOHERENT
 config DMA_NEED_PCI_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
 
@@ -1012,9 +1024,9 @@ config BOOT_ELF32
 
 config MIPS_L1_CACHE_SHIFT
         int
-        default "4" if MACH_DECSTATION || MIKROTIK_RB532
+        default "4" if MACH_DECSTATION || MIKROTIK_RB532 || PMC_MSP4200_EVAL
+        default "6" if MIPS_CPU_SCACHE
         default "7" if SGI_IP22 || SGI_IP27 || SGI_IP28 || SNI_RM || CPU_CAVIUM_OCTEON
-        default "4" if PMC_MSP4200_EVAL
         default "5"
 
 config HAVE_STD_PC_SERIAL_PORT
@@ -1054,6 +1066,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
@@ -1279,6 +1306,17 @@ config CPU_CAVIUM_OCTEON
 
 endchoice
 
+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
@@ -1288,6 +1326,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
 
@@ -1396,8 +1440,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.
@@ -1438,6 +1491,7 @@ choice
 
 config PAGE_SIZE_4KB
         bool "4kB"
+        depends on !CPU_LOONGSON2
         help
          This option select the standard 4kB Linux page size.  On some
          R3000-family processors this is the only available page size.  Using
@@ -1762,7 +1816,7 @@ config SYS_SUPPORTS_SMARTMIPS
 
 config ARCH_FLATMEM_ENABLE
         def_bool y
-        depends on !NUMA
+        depends on !NUMA && !CPU_LOONGSON2
 
 config ARCH_DISCONTIGMEM_ENABLE
         bool
@@ -2008,15 +2062,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)"
@@ -2088,6 +2133,7 @@ config MMU
 
 config I8253
         bool
+        select MIPS_EXTERNAL_TIMER
 
 config ZONE_DMA32
         bool
@@ -2164,6 +2210,8 @@ source "kernel/power/Kconfig"
 
 endmenu
 
+source "arch/mips/kernel/cpufreq/Kconfig"
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"