linux-openmoko: remove old version based on 2.6.29-rc3, switch gta01 to 2.6.34

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

5 files changed, 1 insertions, 300 deletions

diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 1cc4c71e5d..55391bb2d5 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -6,7 +6,7 @@
 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.29"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
 
diff --git a/recipes/linux/linux-openmoko-2.6.29/0007-Enable-UBI-UBIFS.patch b/recipes/linux/linux-openmoko-2.6.29/0007-Enable-UBI-UBIFS.patch
deleted file mode 100644
index dd40bc81fe..0000000000
--- a/recipes/linux/linux-openmoko-2.6.29/0007-Enable-UBI-UBIFS.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 8f907c17c068beb94264a4a6d40314658a0c1393 Mon Sep 17 00:00:00 2001
-From: Martin Jansa <Martin.Jansa@gmail.com>
-Date: Sun, 8 Nov 2009 10:58:28 +0100
-Subject: [PATCH 7/7] Enable UBI/UBIFS
-
----
- arch/arm/configs/gta02_packaging_defconfig |   39 ++++++++++++++++++++++++++++++---
- 1 files changed, 35 insertions(+), 4 deletions(-)
-
-diff --git a/arch/arm/configs/gta02_packaging_defconfig b/arch/arm/configs/gta02_packaging_defconfig
-index e17ddc3..7506963 100644
---- a/arch/arm/configs/gta02_packaging_defconfig
-+++ b/arch/arm/configs/gta02_packaging_defconfig
-@@ -806,7 +806,30 @@ CONFIG_MTD_NAND_S3C2410_HWECC=y
- #
- # UBI - Unsorted block images
- #
--# CONFIG_MTD_UBI is not set
-+CONFIG_MTD_UBI=y
-+CONFIG_MTD_UBI_WL_THRESHOLD=4096
-+CONFIG_MTD_UBI_BEB_RESERVE=1
-+CONFIG_MTD_UBI_GLUEBI=y
-+
-+#
-+# UBI debugging options
-+#
-+CONFIG_MTD_UBI_DEBUG=y
-+# CONFIG_MTD_UBI_DEBUG_MSG is not set
-+# CONFIG_MTD_UBI_DEBUG_PARANOID is not set
-+CONFIG_MTD_UBI_DEBUG_DISABLE_BGT=y
-+# CONFIG_MTD_UBI_DEBUG_USERSPACE_IO is not set
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set
-+
-+#
-+# Additional UBI debugging messages
-+#
-+# CONFIG_MTD_UBI_DEBUG_MSG_BLD is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
- # CONFIG_PARPORT is not set
- CONFIG_BLK_DEV=y
- # CONFIG_BLK_DEV_COW_COMMON is not set
-@@ -1877,6 +1900,12 @@ CONFIG_JFFS2_ZLIB=y
- # CONFIG_JFFS2_LZO is not set
- CONFIG_JFFS2_RTIME=y
- # CONFIG_JFFS2_RUBIN is not set
-+CONFIG_UBIFS_FS=y
-+# CONFIG_UBIFS_FS_XATTR is not set
-+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-+CONFIG_UBIFS_FS_LZO=y
-+CONFIG_UBIFS_FS_ZLIB=y
-+# CONFIG_UBIFS_FS_DEBUG is not set
- CONFIG_CRAMFS=y
- CONFIG_SQUASHFS=m
- # CONFIG_SQUASHFS_EMBEDDED is not set
-@@ -2151,8 +2180,8 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
- #
- # Compression
- #
--CONFIG_CRYPTO_DEFLATE=m
--# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_DEFLATE=y
-+CONFIG_CRYPTO_LZO=y
- 
- #
- # Random Number Generation
-@@ -2174,6 +2203,8 @@ CONFIG_CRC32=y
- CONFIG_LIBCRC32C=m
- CONFIG_ZLIB_INFLATE=y
- CONFIG_ZLIB_DEFLATE=y
-+CONFIG_LZO_COMPRESS=y
-+CONFIG_LZO_DECOMPRESS=y
- CONFIG_TEXTSEARCH=y
- CONFIG_TEXTSEARCH_KMP=m
- CONFIG_TEXTSEARCH_BM=m
-diff --git a/arch/arm/configs/gta01_moredrivers_defconfig b/arch/arm/configs/gta01_moredrivers_defconfig
-index e17ddc3..7506963 100644
---- a/arch/arm/configs/gta01_moredrivers_defconfig
-+++ b/arch/arm/configs/gta01_moredrivers_defconfig
-@@ -806,7 +806,30 @@ CONFIG_MTD_NAND_S3C2410_HWECC=y
- #
- # UBI - Unsorted block images
- #
--# CONFIG_MTD_UBI is not set
-+CONFIG_MTD_UBI=y
-+CONFIG_MTD_UBI_WL_THRESHOLD=4096
-+CONFIG_MTD_UBI_BEB_RESERVE=1
-+CONFIG_MTD_UBI_GLUEBI=y
-+
-+#
-+# UBI debugging options
-+#
-+CONFIG_MTD_UBI_DEBUG=y
-+# CONFIG_MTD_UBI_DEBUG_MSG is not set
-+# CONFIG_MTD_UBI_DEBUG_PARANOID is not set
-+CONFIG_MTD_UBI_DEBUG_DISABLE_BGT=y
-+# CONFIG_MTD_UBI_DEBUG_USERSPACE_IO is not set
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set
-+# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set
-+
-+#
-+# Additional UBI debugging messages
-+#
-+# CONFIG_MTD_UBI_DEBUG_MSG_BLD is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_EBA is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_WL is not set
-+# CONFIG_MTD_UBI_DEBUG_MSG_IO is not set
- # CONFIG_PARPORT is not set
- CONFIG_BLK_DEV=y
- # CONFIG_BLK_DEV_COW_COMMON is not set
-@@ -1877,6 +1900,12 @@ CONFIG_JFFS2_ZLIB=y
- # CONFIG_JFFS2_LZO is not set
- CONFIG_JFFS2_RTIME=y
- # CONFIG_JFFS2_RUBIN is not set
-+CONFIG_UBIFS_FS=y
-+# CONFIG_UBIFS_FS_XATTR is not set
-+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
-+CONFIG_UBIFS_FS_LZO=y
-+CONFIG_UBIFS_FS_ZLIB=y
-+# CONFIG_UBIFS_FS_DEBUG is not set
- CONFIG_CRAMFS=y
- CONFIG_SQUASHFS=m
- # CONFIG_SQUASHFS_EMBEDDED is not set
-@@ -2151,8 +2180,8 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m
- #
- # Compression
- #
--CONFIG_CRYPTO_DEFLATE=m
--# CONFIG_CRYPTO_LZO is not set
-+CONFIG_CRYPTO_DEFLATE=y
-+CONFIG_CRYPTO_LZO=y
- 
- #
- # Random Number Generation
-@@ -2174,6 +2203,8 @@ CONFIG_CRC32=y
- CONFIG_LIBCRC32C=m
- CONFIG_ZLIB_INFLATE=y
- CONFIG_ZLIB_DEFLATE=y
-+CONFIG_LZO_COMPRESS=y
-+CONFIG_LZO_DECOMPRESS=y
- CONFIG_TEXTSEARCH=y
- CONFIG_TEXTSEARCH_KMP=m
- CONFIG_TEXTSEARCH_BM=m
--- 
-1.6.5.2
diff --git a/recipes/linux/linux-openmoko-2.6.29/fix-install.patch b/recipes/linux/linux-openmoko-2.6.29/fix-install.patch
deleted file mode 100644
index b14ca7d740..0000000000
--- a/recipes/linux/linux-openmoko-2.6.29/fix-install.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Steve Sakoman <steve@sakoman.com>
-Date: Mon, 18 Aug 2008 16:07:31 +0000 (-0700)
-Subject: scripts/Makefile.fwinst: add missing space when setting mode in cmd_install
-X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=f039944bdd491cde7327133e9976881d3133ae70
-
-scripts/Makefile.fwinst: add missing space when setting mode in cmd_install
-
-This was causing build failures on some machines
----
-
-diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst
-index 6bf8e87..fb20532 100644
---- a/scripts/Makefile.fwinst
-+++ b/scripts/Makefile.fwinst
-@@ -37,7 +37,7 @@
-        @true
-
- quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@)
--      cmd_install = $(INSTALL) -m0644 $< $@
-+      cmd_install = $(INSTALL) -m 0644 $< $@
-
- $(installed-fw-dirs):
-        $(call cmd,mkdir)
diff --git a/recipes/linux/linux-openmoko-2.6.29/touchscreen_ignoreunexpectedintr29.patch b/recipes/linux/linux-openmoko-2.6.29/touchscreen_ignoreunexpectedintr29.patch
deleted file mode 100644
index cb99dd889d..0000000000
--- a/recipes/linux/linux-openmoko-2.6.29/touchscreen_ignoreunexpectedintr29.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
-index bcfdd00..73994ff 100644
---- a/drivers/input/touchscreen/s3c2410_ts.c
-+++ b/drivers/input/touchscreen/s3c2410_ts.c
-@@ -47,6 +47,9 @@
-  * 2009-04-09: Nelson Castillo <arhuaco@freaks-unidos.net>
-  *      - Use s3c-adc API (Vasily Khoruzhick <anarsoul@gmail.com> provided
-  *        a working example for a simpler version of this driver).
-+
-+ * 2010-06-01: Gennady Kupava <gb@bsdmn.com>
-+ *      - Improve interrupt handling
-  */
- 
- #include <linux/errno.h>
-@@ -118,10 +121,15 @@ struct s3c2410ts {
- 	struct kfifo *event_fifo;
- 	struct s3c_adc_client *adc_client;
- 	unsigned adc_selected;
-+	int expectedintr; /* which interrupt we are waiting for */
- };
- 
- static struct s3c2410ts ts;
- 
-+#define WAITFORINT_UP (0)
-+#define WAITFORINT_DOWN (1)
-+#define WAITFORINT_NOTHING (2)
-+
- static void __iomem *base_addr;
- 
- /*
-@@ -280,6 +288,19 @@ static irqreturn_t stylus_updown(int irq, void *dev_id)
- 	ts.is_down = !(data0 & S3C2410_ADCDAT0_UPDOWN) &&
- 		     !(data1 & S3C2410_ADCDAT0_UPDOWN);
- 
-+	/* situations below can actually happen on openmoko hardware while
-+	   various debugging facilities are turned off */
-+	if (ts.expectedintr == WAITFORINT_NOTHING)
-+	  return IRQ_HANDLED;
-+	if (!ts.is_down && ts.expectedintr == WAITFORINT_DOWN) {
-+	  writel(WAIT4INT (0), base_addr + S3C2410_ADCTSC);
-+	  return IRQ_HANDLED;
-+	} else if (ts.is_down && ts.expectedintr == WAITFORINT_UP) {
-+	  writel(WAIT4INT (1), base_addr + S3C2410_ADCTSC);
-+	  return IRQ_HANDLED;
-+	}
-+	ts.expectedintr = WAITFORINT_NOTHING;
-+
- 	event_type = ts.is_down ? 'D' : 'U';
- 
- 	if (unlikely(__kfifo_put(ts.event_fifo, (unsigned char *)&event_type,
-@@ -289,8 +310,10 @@ static irqreturn_t stylus_updown(int irq, void *dev_id)
- 
- 	if (ts.is_down)
- 		s3c2410_ts_start_adc_conversion();
--	else
-+	else {
-+		ts.expectedintr = WAITFORINT_DOWN;
- 		writel(WAIT4INT(0), base_addr + S3C2410_ADCTSC);
-+	}
- 
- 	mod_timer(&event_send_timer, jiffies + 1);
- 
-@@ -325,6 +348,7 @@ static void stylus_adc_action(unsigned p0, unsigned p1, unsigned *conv_left)
- 	case -1:
- 		/* Too much noise. Ignore the event. */
- 		ts_filter_chain_clear(ts.chain);
-+		ts.expectedintr = WAITFORINT_UP;
- 		writel(WAIT4INT(1), base_addr + S3C2410_ADCTSC);
- 		return;
- 	};
-@@ -334,6 +358,7 @@ static void stylus_adc_action(unsigned p0, unsigned p1, unsigned *conv_left)
- 		/* This will only happen if we have a bug. */
- 		TSPRINTK("FIFO full\n");
- 
-+	ts.expectedintr = WAITFORINT_UP;
- 	writel(WAIT4INT(1), base_addr + S3C2410_ADCTSC);
- 	mod_timer(&event_send_timer, jiffies + 1);
- 
-@@ -371,6 +396,7 @@ static int __init s3c2410ts_probe(struct platform_device *pdev)
- 	if (!strcmp(pdev->name, "s3c2410-ts"))
- 		s3c2410_ts_connect();
- 
-+	ts.expectedintr = WAITFORINT_DOWN;
- 	writel(WAIT4INT(0), base_addr + S3C2410_ADCTSC);
- 
- 	/* Initialise input stuff */
-@@ -481,6 +507,7 @@ static int s3c2410ts_remove(struct platform_device *pdev)
- 
- static int s3c2410ts_suspend(struct platform_device *pdev, pm_message_t state)
- {
-+	ts.expectedintr = WAITFORINT_NOTHING;
- 	writel(TSC_SLEEP, base_addr + S3C2410_ADCTSC);
- 	writel(readl(base_addr + S3C2410_ADCCON) | S3C2410_ADCCON_STDBM,
- 	       base_addr + S3C2410_ADCCON);
-@@ -492,6 +519,7 @@ static int s3c2410ts_suspend(struct platform_device *pdev, pm_message_t state)
- static int s3c2410ts_resume(struct platform_device *pdev)
- {
- 	ts_filter_chain_clear(ts.chain);
-+	ts.expectedintr = WAITFORINT_DOWN;
- 	enable_irq(IRQ_TC);
- 	writel(WAIT4INT(0), base_addr + S3C2410_ADCTSC);
- 
diff --git a/recipes/linux/linux-openmoko-2.6.29_git.bb b/recipes/linux/linux-openmoko-2.6.29_git.bb
deleted file mode 100644
index 8b603ecbac..0000000000
--- a/recipes/linux/linux-openmoko-2.6.29_git.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-require linux.inc
-require linux-openmoko.inc
-
-KERNEL_RELEASE = "2.6.29"
-KERNEL_VERSION = "2.6.29-rc3"
-
-SRCREV = "973a41fce60e5f6edfcf0eaf94056a57eee65e16"
-OMV = "oe11"
-PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCPV}"
-PR = "r9"
-
-SRC_URI = "\
-  git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \
-  file://fix-install.patch \
-  file://0007-Enable-UBI-UBIFS.patch \
-  file://touchscreen_ignoreunexpectedintr29.patch \
-"
-S = "${WORKDIR}/git"
-
-CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig"
-CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig"
-
-do_configure_prepend() { 
-	install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig
-}