diff options
author | Jonas Gorski <jogo@openwrt.org> | 2012-07-31 14:27:25 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2012-07-31 14:27:25 +0000 |
commit | 6d1dc25f1be6f0c05cb9aab7e91c2c8adafdb731 (patch) | |
tree | a39b1275be949fe5503624ef94bad15fe0abb83f /target/linux/brcm63xx/patches-3.3/311-cfe_version_mod.patch | |
parent | cf9ca1514575370e4c26aca07d25f8c51808548a (diff) | |
download | master-187ad058-6d1dc25f1be6f0c05cb9aab7e91c2c8adafdb731.tar.gz master-187ad058-6d1dc25f1be6f0c05cb9aab7e91c2c8adafdb731.tar.bz2 master-187ad058-6d1dc25f1be6f0c05cb9aab7e91c2c8adafdb731.zip |
bcm63xx: reorder patches
Fix the order and names of patches.
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32920 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/311-cfe_version_mod.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.3/311-cfe_version_mod.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/311-cfe_version_mod.patch b/target/linux/brcm63xx/patches-3.3/311-cfe_version_mod.patch new file mode 100644 index 0000000000..1269bc0c47 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.3/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 +@@ -777,6 +777,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; |