summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.35/014-samsung_flash.patch
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-06-26 20:42:58 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-06-26 20:42:58 +0000
commitc5552ad03973839d83d32d7108f20c00f192633b (patch)
treede32e4def600e56134cd085a7447cb6620542078 /target/linux/generic-2.6/patches-2.6.35/014-samsung_flash.patch
parent7ec88f88f4c65a22b3b7e32ef87cb42dcb32a6fb (diff)
rename target/linux/generic-2.6 to generic
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21952 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.35/014-samsung_flash.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.35/014-samsung_flash.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.35/014-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.35/014-samsung_flash.patch
deleted file mode 100644
index 1b028edd9..000000000
--- a/target/linux/generic-2.6/patches-2.6.35/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
-@@ -372,6 +372,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';
-@@ -404,6 +406,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;
-@@ -417,16 +422,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;
-