mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-15 09:19:57 +00:00
4eba86820f
Refreshed all patches. Fixes: - CVE-2019-14896 - CVE-2019-14897 Remove upstreamed: - 023-0007-crypto-crypto4xx-Fix-wrong-ppc4xx_trng_probe-ppc4xx_.patch Altered patches: - 102-MIPS-BCM63XX-move-code-touching-the-USB-private-regi.patch - 105-MIPS-BCM63XX-add-support-for-the-on-chip-OHCI-contro.patch - 106-MIPS-BCM63XX-register-OHCI-controller-if-board-enabl.patch - 108-MIPS-BCM63XX-add-support-for-the-on-chip-EHCI-contro.patch - 207-MIPS-BCM63XX-move-device-registration-code-into-its-.patch - 350-MIPS-BCM63XX-support-settings-num-usbh-ports.patch - 356-MIPS-BCM63XX-move-fallback-sprom-support-into-its-ow.patch - 390-MIPS-BCM63XX-do-not-register-SPI-controllers.patch - 391-MIPS-BCM63XX-do-not-register-uart.patch - 392-MIPS-BCM63XX-remove-leds-and-buttons.patch - 416-BCM63XX-add-a-fixup-for-ath9k-devices.patch - 422-BCM63XX-add-a-fixup-for-rt2x00-devices.patch - Compile-tested on: brcm63xx, cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
28 lines
948 B
Diff
28 lines
948 B
Diff
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
|
|
@@ -707,10 +707,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");
|
|
pr_info("CFE version: %s\n", cfe_version);
|
|
|