--- zzzz-none-000/linux-2.6.28.10/arch/arm/Kconfig	2009-05-02 18:54:43.000000000 +0000
+++ puma5-6360-529/linux-2.6.28.10/arch/arm/Kconfig	2010-05-21 11:40:46.000000000 +0000
@@ -159,6 +159,7 @@
 	bool
 	def_bool y
 
+
 if OPROFILE
 
 config OPROFILE_ARMV6
@@ -539,6 +540,21 @@
 	help
 	  Support for TI's OMAP platform (OMAP1 and OMAP2).
 
+config ARCH_PUMA5
+	bool "TI PUMA5"
+	select HAVE_CLK
+	select GENERIC_GPIO
+	select ARCH_REQUIRE_GPIOLIB
+	select GENERIC_TIME
+	select GENERIC_CLOCKEVENTS
+    select ARM_AVALANCHE_SOC
+    select ARCH_AVALANCHE
+    select DMA_NONCOHERENT
+    select SWAP_IO_SPACE
+    select NONCOHERENT_IO
+	help
+	  Support for TI's PUMA5 platform.
+
 config ARCH_MSM
 	bool "Qualcomm MSM"
 	select GENERIC_TIME
@@ -549,8 +565,27 @@
 	  interface to the ARM9 modem processor which runs the baseband stack
 	  and controls some vital subsystems (clock and power control, etc).
 
+
 endchoice
 
+config AVM_SIMPLE_PROFILING
+    bool "Enable AVM Simple Profiling"
+    default n
+
+config ARM_PUMA_C55_MEMORY
+    hex "PUMA c55 Memory allocation in KBytes (0 disabled)"
+    depends on ARCH_PUMA5
+    default 0
+
+config ARCH_SUPPORTS_BIG_ENDIAN
+        bool
+        default y
+        help
+          Some machines can be configured for either little or big endian
+          byte order. These modes require different kernels. Say Y if your
+          machine is little endian, N if it's a big endian machine.
+
+
 source "arch/arm/mach-clps711x/Kconfig"
 
 source "arch/arm/mach-ep93xx/Kconfig"
@@ -627,6 +662,8 @@
 
 source "arch/arm/mach-msm/Kconfig"
 
+source "arch/arm/mach-puma5/Kconfig"
+
 # Definitions to make life easier
 config ARCH_ACORN
 	bool
@@ -779,6 +816,10 @@
 	  Say Y here to experiment with turning CPUs off and on.  CPUs
 	  can be controlled through /sys/devices/system/cpu.
 
+config THREAD_SIZE_ORDER
+    hex "Stack size order (size is 1 << PAGE_SIZE + THREAD_SIZE_ORDER)"
+    default "1"
+
 config LOCAL_TIMERS
 	bool "Use local timer interrupts"
 	depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)
@@ -1037,7 +1078,7 @@
 
 menu "CPU Power Management"
 
-if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA)
+if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX || ARCH_PXA || ARCH_PUMA5)
 
 source "drivers/cpufreq/Kconfig"
 
@@ -1046,9 +1087,14 @@
 	depends on CPU_FREQ && (SA1100_H3100 || SA1100_H3600 || SA1100_H3800 || SA1100_LART || SA1100_PLEB || SA1100_BADGE4 || SA1100_HACKKIT)
 	default y
 
-config CPU_FREQ_SA1110
+config CPU_FREQ_SA1100
 	bool
-	depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3)
+	depends on CPU_FREQ && (SA1100_H3100 || SA1100_H3600 || SA1100_H3800 || SA1100_LART || SA1100_PLEB || SA1100_BADGE4 || SA1100_HACKKIT)
+	default y
+
+config CPU_FREQ_PUMA5
+	bool "PUMA CPUFREQ frequency scaling support"
+	depends on CPU_FREQ && ARCH_PUMA5
 	default y
 
 config CPU_FREQ_INTEGRATOR
@@ -1287,3 +1333,19 @@
 source "crypto/Kconfig"
 
 source "lib/Kconfig"
+
+#
+# Select some configuration options automatically based on user selections.
+#
+
+config  DMA_NONCOHERENT
+	bool
+
+config SWAP_IO_SPACE
+	bool
+
+config NONCOHERENT_IO
+	bool
+
+config ARCH_AVALANCHE
+    bool