diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2008-09-29 01:08:17 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2008-09-29 01:08:17 +0000 |
| commit | 15f17fcf7e6d0430b701f34b8db63435754d2e45 (patch) | |
| tree | cd04d6e88ffc7cca75a9ad1040caa9417253b4f7 /target/linux/generic-2.6/patches-2.6.27/007-samsung_flash.patch | |
| parent | 9d792824bce6ddd5aed83ec1a384da204db30f1a (diff) | |
| download | upstream-15f17fcf7e6d0430b701f34b8db63435754d2e45.tar.gz upstream-15f17fcf7e6d0430b701f34b8db63435754d2e45.tar.bz2 upstream-15f17fcf7e6d0430b701f34b8db63435754d2e45.zip | |
port generic and ixp4xx kernel patches to 2.6.27 (compiles except for iptables, but otherwise completely untested)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12790 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.27/007-samsung_flash.patch')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.27/007-samsung_flash.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/007-samsung_flash.patch b/target/linux/generic-2.6/patches-2.6.27/007-samsung_flash.patch new file mode 100644 index 0000000000..9cabf0e2da --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.27/007-samsung_flash.patch @@ -0,0 +1,36 @@ +--- a/drivers/mtd/chips/cfi_cmdset_0002.c ++++ b/drivers/mtd/chips/cfi_cmdset_0002.c +@@ -48,6 +48,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 *); +@@ -321,12 +322,19 @@ + + 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 */ |