From 8c57ef78b6ba96d82083122ed05a0de7430d3eaa Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Mon, 14 Sep 2009 16:00:01 +0200
Subject: [PATCH] jz4740: Cleanup Kconfig

---
 target/linux/xburst/config-2.6.31             |  2 +
 .../files-2.6.31/arch/mips/jz4740/Kconfig     | 29 ++++++++++++
 .../xburst/patches-2.6.31/001-core.patch      | 47 +++++++------------
 .../xburst/patches-2.6.31/200-qi_lb60.patch   | 19 --------
 4 files changed, 47 insertions(+), 50 deletions(-)
 create mode 100644 target/linux/xburst/files-2.6.31/arch/mips/jz4740/Kconfig

diff --git a/target/linux/xburst/config-2.6.31 b/target/linux/xburst/config-2.6.31
index d92b89b8e..b3bafbf51 100644
--- a/target/linux/xburst/config-2.6.31
+++ b/target/linux/xburst/config-2.6.31
@@ -157,6 +157,7 @@ CONFIG_IP_PNP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_DHCP=y
 # CONFIG_IP_PNP_RARP is not set
+CONFIG_IRQ_CPU=y
 CONFIG_JZ4740_QI_LB60=y
 CONFIG_JZRISC=y
 CONFIG_JZSOC=y
@@ -193,6 +194,7 @@ CONFIG_MAC80211_DEFAULT_PS_VALUE=0
 # CONFIG_MACH_ALCHEMY is not set
 # CONFIG_MACH_DECSTATION is not set
 # CONFIG_MACH_JAZZ is not set
+CONFIG_MACH_JZ=y
 # CONFIG_MACH_TX39XX is not set
 # CONFIG_MACH_TX49XX is not set
 # CONFIG_MACH_VR41XX is not set
diff --git a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/Kconfig b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/Kconfig
new file mode 100644
index 000000000..69a1c1f15
--- /dev/null
+++ b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/Kconfig
@@ -0,0 +1,29 @@
+choice
+    prompt "Machine type"
+    depends on MACH_JZ
+    default JZ4740_QI_LB60
+
+config JZ4740_QI_LB60
+	bool "Qi Hardware Ben NanoNote"
+	select DMA_NONCOHERENT
+	select SOC_JZ4740
+
+endchoice
+
+config SOC_JZ4740
+	bool
+	select JZSOC
+	select GENERIC_GPIO
+	select ARCH_REQUIRE_GPIOLIB
+	select SYS_HAS_EARLY_PRINTK
+	select SYS_SUPPORTS_LITTLE_ENDIAN
+	select IRQ_CPU
+
+config JZSOC
+	bool
+	select JZRISC
+	select SYS_HAS_CPU_MIPS32_R1
+	select SYS_SUPPORTS_32BIT_KERNEL
+
+config JZRISC
+	bool
diff --git a/target/linux/xburst/patches-2.6.31/001-core.patch b/target/linux/xburst/patches-2.6.31/001-core.patch
index 7084ec582..acaf5880f 100644
--- a/target/linux/xburst/patches-2.6.31/001-core.patch
+++ b/target/linux/xburst/patches-2.6.31/001-core.patch
@@ -26,39 +26,24 @@ diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
 index 3ca0fe1..e8f8027 100644
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -671,6 +671,32 @@ source "arch/mips/cavium-octeon/Kconfig"
+@@ -158,6 +158,9 @@
+ 	 Members include the Acer PICA, MIPS Magnum 4000, MIPS Millennium and
+ 	 Olivetti M700-10 workstations.
  
- endmenu
- 
-+#####################################################
-+# Ingenic SOC series
-+#####################################################
++config MACH_JZ
++	bool "Ingenic JZ4720/JZ4740 based machines"
 +
-+config SOC_JZ4720
-+	bool
-+	select JZSOC
-+
-+config SOC_JZ4740
-+	bool
-+	select JZSOC
-+	select GENERIC_GPIO
-+	select ARCH_REQUIRE_GPIOLIB
-+	select SYS_HAS_EARLY_PRINTK
-+
-+config JZSOC
-+	bool
-+	select JZRISC
-+	select SYS_HAS_CPU_MIPS32_R1
-+	select SYS_SUPPORTS_32BIT_KERNEL
-+
-+config JZRISC
-+	bool
-+
-+####################################################
-+
- config RWSEM_GENERIC_SPINLOCK
- 	bool
- 	default y
+ config LASAT
+ 	bool "LASAT Networks platforms"
+ 	select CEVT_R4K
+@@ -661,6 +664,7 @@
+ source "arch/mips/alchemy/Kconfig"
+ source "arch/mips/basler/excite/Kconfig"
+ source "arch/mips/jazz/Kconfig"
++source "arch/mips/jz4740/Kconfig"
+ source "arch/mips/lasat/Kconfig"
+ source "arch/mips/pmc-sierra/Kconfig"
+ source "arch/mips/sgi-ip27/Kconfig"
 @@ -1893,6 +1919,14 @@ config NR_CPUS
  
  source "kernel/time/Kconfig"
diff --git a/target/linux/xburst/patches-2.6.31/200-qi_lb60.patch b/target/linux/xburst/patches-2.6.31/200-qi_lb60.patch
index 6d808d7fc..296345d33 100644
--- a/target/linux/xburst/patches-2.6.31/200-qi_lb60.patch
+++ b/target/linux/xburst/patches-2.6.31/200-qi_lb60.patch
@@ -18,25 +18,6 @@ Subject: [PATCH] qi_lb60
  mode change 100755 => 100644 drivers/video/jzlcd.c
  mode change 100755 => 100644 drivers/video/jzlcd.h
 
-diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
-index 4ae3315..24e775f 100644
---- a/arch/mips/Kconfig
-+++ b/arch/mips/Kconfig
-@@ -656,6 +656,14 @@ config CAVIUM_OCTEON_REFERENCE_BOARD
- 		Hikari
- 	  Say Y here for most Octeon reference boards.
- 
-+config JZ4740_QI_LB60
-+	bool "Ingenic JZ4740 QI_LB60 board"
-+	select DMA_NONCOHERENT
-+	select SYS_HAS_CPU_MIPS32_R1
-+	select SYS_SUPPORTS_32BIT_KERNEL
-+	select SYS_SUPPORTS_LITTLE_ENDIAN
-+	select SOC_JZ4740
-+
- endchoice
- 
- source "arch/mips/alchemy/Kconfig"
 diff --git a/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h b/arch/mips/include/asm/mach-jz4740/board-qi_lb60.h
 new file mode 100644
 index 0000000..b2f02f4