diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-10-25 21:16:51 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2012-10-25 21:16:51 +0000 |
| commit | 8d69af7c9fff947e2e53ba955cf6c84df3f1391e (patch) | |
| tree | 192a79439e8d6b82dd39af6ac6f019c472cdc1c3 /target/linux/brcm63xx/patches-3.6/311-cfe_version_mod.patch | |
| parent | 6a699a8ae80b5b6ff6559bad1297242c8daf8934 (diff) | |
| download | master-31e0f0ae-8d69af7c9fff947e2e53ba955cf6c84df3f1391e.tar.gz master-31e0f0ae-8d69af7c9fff947e2e53ba955cf6c84df3f1391e.tar.bz2 master-31e0f0ae-8d69af7c9fff947e2e53ba955cf6c84df3f1391e.zip | |
add preliminary support for 3.6 kernel
SVN-Revision: 33936
Diffstat (limited to 'target/linux/brcm63xx/patches-3.6/311-cfe_version_mod.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.6/311-cfe_version_mod.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.6/311-cfe_version_mod.patch b/target/linux/brcm63xx/patches-3.6/311-cfe_version_mod.patch new file mode 100644 index 0000000000..835b85ffd8 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.6/311-cfe_version_mod.patch @@ -0,0 +1,26 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -822,6 +822,8 @@ void __init board_prom_init(void) + if (!memcmp(cfe, "cfe-v", 5)) + snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u", + cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]); ++ else if (!memcmp(cfe, "cfe-", 4)) ++ snprintf(cfe_version, 16, "%s", (char *) &cfe[4]); + else + strcpy(cfe_version, "unknown"); + printk(KERN_INFO PFX "CFE version: %s\n", cfe_version); +--- a/drivers/mtd/bcm63xxpart.c ++++ b/drivers/mtd/bcm63xxpart.c +@@ -54,10 +54,10 @@ static int bcm63xx_detect_cfe(struct mtd + if (ret) + return ret; + +- if (strncmp("cfe-v", buf, 5) == 0) ++ if (strncmp("cfe-", buf, 4) == 0) + return 0; + +- /* very old CFE's do not have the cfe-v string, so check for magic */ ++ /* very old CFE's do not have the cfe- string, so check for magic */ + ret = mtd_read(master, BCM63XX_CFE_MAGIC_OFFSET, 8, &retlen, + (void *)buf); + buf[retlen] = 0; |