From 6828466d4f43587f8277680bc3e11114145e613c Mon Sep 17 00:00:00 2001
From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 9 May 2010 09:25:41 +0000
Subject: [kernel] make etrax samsung flash patch generic (#6552)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21408 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
target/linux/etrax/patches-2.6.32/200-samsung_flash.patch | 11 -----------
.../generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch | 11 +++++++++++
.../generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch | 11 +++++++++++
.../generic-2.6/patches-2.6.34/089-mtd-samsung-flash.patch | 11 +++++++++++
4 files changed, 33 insertions(+), 11 deletions(-)
delete mode 100644 target/linux/etrax/patches-2.6.32/200-samsung_flash.patch
create mode 100644 target/linux/generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch
create mode 100644 target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch
create mode 100644 target/linux/generic-2.6/patches-2.6.34/089-mtd-samsung-flash.patch
(limited to 'target')
diff --git a/target/linux/etrax/patches-2.6.32/200-samsung_flash.patch b/target/linux/etrax/patches-2.6.32/200-samsung_flash.patch
deleted file mode 100644
index eab03db50d..0000000000
--- a/target/linux/etrax/patches-2.6.32/200-samsung_flash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -374,7 +374,7 @@ struct mtd_info *cfi_cmdset_0002(struct
-
- cfi_fixup_major_minor(cfi, extp);
-
-- if (extp->MajorVersion != '1' ||
-+ if (extp->MajorVersion < '0' || extp->MajorVersion > '3' ||
- (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
- if (cfi->mfr == MANUFACTURER_SAMSUNG &&
- (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
diff --git a/target/linux/generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch b/target/linux/generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch
new file mode 100644
index 0000000000..eab03db50d
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.32/089-mtd-samsung-flash.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -374,7 +374,7 @@ struct mtd_info *cfi_cmdset_0002(struct
+
+ cfi_fixup_major_minor(cfi, extp);
+
+- if (extp->MajorVersion != '1' ||
++ if (extp->MajorVersion < '0' || extp->MajorVersion > '3' ||
+ (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
+ if (cfi->mfr == MANUFACTURER_SAMSUNG &&
+ (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
diff --git a/target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch b/target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch
new file mode 100644
index 0000000000..eab03db50d
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.33/089-mtd-samsung-flash.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -374,7 +374,7 @@ struct mtd_info *cfi_cmdset_0002(struct
+
+ cfi_fixup_major_minor(cfi, extp);
+
+- if (extp->MajorVersion != '1' ||
++ if (extp->MajorVersion < '0' || extp->MajorVersion > '3' ||
+ (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
+ if (cfi->mfr == MANUFACTURER_SAMSUNG &&
+ (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
diff --git a/target/linux/generic-2.6/patches-2.6.34/089-mtd-samsung-flash.patch b/target/linux/generic-2.6/patches-2.6.34/089-mtd-samsung-flash.patch
new file mode 100644
index 0000000000..eab03db50d
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.34/089-mtd-samsung-flash.patch
@@ -0,0 +1,11 @@
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -374,7 +374,7 @@ struct mtd_info *cfi_cmdset_0002(struct
+
+ cfi_fixup_major_minor(cfi, extp);
+
+- if (extp->MajorVersion != '1' ||
++ if (extp->MajorVersion < '0' || extp->MajorVersion > '3' ||
+ (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
+ if (cfi->mfr == MANUFACTURER_SAMSUNG &&
+ (extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
--
cgit v1.2.3