ar71xx: Allow OpenMesh CE images with more than 3 files

[openwrt/openwrt.git] / target / linux / ar71xx / base-files / lib / upgrade / openmesh.sh

diff --git a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
index 13d7415098cc85fbc516083869c6f8204a91eda4..bc362a751e9b62ee23fb4b3b401757106435e34a 100644 (file)
--- a/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
+++ b/target/linux/ar71xx/base-files/lib/upgrade/openmesh.sh
@@ -36,49 +36,46 @@ platform_add_ramfs_ubootenv()
 }
 append sysupgrade_pre_upgrade platform_add_ramfs_ubootenv
 
-platform_check_image_openmesh()
+platform_check_image_target_openmesh()
 {
-       local img_magic=$1
-       local img_path=$2
-       local fw_printenv=/usr/sbin/fw_printenv
-       local img_board_target= img_num_files= i=0
-       local cfg_name= kernel_name= rootfs_name=
-
-       case "$img_magic" in
-               # Combined Extended Image v1
-               43453031)
-                       img_board_target=$(trim $(dd if="$img_path" bs=4 skip=1 count=8 2>/dev/null))
-                       img_num_files=$(trim $(dd if="$img_path" bs=2 skip=18 count=1 2>/dev/null))
-                       ;;
-               *)
-                       echo "Invalid image ($img_magic). Use combined extended images on this platform"
-                       return 1
-                       ;;
-       esac
+       img_board_target="$1"
 
        case "$img_board_target" in
                OM2P)
-                       [ "$board" = "om2p" ] && break
-                       [ "$board" = "om2pv2" ] && break
-                       [ "$board" = "om2p-lc" ] && break
-                       [ "$board" = "om2p-hs" ] && break
-                       [ "$board" = "om2p-hsv2" ] && break
+                       [ "$board" = "om2p" ] && return 0
+                       [ "$board" = "om2pv2" ] && return 0
+                       [ "$board" = "om2p-lc" ] && return 0
+                       [ "$board" = "om2p-hs" ] && return 0
+                       [ "$board" = "om2p-hsv2" ] && return 0
                        echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform"
                        return 1
                        ;;
                OM5P)
-                       [ "$board" = "om5p" ] && break
+                       [ "$board" = "om5p" ] && return 0
+                       [ "$board" = "om5p-an" ] && return 0
+                       echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform"
+                       return 1
+                       ;;
+               OM5PAC)
+                       [ "$board" = "om5p-ac" ] && return 0
+                       [ "$board" = "om5p-acv2" ] && return 0
+                       echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform"
+                       return 1
+                       ;;
+               MR1750)
+                       [ "$board" = "mr1750" ] && return 0
                        echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform"
                        return 1
                        ;;
                MR600)
-                       [ "$board" = "mr600" ] && break
-                       [ "$board" = "mr600v2" ] && break
+                       [ "$board" = "mr600" ] && return 0
+                       [ "$board" = "mr600v2" ] && return 0
                        echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform"
                        return 1
                        ;;
                MR900)
-                       [ "$board" = "mr900" ] && break
+                       [ "$board" = "mr900" ] && return 0
+                       [ "$board" = "mr900v2" ] && return 0
                        echo "Invalid image board target ($img_board_target) for this platform: $board. Use the correct image for this platform"
                        return 1
                        ;;
@@ -87,8 +84,31 @@ platform_check_image_openmesh()
                        return 1
                        ;;
        esac
+}
+
+platform_check_image_openmesh()
+{
+       local img_magic=$1
+       local img_path=$2
+       local fw_printenv=/usr/sbin/fw_printenv
+       local img_board_target= img_num_files= i=0
+       local cfg_name= kernel_name= rootfs_name=
+
+       case "$img_magic" in
+               # Combined Extended Image v1
+               43453031)
+                       img_board_target=$(trim $(dd if="$img_path" bs=4 skip=1 count=8 2>/dev/null))
+                       img_num_files=$(trim $(dd if="$img_path" bs=2 skip=18 count=1 2>/dev/null))
+                       ;;
+               *)
+                       echo "Invalid image ($img_magic). Use combined extended images on this platform"
+                       return 1
+                       ;;
+       esac
+
+       platform_check_image_target_openmesh "$img_board_target" || return 1
 
-       [ $img_num_files -ne 3 ] && {
+       [ $img_num_files -lt 3 ] && {
                echo "Invalid number of embedded images ($img_num_files). Use the correct image for this platform"
                return 1
        }
@@ -155,7 +175,7 @@ platform_do_upgrade_openmesh()
                        kernel_start_addr1=0x9f1c0000
                        kernel_start_addr2=0x9f8c0000
                        ;;
-               OM5P|MR600|MR900)
+               OM5P|OM5PAC|MR600|MR900|MR1750)
                        block_size=$((64 * 1024))
                        total_size=7995392
                        kernel_start_addr1=0x9f0b0000