linux/generic: update & refresh 2.6.36 & 2.6.37. (closes #8324)

[openwrt/staging/yousong.git] / target / linux / generic / patches-2.6.37 / 014-cfi_show_amd_extended_table_version.patch

diff --git a/target/linux/generic/patches-2.6.37/014-cfi_show_amd_extended_table_version.patch b/target/linux/generic/patches-2.6.37/014-cfi_show_amd_extended_table_version.patch
index 6da34f78f9c26c2975b7f470c332127b86add1ff..38ba76df4616b55cbb296f59b108771370fa837f 100644 (file)
--- a/target/linux/generic/patches-2.6.37/014-cfi_show_amd_extended_table_version.patch
+++ b/target/linux/generic/patches-2.6.37/014-cfi_show_amd_extended_table_version.patch
@@ -1,30 +1,15 @@
 --- a/drivers/mtd/chips/cfi_cmdset_0002.c
 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -392,6 +392,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';
-@@ -431,6 +433,9 @@ struct mtd_info *cfi_cmdset_0002(struct
+@@ -446,9 +446,9 @@ struct mtd_info *cfi_cmdset_0002(struct
  
-       mtd->reboot_notifier.notifier_call = cfi_amdstd_reboot;
- 
-+      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;
-               __u16 adr = primary?cfi->cfiq->P_ADR:cfi->cfiq->A_ADR;
-@@ -448,7 +453,7 @@ struct mtd_info *cfi_cmdset_0002(struct
+                       /*
                         * Valid primary extension versions are: 1.0, 1.1, 1.2, 1.3, 1.4
-                        * see: http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 
-                        *      http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf
+-                       * see: http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 
+-                       *      http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf
 -                       *      http://www.spansion.com/Support/Datasheets/s29ws-p_00_a12_e.pdf
-+                       *      http://www.spansion.com/Support/AppNotes/CFI_Spec_AN_03.pdf
++                       * see: Spec 1.3 http://cs.ozerki.net/zap/pub/axim-x5/docs/cfi_r20.pdf, page 19 
++                       *               http://www.spansion.com/Support/AppNotes/cfi_100_20011201.pdf
++                       *      Spec 1.4 http://www.spansion.com/Support/AppNotes/CFI_Spec_AN_03.pdf, page 9
                         */
                        if (extp->MajorVersion != '1' ||
                            (extp->MajorVersion == '1' && (extp->MinorVersion < '0' || extp->MinorVersion > '4'))) {