From a5371dfe3909f14d45803efcfa5a85446f7954ac Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 10 Aug 2010 20:23:40 +0000 Subject: rename 014-samsung_flash patch to a better name, thanks maddes SVN-Revision: 22587 --- .../014-cfi_fix_amd_extended_table_check.patch | 50 ++++++++++++++++++++++ .../generic/patches-2.6.34/014-samsung_flash.patch | 50 ---------------------- 2 files changed, 50 insertions(+), 50 deletions(-) create mode 100644 target/linux/generic/patches-2.6.34/014-cfi_fix_amd_extended_table_check.patch delete mode 100644 target/linux/generic/patches-2.6.34/014-samsung_flash.patch (limited to 'target/linux/generic/patches-2.6.34') diff --git a/target/linux/generic/patches-2.6.34/014-cfi_fix_amd_extended_table_check.patch b/target/linux/generic/patches-2.6.34/014-cfi_fix_amd_extended_table_check.patch new file mode 100644 index 0000000000..2618fafeb9 --- /dev/null +++ b/target/linux/generic/patches-2.6.34/014-cfi_fix_amd_extended_table_check.patch @@ -0,0 +1,50 @@ +--- a/drivers/mtd/chips/cfi_cmdset_0002.c ++++ b/drivers/mtd/chips/cfi_cmdset_0002.c +@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] = + static void cfi_fixup_major_minor(struct cfi_private *cfi, + struct cfi_pri_amdstd *extp) + { ++ // manufacturers defined in include/linux/mtd/cfi.h ++ + if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e && + extp->MajorVersion == '0') + extp->MajorVersion = '1'; +@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct + mtd->name = map->name; + mtd->writesize = 1; + ++ printk(" CFI mfr 0x%08x\n", cfi->mfr); // TODO: Is there a more general place to print this info? ++ printk(" CFI id 0x%08x\n", cfi->id); ++ + if (cfi->cfi_mode==CFI_MODE_CFI){ + unsigned char bootloc; + /* +@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct + + cfi_fixup_major_minor(cfi, extp); + +- if (extp->MajorVersion != '1' || +- (extp->MinorVersion < '0' || extp->MinorVersion > '4')) { ++ // valid primary extension versions are: 1.0, 1.1, 1.2, 1.3 ++ // see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 and on ++ // http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf ++ if (extp->MajorVersion < '1' || ++ extp->MajorVersion > '1' || ++ (extp->MajorVersion == '1' && ( extp->MinorVersion < '0' || extp->MinorVersion > '3'))) { + printk(KERN_ERR " Unknown Amd/Fujitsu Extended Query " +- "version %c.%c.\n", extp->MajorVersion, +- extp->MinorVersion); ++ "version %c.%c (0x%02x/0x%02x).\n", ++ extp->MajorVersion, extp->MinorVersion, ++ extp->MajorVersion, extp->MinorVersion); + kfree(extp); + kfree(mtd); + return NULL; + } + ++ printk(" Amd/Fujitsu Extended Query version %c.%c.\n", ++ extp->MajorVersion, extp->MinorVersion); ++ + /* Install our own private info structure */ + cfi->cmdset_priv = extp; + diff --git a/target/linux/generic/patches-2.6.34/014-samsung_flash.patch b/target/linux/generic/patches-2.6.34/014-samsung_flash.patch deleted file mode 100644 index 2618fafeb9..0000000000 --- a/target/linux/generic/patches-2.6.34/014-samsung_flash.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/drivers/mtd/chips/cfi_cmdset_0002.c -+++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -325,6 +325,8 @@ static struct cfi_fixup fixup_table[] = - static void cfi_fixup_major_minor(struct cfi_private *cfi, - struct cfi_pri_amdstd *extp) - { -+ // manufacturers defined in include/linux/mtd/cfi.h -+ - if (cfi->mfr == CFI_MFR_SAMSUNG && cfi->id == 0x257e && - extp->MajorVersion == '0') - extp->MajorVersion = '1'; -@@ -355,6 +357,9 @@ struct mtd_info *cfi_cmdset_0002(struct - mtd->name = map->name; - mtd->writesize = 1; - -+ printk(" CFI mfr 0x%08x\n", cfi->mfr); // TODO: Is there a more general place to print this info? -+ printk(" CFI id 0x%08x\n", cfi->id); -+ - if (cfi->cfi_mode==CFI_MODE_CFI){ - unsigned char bootloc; - /* -@@ -373,16 +378,24 @@ struct mtd_info *cfi_cmdset_0002(struct - - cfi_fixup_major_minor(cfi, extp); - -- if (extp->MajorVersion != '1' || -- (extp->MinorVersion < '0' || extp->MinorVersion > '4')) { -+ // valid primary extension versions are: 1.0, 1.1, 1.2, 1.3 -+ // see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 and on -+ // http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf -+ if (extp->MajorVersion < '1' || -+ extp->MajorVersion > '1' || -+ (extp->MajorVersion == '1' && ( extp->MinorVersion < '0' || extp->MinorVersion > '3'))) { - printk(KERN_ERR " Unknown Amd/Fujitsu Extended Query " -- "version %c.%c.\n", extp->MajorVersion, -- extp->MinorVersion); -+ "version %c.%c (0x%02x/0x%02x).\n", -+ extp->MajorVersion, extp->MinorVersion, -+ extp->MajorVersion, extp->MinorVersion); - kfree(extp); - kfree(mtd); - return NULL; - } - -+ printk(" Amd/Fujitsu Extended Query version %c.%c.\n", -+ extp->MajorVersion, extp->MinorVersion); -+ - /* Install our own private info structure */ - cfi->cmdset_priv = extp; - -- cgit v1.2.3