diff options
Diffstat (limited to 'target/linux/bcm63xx/patches-5.4/032-v5.9-MIPS-BCM63xx-improve-CFE-version-detection.patch')
| -rw-r--r-- | target/linux/bcm63xx/patches-5.4/032-v5.9-MIPS-BCM63xx-improve-CFE-version-detection.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/032-v5.9-MIPS-BCM63xx-improve-CFE-version-detection.patch b/target/linux/bcm63xx/patches-5.4/032-v5.9-MIPS-BCM63xx-improve-CFE-version-detection.patch new file mode 100644 index 0000000000..1daa3e6149 --- /dev/null +++ b/target/linux/bcm63xx/patches-5.4/032-v5.9-MIPS-BCM63xx-improve-CFE-version-detection.patch @@ -0,0 +1,56 @@ +From e27e1cc9d360a347dbd5a398e9df21cfb4e60e3c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com> +Date: Mon, 8 Jun 2020 11:28:35 +0200 +Subject: [PATCH] MIPS: BCM63xx: improve CFE version detection +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +There are some CFE variants that start with 'cfe-vd' instead of 'cfe-v', such +as the one used in the Huawei HG556a: "cfe-vd081.5003". In this case, the CFE +version is stored as is (string vs number bytes). + +Some newer devices have an additional version number, such as the Comtrend +VR-3032u: "1.0.38-112.118-11". + +Finally, print the string as is if the version doesn't start with "cfe-v" or +"cfe-vd", but starts with "cfe-". + +Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> +Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> +--- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 22 ++++++++++++++++++---- + 1 file changed, 18 insertions(+), 4 deletions(-) + +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -760,11 +760,25 @@ 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"); ++ } + pr_info("CFE version: %s\n", cfe_version); + + bcm63xx_nvram_init(boot_addr + BCM963XX_NVRAM_OFFSET); |