--- zzzz-none-000/linux-2.6.19.2/arch/mips/Kconfig	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/arch/mips/Kconfig	2008-05-30 13:25:47.000000000 +0000
@@ -307,6 +307,44 @@
 	  This enables support for the MIPS Technologies SEAD evaluation
 	  board.
 
+config MIPS_OHIO
+	bool "Support for the AVM Board family using the OHIO CPU"
+	select DMA_NONCOHERENT
+	select MIPS_BOARDS_GEN
+	select SYS_HAS_CPU_MIPS32_R1
+	select SYS_HAS_CPU_MIPS32_R2
+	select SYS_SUPPORTS_32BIT_KERNEL
+	select SYS_SUPPORTS_LITTLE_ENDIAN
+
+config MIPS_AR7
+	bool "Support for the AVM Board family using the AR7 CPU"
+	select DMA_NONCOHERENT
+	select MIPS_BOARDS_GEN
+	select SYS_HAS_CPU_MIPS32_R1
+	select SYS_HAS_CPU_MIPS32_R2
+	select SYS_SUPPORTS_32BIT_KERNEL
+	select SYS_SUPPORTS_LITTLE_ENDIAN
+
+config MIPS_UR8
+	bool "Support for the AVM Board family using the UR8 CPU"
+	select HW_HAS_PCI
+	select DMA_NONCOHERENT
+	select MIPS_BOARDS_GEN
+	select SYS_HAS_CPU_MIPS32_R1
+	select SYS_HAS_CPU_MIPS32_R2
+	select SYS_SUPPORTS_32BIT_KERNEL
+	select SYS_SUPPORTS_LITTLE_ENDIAN
+
+config UR8_EVM
+	bool "Support for the TI UR8 EVM Board"
+	depends on MIPS_UR8
+	select MIPS_BOARDS_GEN
+	select SYS_HAS_CPU_MIPS32_R1
+	select SYS_HAS_CPU_MIPS32_R2
+	select SYS_SUPPORTS_32BIT_KERNEL
+	select SYS_SUPPORTS_LITTLE_ENDIAN
+	default n
+
 config WR_PPMC
 	bool "Wind River PPMC board"
 	select IRQ_CPU
@@ -425,8 +463,9 @@
 	select SWAP_IO_SPACE
 	select SYS_HAS_CPU_RM7000
 	select SYS_SUPPORTS_32BIT_KERNEL
-	select SYS_SUPPORTS_64BIT_KERNEL if BROKEN
+	select SYS_SUPPORTS_64BIT_KERNEL
 	select SYS_SUPPORTS_BIG_ENDIAN
+	select ARCH_SPARSEMEM_ENABLE
 	help
 	  The Ocelot is a MIPS-based Single Board Computer (SBC) made by
 	  Momentum Computer <http://www.momenco.com/>.
@@ -559,7 +598,6 @@
 	select SYS_SUPPORTS_64BIT_KERNEL
 	select SYS_SUPPORTS_BIG_ENDIAN
 	select SYS_SUPPORTS_NUMA
-	select SYS_SUPPORTS_SMP
 	help
 	  This are the SGI Origin 200, Origin 2000 and Onyx 2 Graphics
 	  workstations.  To compile a Linux kernel that runs on these, say Y
@@ -766,6 +804,160 @@
 
 endchoice
 
+menu "*** AVM Board PCI Configuration ***"
+
+config AVM_PCI_DEVICE_COUNT
+	int 'Number of PCI devices [0..3] wired to AVM Board'
+	depends on MIPS_UR8
+	range 0 3
+	default 1
+
+config AVM_PCI_INT_A
+	bool "PCI INT_A pin is used as PCI function"
+	depends on (AVM_PCI_DEVICE_COUNT != 0)
+	default y if MIPS_UR8
+	default n
+
+config AVM_PCI_INT_B
+	bool "PCI INT_B pin is used as PCI function"
+	depends on (AVM_PCI_DEVICE_COUNT != 0)
+	default n
+
+config AVM_PCI_INT_C
+	bool "PCI INT_C pin is used as PCI function"
+	depends on (AVM_PCI_DEVICE_COUNT != 0)
+	default n
+
+config AVM_PCI_REQ_AND_GNT_0
+	bool "PREQ_0 and PGRANT_0 are used as PCI functions"
+	depends on (AVM_PCI_DEVICE_COUNT != 0)
+	default y if MIPS_UR8
+	default n
+
+config AVM_PCI_REQ_AND_GNT_1
+	bool "PREQ_1 and PGRANT_1 are used as PCI functions"
+	depends on (AVM_PCI_DEVICE_COUNT != 0)
+	default n
+
+config AVM_PCI_REQ_AND_GNT_2
+	bool "PREQ_2 and PGRANT_2 are used as PCI functions"
+	depends on (AVM_PCI_DEVICE_COUNT != 0)
+	default n
+
+config AVM_PCI_DEV1_SLOT
+	int "Device#1 uses PCI Slot [0..15]"
+	depends on (AVM_PCI_DEVICE_COUNT != 0)
+	range 0 15
+	default 14
+
+config AVM_PCI_DEV1_INT
+	int "Device#1 uses INT Line [A..C] (type 0..2)"
+	depends on (AVM_PCI_DEVICE_COUNT != 0)
+	range 0 2
+	default 0
+
+config AVM_PCI_DEV2_SLOT
+	int "Device#2 uses PCI Slot [0..15]"
+	depends on (AVM_PCI_DEVICE_COUNT = 2) || (AVM_PCI_DEVICE_COUNT = 3)
+	range 0 15
+	default 15
+
+config AVM_PCI_DEV2_INT
+	int "Device#2 uses INT Line [A..C] (type 0..2)"
+	depends on (AVM_PCI_DEVICE_COUNT = 2) || (AVM_PCI_DEVICE_COUNT = 3)
+	range 0 2
+	default 1
+
+config AVM_PCI_DEV3_SLOT
+	int "Device#3 uses PCI Slot [0..15]"
+	depends on (AVM_PCI_DEVICE_COUNT = 3)
+	range 0 15
+
+config AVM_PCI_DEV3_INT
+	int "Device#3 uses INT Line [A..C] (type 0..2)"
+	depends on (AVM_PCI_DEVICE_COUNT = 3)
+	range 0 2
+	default 2
+
+
+endmenu
+
+config MIPS_OHIO_PHY_MEMSTART
+	hex "Ohio physical ram start"
+	depends on MIPS_OHIO
+	default "0x14000000"
+
+config MIPS_AR7_PHY_MEMSTART
+	hex "AR7 physical ram start"
+	depends on MIPS_AR7
+	default "0x14000000"
+
+config MIPS_UR8_PHY_MEMSTART
+	hex "UR8 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 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
+
+
 source "arch/mips/ddb5xxx/Kconfig"
 source "arch/mips/gt64120/ev64120/Kconfig"
 source "arch/mips/jazz/Kconfig"
@@ -1633,6 +1825,9 @@
 
 config ARCH_SPARSEMEM_ENABLE
 	bool
+
+config ARCH_SPARSEMEM_ENABLE
+	bool
 	select SPARSEMEM_STATIC
 
 config NUMA
@@ -1687,7 +1882,6 @@
 	depends on SMP
 	default "64" if SGI_IP27
 	default "2"
-	default "8" if MIPS_MT_SMTC
 	help
 	  This allows you to specify the maximum number of CPUs which this
 	  kernel will support.  The maximum supported value is 32 for 32-bit
@@ -1796,6 +1990,7 @@
 
 config STACKTRACE_SUPPORT
 	bool
+	select STACKTRACE
 	default y
 
 source "init/Kconfig"
@@ -1969,9 +2164,9 @@
 	depends on EXPERIMENTAL && SOC_AU1X00
 
 config APM
-        tristate "Advanced Power Management Emulation"
+	tristate "Advanced Power Management Emulation"
 	depends on PM
-        ---help---
+	help
 	  APM is a BIOS specification for saving power using several different
 	  techniques. This is mostly useful for battery powered systems with
 	  APM compliant BIOSes. If you say Y here, the system time will be