43029544e2
Now that we migrated all users to dtb based detection, we can drop the board fixup code. Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 42129
28 lines
961 B
Diff
28 lines
961 B
Diff
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
@@ -747,10 +747,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);
|
|
|