From: Steffen Sledz <sledz@dresearch.de>
Date: Thu, 10 Mar 2011 17:44:00 +0000 (+0100)
Subject: linux-2.6.24: add support for AMIC flashes (e.g. A29L160AT)
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6596c3d073af52397f67283bb05e86e3964b67a;p=openembedded.git

linux-2.6.24: add support for AMIC flashes (e.g. A29L160AT)

Similar patch is on its way to the mainline kernel:
http://thread.gmane.org/gmane.linux.kernel/1111144

Signed-off-by: Steffen Sledz <sledz@dresearch.de>
---

diff --git a/recipes/linux/linux-2.6.24/cfi-amic.patch b/recipes/linux/linux-2.6.24/cfi-amic.patch
new file mode 100644
index 0000000000..feb673f73f
--- /dev/null
+++ b/recipes/linux/linux-2.6.24/cfi-amic.patch
@@ -0,0 +1,22 @@
+diff -Nurd linux-2.6.24.orig//drivers/mtd/chips/cfi_cmdset_0002.c linux-2.6.24/drivers/mtd/chips/cfi_cmdset_0002.c
+--- linux-2.6.24.orig//drivers/mtd/chips/cfi_cmdset_0002.c	2011-03-10 17:05:22.868634509 +0100
++++ linux-2.6.24/drivers/mtd/chips/cfi_cmdset_0002.c	2011-03-10 17:06:58.723636256 +0100
+@@ -219,6 +219,7 @@
+ static struct cfi_fixup cfi_fixup_table[] = {
+ #ifdef AMD_BOOTLOC_BUG
+ 	{ CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock, NULL },
++	{ CFI_MFR_AMIC, CFI_ID_ANY, fixup_amd_bootblock, NULL },
+ #endif
+ 	{ CFI_MFR_AMD, 0x0050, fixup_use_secsi, NULL, },
+ 	{ CFI_MFR_AMD, 0x0053, fixup_use_secsi, NULL, },
+diff -Nurd linux-2.6.24.orig//include/linux/mtd/cfi.h linux-2.6.24/include/linux/mtd/cfi.h
+--- linux-2.6.24.orig//include/linux/mtd/cfi.h	2011-03-10 17:05:19.584884614 +0100
++++ linux-2.6.24/include/linux/mtd/cfi.h	2011-03-10 17:08:03.886636402 +0100
+@@ -485,6 +485,7 @@
+ #define CFI_ID_ANY  0xffff
+ 
+ #define CFI_MFR_AMD 0x0001
++#define CFI_MFR_AMIC 0x0037
+ #define CFI_MFR_ATMEL 0x001F
+ #define CFI_MFR_ST  0x0020 	/* STMicroelectronics */
+ 
diff --git a/recipes/linux/linux_2.6.24.bb b/recipes/linux/linux_2.6.24.bb
index d03d2b7613..5c05593c39 100644
--- a/recipes/linux/linux_2.6.24.bb
+++ b/recipes/linux/linux_2.6.24.bb
@@ -11,13 +11,14 @@ DEFAULT_PREFERENCE_hipox = "1"
 DEFAULT_PREFERENCE_cs-e9302 = "1"
 DEFAULT_PREFERENCE_smartq5 = "1"
 
-PR = "r35"
+PR = "r36"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2;name=kernel \
            ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/patch-${PV}.7.bz2;apply=yes;name=stablepatch \
            file://squashfs-lzma-2.6.24.patch \
            file://ubifs-v2.6.24.patch \
            file://ubifs-v2.6.24-silent-get-sb.patch \
+           file://cfi-amic.patch \
            file://defconfig"
 
 # Moved away temporarely until committed properly (work in progress).