Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg...

[linux-2.6-omap-h63xx.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index e162535316240f6c39306d8f2e3c6f01c6b5bd17..0a94d9c9cde1bf5d8c17a39880d5392954ae8afa 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -31,6 +31,7 @@ config SPARC32
 config SPARC64
        bool
        default y if ARCH = "sparc64"
+       select ARCH_SUPPORTS_MSI
        select HAVE_FUNCTION_TRACER
        select HAVE_KRETPROBES
        select HAVE_KPROBES
@@ -41,6 +42,17 @@ config SPARC64
        select RTC_DRV_SUN4V
        select RTC_DRV_STARFIRE
 
+config ARCH_DEFCONFIG
+       string
+       default "arch/sparc/configs/sparc32_defconfig" if SPARC32
+       default "arch/sparc/configs/sparc64_defconfig" if SPARC64
+
+# CONFIG_BITS can be used at source level to get 32/64 bits
+config BITS
+       int
+       default 32 if SPARC32
+       default 64 if SPARC64
+
 config 64BIT
        def_bool y if SPARC64
 
@@ -78,7 +90,7 @@ config HAVE_LATENCYTOP_SUPPORT
 
 config AUDIT_ARCH
        bool
-       default y if SPARC64
+       default y
 
 config HAVE_SETUP_PER_CPU_AREA
        def_bool y if SPARC64
@@ -191,6 +203,17 @@ config EMULATED_CMPXCHG
          Sparc32 does not have a CAS instruction like sparc64. cmpxchg()
          is emulated, and therefore it is not completely atomic.
 
+# Makefile helpers
+config SPARC32_SMP
+       bool
+       default y
+       depends on SPARC32 && SMP
+
+config SPARC64_SMP
+       bool
+       default y
+       depends on SPARC64 && SMP
+
 choice
        prompt "Kernel page size" if SPARC64
        default SPARC64_PAGE_SIZE_8KB
@@ -447,14 +470,6 @@ config SBUSCHAR
        bool
        default y
 
-config SUN_AUXIO
-       bool
-       default y
-
-config SUN_IO
-       bool
-       default y
-
 config SUN_LDOMS
        bool "Sun Logical Domains support"
        depends on SPARC64
@@ -464,7 +479,6 @@ config SUN_LDOMS
 
 config PCI
        bool "Support for PCI and PS/2 keyboard/mouse"
-       select ARCH_SUPPORTS_MSI if SPARC64
        help
          Find out whether your system includes a PCI bus. PCI is the name of
          a bus system, i.e. the way the CPU talks to the other stuff inside
@@ -498,6 +512,16 @@ config SUN_OPENPROMFS
          Only choose N if you know in advance that you will not need to modify
          OpenPROM settings on the running system.
 
+# Makefile helpers
+config SPARC32_PCI
+       bool
+       default y
+       depends on SPARC32 && PCI
+
+config SPARC64_PCI
+       bool
+       default y
+       depends on SPARC64 && PCI
 
 endmenu