adjust patches and config once again...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15875 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/s3c24xx/config-2.6.29

@@ -5,56 +5,19 @@ CONFIG_APM_POWER=y
 CONFIG_AR6000_WLAN=y
 # CONFIG_AR6000_WLAN_DEBUG is not set
 # CONFIG_AR6000_WLAN_RESET is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91 is not set
 # CONFIG_ARCH_BAST is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_DAVINCI is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_EP93XX is not set
 CONFIG_ARCH_FLATMEM_HAS_HOLES=y
-# CONFIG_ARCH_FOOTBRIDGE is not set
 # CONFIG_ARCH_H1940 is not set
-# CONFIG_ARCH_H720X is not set
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP13XX is not set
-# CONFIG_ARCH_IOP32X is not set
-# CONFIG_ARCH_IOP33X is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_IXP23XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_KIRKWOOD is not set
-# CONFIG_ARCH_KS8695 is not set
-# CONFIG_ARCH_L7200 is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_LOKI is not set
-# CONFIG_ARCH_MSM is not set
-# CONFIG_ARCH_MV78XX0 is not set
-# CONFIG_ARCH_MXC is not set
-# CONFIG_ARCH_NETX is not set
-# CONFIG_ARCH_NS9XXX is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_ORION5X is not set
-# CONFIG_ARCH_PNX4008 is not set
-# CONFIG_ARCH_PXA is not set
-# CONFIG_ARCH_REALVIEW is not set
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
-# CONFIG_ARCH_RPC is not set
 CONFIG_ARCH_S3C2410=y
 CONFIG_ARCH_S3C2440=y
-# CONFIG_ARCH_S3C64XX is not set
-# CONFIG_ARCH_SA1100 is not set
 # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set
-# CONFIG_ARCH_SHARK is not set
 # CONFIG_ARCH_SMDK2410 is not set
 # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set
 # CONFIG_ARCH_SUPPORTS_MSI is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_W90X900 is not set
 CONFIG_ARM=y
 CONFIG_ARM_THUMB=y
 # CONFIG_ARPD is not set
@@ -80,7 +43,6 @@ CONFIG_CHARGER_PCF50606=y
 CONFIG_CHARGER_PCF50633=y
 CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
 CONFIG_COMPAT_BRK=y
-CONFIG_COMPAT_NET_DEV_OPS=y
 CONFIG_CONSOLE_TRANSLATIONS=y
 CONFIG_CPU_32=y
 CONFIG_CPU_32v4T=y
@@ -136,8 +98,6 @@ CONFIG_DEBUG_BUGVERBOSE=y
 CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_S3C_UART=2
 # CONFIG_DEBUG_USER is not set
-CONFIG_DEFAULT_VEGAS=y
-# CONFIG_DEFAULT_WESTWOOD is not set
 # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
 CONFIG_DISPLAY_JBT6K74=y
 # CONFIG_DISPLAY_L1K002 is not set
@@ -393,7 +353,6 @@ CONFIG_PCF50633_ADC=y
 CONFIG_PCF50633_GPIO=y
 # CONFIG_PCI_SYSCALL is not set
 CONFIG_PDA_POWER=y
-# CONFIG_PHYS_ADDR_T_64BIT is not set
 CONFIG_PLAT_S3C=y
 CONFIG_PLAT_S3C24XX=y
 CONFIG_PM=y
@@ -476,7 +435,6 @@ CONFIG_SOUND=m
 CONFIG_SPI=y
 CONFIG_SPI_BITBANG=y
 # CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_GPIO_OLD is not set
 CONFIG_SPI_MASTER=y
 CONFIG_SPI_S3C24XX=y
 CONFIG_SPI_S3C24XX_GPIO=y

target/linux/s3c24xx/patches-2.6.29/001-merge-openmoko.patch

@@ -86936,54 +86936,6 @@ diff -ruN --exclude='*.orig' --exclude='*.rej' linux-2.6.29-rc3.owrt/drivers/vid
  config FB_S3C2410
  	tristate "S3C2410 LCD framebuffer support"
  	depends on FB && ARCH_S3C2410
-diff -ruN --exclude='*.orig' --exclude='*.rej' linux-2.6.29-rc3.owrt/drivers/video/logo/Kconfig linux-2.6.29-rc3.owrt.om/drivers/video/logo/Kconfig
---- linux-2.6.29-rc3.owrt/drivers/video/logo/Kconfig	2009-05-10 22:04:48.000000000 +0200
-+++ linux-2.6.29-rc3.owrt.om/drivers/video/logo/Kconfig	2009-05-10 22:28:00.000000000 +0200
-@@ -77,6 +77,11 @@
- 	depends on SUPERH
- 	default y
- 
-+config LOGO_OPENMOKO_CLUT224
-+	bool "224-color Openmoko Linux logo"
-+	depends on MACH_NEO1973_GTA01 || MACH_NEO1973_GTA02
-+	default y
-+
- config LOGO_M32R_CLUT224
- 	bool "224-color M32R Linux logo"
- 	depends on M32R
-diff -ruN --exclude='*.orig' --exclude='*.rej' linux-2.6.29-rc3.owrt/drivers/video/logo/logo.c linux-2.6.29-rc3.owrt.om/drivers/video/logo/logo.c
---- linux-2.6.29-rc3.owrt/drivers/video/logo/logo.c	2009-05-10 22:04:48.000000000 +0200
-+++ linux-2.6.29-rc3.owrt.om/drivers/video/logo/logo.c	2009-05-10 22:28:00.000000000 +0200
-@@ -35,6 +35,7 @@
- extern const struct linux_logo logo_superh_vga16;
- extern const struct linux_logo logo_superh_clut224;
- extern const struct linux_logo logo_m32r_clut224;
-+extern const struct linux_logo logo_openmoko_clut224;
- 
- static int nologo;
- module_param(nologo, bool, 0);
-@@ -115,6 +116,10 @@
- 		/* M32R Linux logo */
- 		logo = &logo_m32r_clut224;
- #endif
-+#ifdef CONFIG_LOGO_OPENMOKO_CLUT224
-+		/* Openmoko Linux logo */
-+		logo = &logo_openmoko_clut224;
-+#endif
- 	}
- 	return logo;
- }
-diff -ruN --exclude='*.orig' --exclude='*.rej' linux-2.6.29-rc3.owrt/drivers/video/logo/Makefile linux-2.6.29-rc3.owrt.om/drivers/video/logo/Makefile
---- linux-2.6.29-rc3.owrt/drivers/video/logo/Makefile	2009-05-10 22:04:48.000000000 +0200
-+++ linux-2.6.29-rc3.owrt.om/drivers/video/logo/Makefile	2009-05-10 22:28:00.000000000 +0200
-@@ -15,6 +15,7 @@
- obj-$(CONFIG_LOGO_SUPERH_VGA16)		+= logo_superh_vga16.o
- obj-$(CONFIG_LOGO_SUPERH_CLUT224)	+= logo_superh_clut224.o
- obj-$(CONFIG_LOGO_M32R_CLUT224)		+= logo_m32r_clut224.o
-+obj-$(CONFIG_LOGO_OPENMOKO_CLUT224)	+= logo_openmoko_clut224.o
- 
- obj-$(CONFIG_SPU_BASE)			+= logo_spe_clut224.o
- 
 diff -ruN --exclude='*.orig' --exclude='*.rej' linux-2.6.29-rc3.owrt/drivers/video/Makefile linux-2.6.29-rc3.owrt.om/drivers/video/Makefile
 --- linux-2.6.29-rc3.owrt/drivers/video/Makefile	2009-05-10 22:04:48.000000000 +0200
 +++ linux-2.6.29-rc3.owrt.om/drivers/video/Makefile	2009-05-10 22:28:00.000000000 +0200