Explorar el Código

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

Fixes: 80041dea7094 ("bcm53xx: sysupgrade: refactor handling different firmware formats")
Signed-off-by: Rafał Miłecki <[email protected]>
Rafał Miłecki hace 4 años
padre
commit
3bcf3e8143
Se han modificado 1 ficheros con 3 adiciones y 1 borrados
  1. 3 1
      target/linux/bcm53xx/base-files/lib/upgrade/platform.sh

+ 3 - 1
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"
 	echo "Found $BCM53XX_FW_FORMAT firmware for device $BCM53XX_FW_BOARD_ID"
 
 
 	local expected_image="$(platform_expected_image)"
 	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)"
 		echo "Firmware doesn't match device ($expected_image)"
 		error=1
 		error=1
 	}
 	}