mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-08-24 22:18:04 +03:00
linux/generic: fix a mistake in 2.6.37/089-mtd-samsung-flash.patch. (thank you maddes)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23957 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
30062312e2
commit
f2e717e983
@ -1,28 +1,21 @@
|
|||||||
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
+++ b/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
|
// manufacturers defined in include/linux/mtd/cfi.h
|
||||||
|
|
||||||
- if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
|
- if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e &&
|
||||||
- extp->MajorVersion == '0')
|
- 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 &&
|
+ if (cfi->mfr == CFI_MFR_SAMSUNG &&
|
||||||
+ extp->MajorVersion == '0') {
|
+ extp->MajorVersion == '0') {
|
||||||
+ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
|
+ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
|
||||||
+ extp->MajorVersion, extp->MinorVersion);
|
+ extp->MajorVersion, extp->MinorVersion);
|
||||||
+
|
+
|
||||||
+ extp->MajorVersion = '1';
|
extp->MajorVersion = '1';
|
||||||
+ extp->MinorVersion = '0';
|
+ extp->MinorVersion = '0';
|
||||||
+
|
+
|
||||||
+ printk(" to %c.%c.\n",
|
+ printk(" to %c.%c.\n",
|
||||||
+ extp->MajorVersion, extp->MinorVersion);
|
+ extp->MajorVersion, extp->MinorVersion);
|
||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ if (cfi->mfr == CFI_MFR_SAMSUNG &&
|
+ if (cfi->mfr == CFI_MFR_SAMSUNG &&
|
||||||
@ -33,11 +26,13 @@
|
|||||||
+ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
|
+ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c",
|
||||||
+ extp->MajorVersion, extp->MinorVersion);
|
+ 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';
|
+ extp->MinorVersion = '3';
|
||||||
+
|
+
|
||||||
+ printk(" to %c.%c.\n",
|
+ printk(" to %c.%c.\n",
|
||||||
+ extp->MajorVersion, extp->MinorVersion);
|
+ extp->MajorVersion, extp->MinorVersion);
|
||||||
}
|
+ }
|
||||||
}
|
+
|
||||||
|
/*
|
||||||
|
* SST 38VF640x chips report major=0xFF / minor=0xFF.
|
||||||
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user