From 9f39c015a8776a671d2ebf3ceb93a83249ed1045 Mon Sep 17 00:00:00 2001 From: florian Date: Tue, 10 Aug 2010 20:23:40 +0000 Subject: [kernel] rename 014-samsung_flash patch to a better name, thanks maddes git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22587 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../014-cfi_fix_amd_extended_table_check.patch | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 target/linux/generic/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch (limited to 'target/linux/generic/patches-2.6.30/014-cfi_fix_amd_extended_table_check.patch') 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 000000000..5c835081b --- /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 */ -- cgit v1.2.3