diff options
author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-12-08 21:20:40 +0000 |
---|---|---|
committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-12-08 21:20:40 +0000 |
commit | ce0984ec5db9152548582ca9b6b440c0b7cc0153 (patch) | |
tree | 4f11cdcc91e884b2da407586161b51ef4f84e1d6 /target/linux/generic/patches-2.6.36 | |
parent | 911c2540b012a488824dcfeffdcbedc75439cbc1 (diff) | |
download | master-31e0f0ae-ce0984ec5db9152548582ca9b6b440c0b7cc0153.tar.gz master-31e0f0ae-ce0984ec5db9152548582ca9b6b440c0b7cc0153.tar.bz2 master-31e0f0ae-ce0984ec5db9152548582ca9b6b440c0b7cc0153.zip |
linux/generic: update & refresh 2.6.36 & 2.6.37. (closes #8324)
SVN-Revision: 24370
Diffstat (limited to 'target/linux/generic/patches-2.6.36')
-rw-r--r-- | target/linux/generic/patches-2.6.36/014-cfi_show_amd_extended_table_version.patch | 29 | ||||
-rw-r--r-- | target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch | 41 |
2 files changed, 29 insertions, 41 deletions
diff --git a/target/linux/generic/patches-2.6.36/014-cfi_show_amd_extended_table_version.patch b/target/linux/generic/patches-2.6.36/014-cfi_show_amd_extended_table_version.patch index 55a6c2e7d3..5e16d96486 100644 --- a/target/linux/generic/patches-2.6.36/014-cfi_show_amd_extended_table_version.patch +++ b/target/linux/generic/patches-2.6.36/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 -@@ -371,6 +371,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'; -@@ -403,6 +405,9 @@ struct mtd_info *cfi_cmdset_0002(struct +@@ -418,9 +418,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; -@@ -420,7 +425,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://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 - * http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_100_20011201.pdf +- * see: http://www.amd.com/us-en/assets/content_type/DownloadableAssets/cfi_r20.pdf, page 19 +- * http://www.amd.com/us-en/assets/content_type/DownloadableAssets/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'))) { diff --git a/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch b/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch index 1d13d4ed5b..bdbb325b86 100644 --- a/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch +++ b/target/linux/generic/patches-2.6.36/089-mtd-samsung-flash.patch @@ -1,36 +1,39 @@ --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c -@@ -373,9 +373,32 @@ static void cfi_fixup_major_minor(struct +@@ -371,9 +371,34 @@ 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'; ++ /* Manufacturers are defined in include/linux/mtd/cfi.h */ ++ + if (cfi->mfr == CFI_MFR_SAMSUNG && -+ extp->MajorVersion == '0') { -+ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", -+ extp->MajorVersion, extp->MinorVersion); ++ extp->MajorVersion == '0') { ++ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", ++ extp->MajorVersion, extp->MinorVersion); + - extp->MajorVersion = '1'; -+ extp->MinorVersion = '0'; ++ extp->MajorVersion = '1'; ++ extp->MinorVersion = '0'; + -+ printk(" to %c.%c.\n", -+ extp->MajorVersion, extp->MinorVersion); ++ printk(" to %c.%c.\n", ++ extp->MajorVersion, extp->MinorVersion); + } + + if (cfi->mfr == CFI_MFR_SAMSUNG && -+ extp->MajorVersion == '3' && extp->MinorVersion == '3') { -+ printk(KERN_NOTICE " Newer Samsung flash detected, " -+ "should be compatibile with Amd/Fujitsu.\n"); ++ extp->MajorVersion == '3' && extp->MinorVersion == '3') { ++ printk(KERN_NOTICE " Newer Samsung flash detected, " ++ "should be compatible with Amd/Fujitsu.\n"); + -+ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", -+ extp->MajorVersion, extp->MinorVersion); ++ printk(" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c", ++ extp->MajorVersion, extp->MinorVersion); + -+ extp->MajorVersion = '1'; // set to 1.3 (last defined version) -+ extp->MinorVersion = '3'; ++ extp->MajorVersion = '1'; // set to 1.3 ++ extp->MinorVersion = '3'; + -+ printk(" to %c.%c.\n", -+ extp->MajorVersion, extp->MinorVersion); ++ printk(" to %c.%c.\n", ++ extp->MajorVersion, extp->MinorVersion); + } } |