Author: rmilecki
Date: 2014-12-15 09:51:14 +0100 (Mon, 15 Dec 2014)
New Revision: 43708

Modified:
   trunk/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
Log:
brcm47xx: use separated function in upgrade to detect file type

Signed-off-by: Rafa?\197?\130 Mi?\197?\130ecki <[email protected]>


Modified: trunk/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh
===================================================================
--- trunk/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh      
2014-12-14 16:03:45 UTC (rev 43707)
+++ trunk/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh      
2014-12-15 08:51:14 UTC (rev 43708)
@@ -1,11 +1,30 @@
 PART_NAME=firmware
 
+brcm47xx_identify() {
+       local magic
+
+       magic=$(get_magic_long "$1")
+       case "$magic" in
+               "48445230")
+                       echo "trx"
+                       return
+                       ;;
+               "2a23245e")
+                       echo "chk"
+                       return
+                       ;;
+       esac
+
+       echo "unknown"
+}
+
 platform_check_image() {
        [ "$#" -gt 1 ] && return 1
 
-       case "$(get_magic_word "$1")" in
-               # .trx files
-               4844) return 0;;
+       local file_type=$(brcm47xx_identify "$1")
+
+       case "$file_type" in
+               "trx") return 0;;
                *)
                        echo "Invalid image type. Please use only .trx files"
                        return 1
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits

Reply via email to