diff options
| author | Florian Fainelli <florian@openwrt.org> | 2010-08-10 20:23:40 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2010-08-10 20:23:40 +0000 |
| commit | a5371dfe3909f14d45803efcfa5a85446f7954ac (patch) | |
| tree | 414cde9671d7f858e98f7f8834a134170fe4c63c /target/linux/generic/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch | |
| parent | b2cb720494b73b120109aab6433c04eaf824daba (diff) | |
| download | mtk-20170518-a5371dfe3909f14d45803efcfa5a85446f7954ac.zip mtk-20170518-a5371dfe3909f14d45803efcfa5a85446f7954ac.tar.gz mtk-20170518-a5371dfe3909f14d45803efcfa5a85446f7954ac.tar.bz2 | |
rename 014-samsung_flash patch to a better name, thanks maddes
SVN-Revision: 22587
Diffstat (limited to 'target/linux/generic/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch')
| -rw-r--r-- | target/linux/generic/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch b/target/linux/generic/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch new file mode 100644 index 0000000..5c83508 --- /dev/null +++ b/target/linux/generic/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch @@ -0,0 +1,36 @@ +--- a/drivers/mtd/chips/cfi_cmdset_0002.c ++++ b/drivers/mtd/chips/cfi_cmdset_0002.c +@@ -51,6 +51,7 @@ + #define SST49LF040B 0x0050 + #define SST49LF008A 0x005a + #define AT49BV6416 0x00d6 ++#define MANUFACTURER_SAMSUNG 0x00ec + + static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); + static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); +@@ -386,12 +387,19 @@ struct mtd_info *cfi_cmdset_0002(struct + + if (extp->MajorVersion != '1' || + (extp->MinorVersion < '0' || extp->MinorVersion > '4')) { +- printk(KERN_ERR " Unknown Amd/Fujitsu Extended Query " +- "version %c.%c.\n", extp->MajorVersion, +- extp->MinorVersion); +- kfree(extp); +- kfree(mtd); +- return NULL; ++ if (cfi->mfr == MANUFACTURER_SAMSUNG && ++ (extp->MajorVersion == '3' && extp->MinorVersion == '3')) { ++ printk(KERN_NOTICE " Newer Samsung flash detected, " ++ "should be compatibile with Amd/Fujitsu.\n"); ++ } ++ else { ++ printk(KERN_ERR " Unknown Amd/Fujitsu Extended Query " ++ "version %c.%c.\n", extp->MajorVersion, ++ extp->MinorVersion); ++ kfree(extp); ++ kfree(mtd); ++ return NULL; ++ } + } + + /* Install our own private info structure */ |