bcm53xx: sysupgrade: fix support for Luxul's legacy firmware format

Fixes: c808c55b398c ("bcm53xx: sysupgrade: refactor handling different firmware formats")
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 3bcf3e8143160e447c22c0ac3fa66fbcf6a59eef)

diff --git a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
index 512dad189126e126d35a59eb7270cbab872ab954..c92dcd1e4ee5b9f98a963389dc3cb54a800ea484 100644 (file)
--- a/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/bcm53xx/base-files/lib/upgrade/platform.sh
@@ -143,7 +143,9 @@ platform_other_check_image() {
        echo "Found $BCM53XX_FW_FORMAT firmware for device $BCM53XX_FW_BOARD_ID"
 
        local expected_image="$(platform_expected_image)"
-       [ -n "$expected_image" -a -n "$BCM53XX_FW_BOARD_ID" -a "$expected_image" != "$BCM53XX_FW_FORMAT $BCM53XX_FW_BOARD_ID" ] && {
+       local tmp_format=$BCM53XX_FW_FORMAT
+       [ "$tmp_format" = "lxlold" ] && tmp_format="lxl"
+       [ -n "$expected_image" -a -n "$BCM53XX_FW_BOARD_ID" -a "$expected_image" != "$tmp_format $BCM53XX_FW_BOARD_ID" ] && {
                echo "Firmware doesn't match device ($expected_image)"
                error=1
        }