--- zzzz-none-000/linux-2.6.13.1/arch/mips/Kconfig	2005-09-10 02:42:58.000000000 +0000
+++ ohio-7170-487/linux-2.6.13.1/arch/mips/Kconfig	2007-10-23 10:01:08.000000000 +0000
@@ -305,6 +305,109 @@
 	select IRQ_CPU
 	select DMA_NONCOHERENT
 
+config MIPS_OHIO
+	bool "Support for the AVM Board family using the OHIO CPU"
+	select DMA_NONCOHERENT
+
+config MIPS_AR7
+	bool "Support for the AVM Board family using the AR7 CPU"
+	select DMA_NONCOHERENT
+
+config MIPS_UR8
+	bool "Support for the AVM Board family using the UR8 CPU"
+	select HW_HAS_PCI
+	select DMA_NONCOHERENT
+
+config UR8_EVM
+	bool "Support for the TI UR8 EVM Board"
+	depends on MIPS_UR8
+	default n
+
+config MIPS_OHIO_PHY_MEMSTART
+    hex "Ohio physical ram start"
+    depends on MIPS_OHIO
+    default 0x14000000
+
+config MIPS_AR7_PHY_MEMSTART
+    hex "Ohio physical ram start"
+    depends on MIPS_AR7
+    default 0x14000000
+
+config MIPS_UR8_PHY_MEMSTART
+    hex "Ohio physical ram start"
+    depends on MIPS_UR8
+    default 0x14000000
+
+config OHIO_CLOCK_SWITCH
+	bool "Support Clock switching for OHIO"
+	depends on MIPS_OHIO
+	default y
+
+config AR7_CLOCK_SWITCH
+	bool "Support Clock switching for AR7"
+	depends on MIPS_AR7
+	default y
+
+config AVM_SIMPLE_PROFILING
+    bool "Enable support simple kernel profiling"
+    depends on MIPS_OHIO || MIPS_UR8 || MIPS_AR7
+
+config AVM_PROFILING_TRACE_MODE
+    int "AVM Simple Profiling mode"
+    depends on AVM_SIMPLE_PROFILING
+    help
+        1024 * AVM_PROFILING_TRACE_MODE samples
+
+config DISABLE_OOM_KILLER
+    depends on MIPS_OHIO || MIPS_UR8 || MIPS_AR7
+    bool "disable out of memory killer"
+    default y
+
+config UR8_CLOCK_SWITCH
+	bool "Support Clock switching for UR8"
+	depends on MIPS_UR8
+	default y
+
+config VLYNQ_SUPPORT
+	bool "Support for the Texas Instruments Vlynq"
+	depends on MIPS_OHIO || MIPS_UR8 || MIPS_AR7
+	default y
+
+config VLYNQ_SUPPORT_CLK
+	int "Clock speed for the Texas Instruments Vlynq"
+	depends on VLYNQ_SUPPORT
+	default 62500000
+
+config GPIO_SSI
+	bool "Support for SSI emulation using GPIO pins"
+	depends on MIPS_OHIO || MIPS_UR8 || MIPS_AR7
+	default n
+
+config GPIO_SSI_CS
+    int "GPIO used for CS0"
+    depends on GPIO_SSI
+    default 8
+
+config GPIO_SSI_CS2
+    int "GPIO used for CS2"
+    depends on GPIO_SSI
+    default 11
+
+config GPIO_SSI_CS3
+    int "GPIO used for CS3"
+    depends on GPIO_SSI
+    default 3
+
+config GPIO_SSI_CLK
+    int "GPIO used for CLK"
+    depends on GPIO_SSI
+    default 4
+
+config GPIO_SSI_DATA
+    int "GPIO used for DATA"
+    depends on GPIO_SSI
+    default 5
+
 config MOMENCO_OCELOT
 	bool "Support for Momentum Ocelot board"
 	select DMA_NONCOHERENT
@@ -382,18 +485,6 @@
 	  Select to Y if jump JP5 is set on your board, N otherwise.  Normally
 	  the jumper is set, so if you feel unsafe, just say Y.
 
-config PMC_YOSEMITE
-	bool "Support for PMC-Sierra Yosemite eval board"
-	select DMA_COHERENT
-	select HW_HAS_PCI
-	select IRQ_CPU
-	select IRQ_CPU_RM7K
-	select IRQ_CPU_RM9K
-	select SWAP_IO_SPACE
-	help
-	  Yosemite is an evaluation board for the RM9000x2 processor
-	  manufactured by PMC-Sierra
-
 config HYPERTRANSPORT
 	bool "Hypertransport Support for PMC-Sierra Yosemite"
 	depends on PMC_YOSEMITE
@@ -532,21 +623,6 @@
 	  across multiple nodes in a NUMA cluster. This trades memory for
 	  speed.
 
-config SGI_IP32
-	bool "Support for SGI IP32 (O2) (EXPERIMENTAL)"
-	depends on MIPS64 && EXPERIMENTAL
-	select ARC
-	select ARC32
-	select BOOT_ELF32
-	select OWN_DMA
-	select DMA_IP32
-	select DMA_NONCOHERENT
-	select HW_HAS_PCI
-	select R5000_CPU_SCACHE
-	select RM7000_CPU_SCACHE
-	help
-	  If you want this kernel to run on SGI O2 workstation, say Y here.
-
 config SOC_AU1X00
 	depends on MIPS32
 	bool "Support for AMD/Alchemy Au1X00 SOCs"
@@ -956,7 +1032,7 @@
 
 config MIPS_BONITO64
 	bool
-	depends on MIPS_ATLAS || MIPS_MALTA
+	depends on MIPS_ATLAS || MIPS_MALTA 
 	default y
 
 config MIPS_MSC
@@ -997,7 +1073,7 @@
 
 config MIPS_BOARDS_GEN
 	bool
-	depends on MIPS_ATLAS || MIPS_MALTA || MIPS_SEAD
+	depends on MIPS_ATLAS || MIPS_MALTA || MIPS_SEAD || MIPS_OHIO || MIPS_UR8 || MIPS_AR7
 	default y
 
 config MIPS_GT64111