projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux/brcm47xx: properly fix r24096
[openwrt.git]
/
target
/
linux
/
generic
/
patches-2.6.37
/
089-mtd-samsung-flash.patch
diff --git
a/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch
b/target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch
index
03d890e
..
e4e56a0
100644
(file)
--- a/
target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch
+++ b/
target/linux/generic/patches-2.6.37/089-mtd-samsung-flash.patch
@@
-1,18
+1,12
@@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -394,
15 +394,31
@@ static void cfi_fixup_major_minor(struct
+@@ -394,
9 +394,33
@@ static void cfi_fixup_major_minor(struct
{
// manufacturers defined in include/linux/mtd/cfi.h
- if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
- extp->MajorVersion == '0')
- extp->MajorVersion = '1';
{
// manufacturers defined in include/linux/mtd/cfi.h
- if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
- extp->MajorVersion == '0')
- extp->MajorVersion = '1';
-- /*
-- * SST 38VF640x chips report major=0xFF / minor=0xFF.
-- */
-- if (cfi->mfr == CFI_MFR_SST && (cfi->id >> 4) == 0x0536) {
-- extp->MajorVersion = '1';
-- extp->MinorVersion = '0';
+ if (cfi->mfr == CFI_MFR_SAMSUNG &&
+ extp->MajorVersion == '0') {
+ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
+ if (cfi->mfr == CFI_MFR_SAMSUNG &&
+ extp->MajorVersion == '0') {
+ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
@@
-33,11
+27,13
@@
+ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
+ extp->MajorVersion, extp->MinorVersion);
+
+ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
+ extp->MajorVersion, extp->MinorVersion);
+
-+ extp->MajorVersion = '1'; // set to 1.3 (last defined version)
++ extp->MajorVersion = '1'; // set to 1.3 (last defined version)
+ extp->MinorVersion = '3';
+
+ printk(" to %c.%c.\n",
+ extp->MajorVersion, extp->MinorVersion);
+ extp->MinorVersion = '3';
+
+ printk(" to %c.%c.\n",
+ extp->MajorVersion, extp->MinorVersion);
- }
- }
-
++ }
++
+ /*
+ * SST 38VF640x chips report major=0xFF / minor=0xFF.
+ */
This page took
0.02522 seconds
and
4
git commands to generate.