aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-kernel
diff options
context:
space:
mode:
authorAndrea Adami <andrea.adami@gmail.com>2013-07-17 01:28:22 +0200
committerAndrea Adami <andrea.adami@gmail.com>2013-07-19 00:59:17 +0200
commit1cc2807168a1ef1b638a7175bb305aa9d2e04744 (patch)
treef34456687e4816d5d8688659a47a5acf9f238505 /recipes-kernel
parentbb01e15b3fc14cca5688a1193464c5cc72258fcd (diff)
downloadmeta-handheld-1cc2807168a1ef1b638a7175bb305aa9d2e04744.tar.gz
linux-yocto-tiny-kexecboot_3.8: resync collie-eraseinfo.patch with linux-yocto_3.8
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Diffstat (limited to 'recipes-kernel')
-rw-r--r--recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mtd/collie-eraseinfo.patch25
1 files changed, 19 insertions, 6 deletions
diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mtd/collie-eraseinfo.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mtd/collie-eraseinfo.patch
index b5f9916..0a8ebac 100644
--- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mtd/collie-eraseinfo.patch
+++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.8/patches/patches-mtd/collie-eraseinfo.patch
@@ -1,14 +1,24 @@
-* Zaurus 5500 contains 2 LH28F640BFHE-PTTL90 (64M 4Mx16) and
-* the LH28F640BFHE-PTTL90.pdf datasheet available on the net shows
-* the exact erasesize and the OTP support.
-* At the moment only jedec_probe can discover the chip and
-* the NOR is mounted read only probably because of wrong vpp
+From 1fc59077a0f5a1f338c94e9dc2ef356f821d2614 Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Mon, 15 Jul 2013 01:18:19 +0200
+Subject: [PATCH] jedec_probe.c: fix LH28F640BF definition
+
+Zaurus 5500 contains 2 LH28F640BFHE-PTTL90 (64M 4Mx16) and
+the LH28F640BFHE-PTTL90.pdf datasheet available on the net shows
+the exact erasesize and the OTP support.
+At the moment only jedec_probe can discover the chip and
+the NOR is mounted read only probably because of wrong vpp.
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Upstream-Status: Submitted
http://lists.infradead.org/pipermail/linux-mtd/2013-February/045781.html
+---
+ drivers/mtd/chips/jedec_probe.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+diff --git a/drivers/mtd/chips/jedec_probe.c b/drivers/mtd/chips/jedec_probe.c
+index c443f52..7c0b27d 100644
--- a/drivers/mtd/chips/jedec_probe.c
+++ b/drivers/mtd/chips/jedec_probe.c
@@ -120,7 +120,7 @@
@@ -20,7 +30,7 @@ http://lists.infradead.org/pipermail/linux-mtd/2013-February/045781.html
/* ST - www.st.com */
#define M29F800AB 0x0058
-@@ -1299,13 +1299,14 @@
+@@ -1299,13 +1299,14 @@ static const struct amd_flash_info jedec_table[] = {
.mfr_id = CFI_MFR_SHARP,
.dev_id = LH28F640BF,
.name = "LH28F640BF",
@@ -40,3 +50,6 @@ http://lists.infradead.org/pipermail/linux-mtd/2013-February/045781.html
}
}, {
.mfr_id = CFI_MFR_SST,
+--
+1.8.1.5
+