Patched in Tegra support.

1 files changed, 62 insertions, 26 deletions

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 9f2edb5c555..1a6f20d4e7e 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -18,9 +18,7 @@ config SPARC
         select HAVE_OPROFILE
         select HAVE_ARCH_KGDB if !SMP || SPARC64
         select HAVE_ARCH_TRACEHOOK
-        select SYSCTL_EXCEPTION_TRACE
         select ARCH_WANT_OPTIONAL_GPIOLIB
-        select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select RTC_CLASS
         select RTC_DRV_M48T59
         select HAVE_IRQ_WORK
@@ -29,24 +27,10 @@ config SPARC
         select HAVE_ARCH_JUMP_LABEL
         select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_SHOW
-        select ARCH_WANT_IPC_PARSE_VERSION
         select USE_GENERIC_SMP_HELPERS if SMP
-        select GENERIC_PCI_IOMAP
-        select HAVE_NMI_WATCHDOG if SPARC64
-        select HAVE_BPF_JIT
-        select HAVE_DEBUG_BUGVERBOSE
-        select GENERIC_SMP_IDLE_THREAD
-        select GENERIC_CMOS_UPDATE
-        select GENERIC_CLOCKEVENTS
-        select GENERIC_STRNCPY_FROM_USER
-        select GENERIC_STRNLEN_USER
-        select MODULES_USE_ELF_RELA
 
 config SPARC32
         def_bool !64BIT
-        select GENERIC_ATOMIC64
-        select CLZ_TAB
-        select HAVE_UID16
 
 config SPARC64
         def_bool 64BIT
@@ -59,12 +43,10 @@ config SPARC64
         select HAVE_KPROBES
         select HAVE_RCU_TABLE_FREE if SMP
         select HAVE_MEMBLOCK
-        select HAVE_MEMBLOCK_NODE_MAP
         select HAVE_SYSCALL_WRAPPERS
         select HAVE_DYNAMIC_FTRACE
         select HAVE_FTRACE_MCOUNT_RECORD
         select HAVE_SYSCALL_TRACEPOINTS
-        select HAVE_DEBUG_KMEMLEAK
         select RTC_DRV_CMOS
         select RTC_DRV_BQ4802
         select RTC_DRV_SUN4V
@@ -74,7 +56,6 @@ config SPARC64
         select IRQ_PREFLOW_FASTEOI
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select HAVE_C_RECORDMCOUNT
-        select NO_BOOTMEM
 
 config ARCH_DEFCONFIG
         string
@@ -87,6 +68,18 @@ config BITS
         default 32 if SPARC32
         default 64 if SPARC64
 
+config ARCH_USES_GETTIMEOFFSET
+        bool
+        default y if SPARC32
+
+config GENERIC_CMOS_UPDATE
+        bool
+        default y
+
+config GENERIC_CLOCKEVENTS
+        bool
+        default y if SPARC64
+
 config IOMMU_HELPER
         bool
         default y if SPARC64
@@ -156,7 +149,7 @@ source "kernel/Kconfig.freezer"
 menu "Processor type and features"
 
 config SMP
-        bool "Symmetric multi-processing support"
+        bool "Symmetric multi-processing support (does not work on sun4/sun4c)"
         ---help---
           This enables support for systems with more than one CPU. If you have
           a system with only one CPU, say N. If you have a system with more
@@ -232,6 +225,25 @@ config EARLYFB
         help
           Say Y here to enable a faster early framebuffer boot console.
 
+choice
+        prompt "Kernel page size" if SPARC64
+        default SPARC64_PAGE_SIZE_8KB
+
+config SPARC64_PAGE_SIZE_8KB
+        bool "8KB"
+        help
+          This lets you select the page size of the kernel.
+
+          8KB and 64KB work quite well, since SPARC ELF sections
+          provide for up to 64KB alignment.
+
+          If you don't know what to do, choose 8KB.
+
+config SPARC64_PAGE_SIZE_64KB
+        bool "64KB"
+
+endchoice
+
 config SECCOMP
         bool "Enable seccomp to safely compute untrusted bytecode"
         depends on SPARC64 && PROC_FS
@@ -258,6 +270,8 @@ config HOTPLUG_CPU
           can be controlled through /sys/devices/system/cpu/cpu#.
           Say N if you want to disable CPU hotplug.
 
+source "kernel/time/Kconfig"
+
 if SPARC64
 source "drivers/cpufreq/Kconfig"
 
@@ -303,6 +317,23 @@ config GENERIC_LOCKBREAK
         default y
         depends on SPARC64 && SMP && PREEMPT
 
+choice
+        prompt "SPARC64 Huge TLB Page Size"
+        depends on SPARC64 && HUGETLB_PAGE
+        default HUGETLB_PAGE_SIZE_4MB
+
+config HUGETLB_PAGE_SIZE_4MB
+        bool "4MB"
+
+config HUGETLB_PAGE_SIZE_512K
+        bool "512K"
+
+config HUGETLB_PAGE_SIZE_64K
+        depends on !SPARC64_PAGE_SIZE_64KB
+        bool "64K"
+
+endchoice
+
 config NUMA
         bool "NUMA support"
         depends on SPARC64 && SMP
@@ -321,6 +352,9 @@ config NODES_SPAN_OTHER_NODES
         def_bool y
         depends on NEED_MULTIPLE_NODES
 
+config ARCH_POPULATES_NODE_MAP
+        def_bool y if SPARC64
+
 config ARCH_SELECT_MEMORY_MODEL
         def_bool y if SPARC64
 
@@ -351,7 +385,9 @@ config SCHED_MC
           making when dealing with multi-core CPU chips at a cost of slightly
           increased overhead in some places. If unsure say N here.
 
+if SPARC64
 source "kernel/Kconfig.preempt"
+endif
 
 config CMDLINE_BOOL
         bool "Default bootloader kernel arguments"
@@ -524,7 +560,12 @@ 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 helper
+# Makefile helpers
+config SPARC32_PCI
+        bool
+        default y
+        depends on SPARC32 && PCI
+
 config SPARC64_PCI
         bool
         default y
@@ -541,17 +582,12 @@ config COMPAT
         depends on SPARC64
         default y
         select COMPAT_BINFMT_ELF
-        select HAVE_UID16
-        select ARCH_WANT_OLD_COMPAT_IPC
 
 config SYSVIPC_COMPAT
         bool
         depends on COMPAT && SYSVIPC
         default y
 
-config KEYS_COMPAT
-        def_bool y if COMPAT && KEYS
-
 endmenu
 
 source "net/Kconfig"