Merge branches 'arm', 'at91', 'bcmring', 'ep93xx', 'mach-types', 'misc' and 'w90x900...

[platform/kernel/linux-starfive.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0dd29eb..5d60508 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -495,10 +495,18 @@ config ARCH_W90X900
        select CPU_ARM926T
        select ARCH_REQUIRE_GPIOLIB
        select GENERIC_GPIO
        select CPU_ARM926T
        select ARCH_REQUIRE_GPIOLIB
        select GENERIC_GPIO

+       select HAVE_CLK

        select COMMON_CLKDEV
        select COMMON_CLKDEV

+       select GENERIC_TIME
+       select GENERIC_CLOCKEVENTS

        help
        help

-               Support for Nuvoton (Winbond logic dept.) ARM9 processor,You
-               can login www.mcuos.com or www.nuvoton.com to know more.
+         Support for Nuvoton (Winbond logic dept.) ARM9 processor,
+         At present, the w90x900 has been renamed nuc900, regarding
+         the ARM series product line, you can login the following
+         link address to know more.
+
+         <http://www.nuvoton.com/hq/enu/ProductAndSales/ProductLines/
+               ConsumerElectronicsIC/ARMMicrocontroller/ARMMicrocontroller>

 
 config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
 
 config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"


@@ -639,6 +647,18 @@ config ARCH_OMAP
        help
          Support for TI's OMAP platform (OMAP1 and OMAP2).
 
        help
          Support for TI's OMAP platform (OMAP1 and OMAP2).
 

+config ARCH_BCMRING
+       bool "Broadcom BCMRING"
+       depends on MMU
+       select CPU_V6
+       select ARM_AMBA
+       select COMMON_CLKDEV
+       select GENERIC_TIME
+       select GENERIC_CLOCKEVENTS
+       select ARCH_WANT_OPTIONAL_GPIOLIB
+       help
+         Support for Broadcom's BCMRing platform.
+

 endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"
 endchoice
 
 source "arch/arm/mach-clps711x/Kconfig"


@@ -732,6 +752,8 @@ source "arch/arm/mach-u300/Kconfig"
 
 source "arch/arm/mach-w90x900/Kconfig"
 
 
 source "arch/arm/mach-w90x900/Kconfig"
 

+source "arch/arm/mach-bcmring/Kconfig"
+

 # Definitions to make life easier
 config ARCH_ACORN
        bool
 # Definitions to make life easier
 config ARCH_ACORN
        bool


@@ -1056,6 +1078,11 @@ config HIGHMEM
 
          If unsure, say n.
 
 
          If unsure, say n.
 

+config HIGHPTE
+       bool "Allocate 2nd-level pagetables from highmem"
+       depends on HIGHMEM
+       depends on !OUTER_CACHE
+

 source "mm/Kconfig"
 
 config LEDS
 source "mm/Kconfig"
 
 config LEDS