diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2013-06-30 13:10:05 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2013-06-30 13:10:05 +0000 |
| commit | 7d1cd9dfab5a76ca770e749047491dad57af8489 (patch) | |
| tree | 187a65cdda283b160b34a444488f392951abc1c2 /target/linux/brcm63xx/patches-3.9/309-cfe_version_mod.patch | |
| parent | 6df83c3f8934448ee4912fb6ff8ac600f7be40e6 (diff) | |
| download | upstream-7d1cd9dfab5a76ca770e749047491dad57af8489.tar.gz upstream-7d1cd9dfab5a76ca770e749047491dad57af8489.tar.bz2 upstream-7d1cd9dfab5a76ca770e749047491dad57af8489.zip | |
bcm63xx: Improve CFE version mod patch.
Fix "cfe-" string length copy.
Check if there's an extra byte a.b.c-d.e / a.b.c-d.e-f.
Add support for Huawei CFE versions ("cfe-vd").
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Patchwork: http://patchwork.openwrt.org/patch/3766/
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 37101
Diffstat (limited to 'target/linux/brcm63xx/patches-3.9/309-cfe_version_mod.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.9/309-cfe_version_mod.patch | 30 |
1 files changed, 23 insertions, 7 deletions
diff --git a/target/linux/brcm63xx/patches-3.9/309-cfe_version_mod.patch b/target/linux/brcm63xx/patches-3.9/309-cfe_version_mod.patch index 0b4466f56f..50cb14bca8 100644 --- a/target/linux/brcm63xx/patches-3.9/309-cfe_version_mod.patch +++ b/target/linux/brcm63xx/patches-3.9/309-cfe_version_mod.patch @@ -1,11 +1,27 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -837,6 +837,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 +@@ -834,10 +834,20 @@ void __init board_prom_init(void) + + /* dump cfe version */ + cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; +- 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 (strstarts(cfe, "cfe-")) { ++ if(cfe[4] == 'v') { ++ if(cfe[5] == 'd') ++ snprintf(cfe_version, 11, "%s", (char *) &cfe[5]); ++ else if (cfe[10] > 0) ++ snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u-%u", ++ cfe[5], cfe[6], cfe[7], cfe[8], cfe[9], cfe[10]); ++ else ++ snprintf(cfe_version, sizeof(cfe_version), "%u.%u.%u-%u.%u", ++ cfe[5], cfe[6], cfe[7], cfe[8], cfe[9]); ++ } else { ++ snprintf(cfe_version, 12, "%s", (char *) &cfe[4]); ++ } ++ } else strcpy(cfe_version, "unknown"); printk(KERN_INFO PFX "CFE version: %s\n", cfe_version); + |