Merge branch 'master' of git://git.denx.de/u-boot-mips

[people/ms/u-boot.git] / arch / mips / Kconfig

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index f852a1f1bbca2ab55ac220b11ae263e60f6abca1..dc34c18258cbf9aad441fd1b8145ecfd88f13a76 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -5,8 +5,8 @@ config SYS_ARCH
        default "mips"
 
 config SYS_CPU
-       default "mips32" if CPU_MIPS32_R1 || CPU_MIPS32_R2
-       default "mips64" if CPU_MIPS64_R1 || CPU_MIPS64_R2
+       default "mips32" if CPU_MIPS32
+       default "mips64" if CPU_MIPS64
 
 choice
        prompt "Target select"
@@ -28,6 +28,7 @@ config TARGET_MALTA
        select SUPPORTS_LITTLE_ENDIAN
        select SUPPORTS_CPU_MIPS32_R1
        select SUPPORTS_CPU_MIPS32_R2
+       select SUPPORTS_CPU_MIPS32_R6
        select SWAP_IO_SPACE
        select MIPS_L1_CACHE_SHIFT_6
 
@@ -55,6 +56,11 @@ config TARGET_PB1X00
        select SYS_MIPS_CACHE_INIT_RAM_LOAD
        select MIPS_TUNE_4KC
 
+config ARCH_ATH79
+       bool "Support QCA/Atheros ath79"
+       select OF_CONTROL
+       select DM
+
 config MACH_PIC32
        bool "Support Microchip PIC32"
        select OF_CONTROL
@@ -67,6 +73,7 @@ source "board/imgtec/malta/Kconfig"
 source "board/micronas/vct/Kconfig"
 source "board/pb1x00/Kconfig"
 source "board/qemu-mips/Kconfig"
+source "arch/mips/mach-ath79/Kconfig"
 source "arch/mips/mach-pic32/Kconfig"
 
 if MIPS
@@ -98,7 +105,7 @@ config CPU_MIPS32_R1
        depends on SUPPORTS_CPU_MIPS32_R1
        select 32BIT
        help
-         Choose this option to build an U-Boot for release 1 or later of the
+         Choose this option to build an U-Boot for release 1 through 5 of the
          MIPS32 architecture.
 
 config CPU_MIPS32_R2
@@ -106,7 +113,15 @@ config CPU_MIPS32_R2
        depends on SUPPORTS_CPU_MIPS32_R2
        select 32BIT
        help
-         Choose this option to build an U-Boot for release 2 or later of the
+         Choose this option to build an U-Boot for release 2 through 5 of the
+         MIPS32 architecture.
+
+config CPU_MIPS32_R6
+       bool "MIPS32 Release 6"
+       depends on SUPPORTS_CPU_MIPS32_R6
+       select 32BIT
+       help
+         Choose this option to build an U-Boot for release 6 or later of the
          MIPS32 architecture.
 
 config CPU_MIPS64_R1
@@ -114,7 +129,7 @@ config CPU_MIPS64_R1
        depends on SUPPORTS_CPU_MIPS64_R1
        select 64BIT
        help
-         Choose this option to build a kernel for release 1 or later of the
+         Choose this option to build a kernel for release 1 through 5 of the
          MIPS64 architecture.
 
 config CPU_MIPS64_R2
@@ -122,7 +137,15 @@ config CPU_MIPS64_R2
        depends on SUPPORTS_CPU_MIPS64_R2
        select 64BIT
        help
-         Choose this option to build a kernel for release 2 or later of the
+         Choose this option to build a kernel for release 2 through 5 of the
+         MIPS64 architecture.
+
+config CPU_MIPS64_R6
+       bool "MIPS64 Release 6"
+       depends on SUPPORTS_CPU_MIPS64_R6
+       select 64BIT
+       help
+         Choose this option to build a kernel for release 6 or later of the
          MIPS64 architecture.
 
 endchoice
@@ -145,7 +168,7 @@ config MIPS_BOOT_ENV_LEGACY
          Enable this option if you want U-Boot to hand over the Yamon-style
          environment to the kernel. Information like memory size, initrd
          address and size will be prepared as zero-terminated key/value list.
-         The address of the enviroment is stored in register $a2.
+         The address of the environment is stored in register $a2.
 
 config MIPS_BOOT_FDT
        bool "Hand over a flattened device tree to Linux kernel"
@@ -169,19 +192,25 @@ config SUPPORTS_CPU_MIPS32_R1
 config SUPPORTS_CPU_MIPS32_R2
        bool
 
+config SUPPORTS_CPU_MIPS32_R6
+       bool
+
 config SUPPORTS_CPU_MIPS64_R1
        bool
 
 config SUPPORTS_CPU_MIPS64_R2
        bool
 
+config SUPPORTS_CPU_MIPS64_R6
+       bool
+
 config CPU_MIPS32
        bool
-       default y if CPU_MIPS32_R1 || CPU_MIPS32_R2
+       default y if CPU_MIPS32_R1 || CPU_MIPS32_R2 || CPU_MIPS32_R6
 
 config CPU_MIPS64
        bool
-       default y if CPU_MIPS64_R1 || CPU_MIPS64_R2
+       default y if CPU_MIPS64_R1 || CPU_MIPS64_R2 || CPU_MIPS64_R6
 
 config MIPS_TUNE_4KC
        bool
@@ -192,6 +221,9 @@ config MIPS_TUNE_14KC
 config MIPS_TUNE_24KC
        bool
 
+config MIPS_TUNE_74KC
+       bool
+
 config 32BIT
        bool