From: Rafał Miłecki Date: Tue, 31 Mar 2015 07:26:30 +0000 (+0000) Subject: brcm47xx: fix checking cross-vendors firmware images X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=8ec31f25e3af1cb05331a84e2c663ed61049d304;p=openwrt%2Fstaging%2Fadrian.git brcm47xx: fix checking cross-vendors firmware images This change won't allow installing e.g. Netgear firmware on Linksys device. Signed-off-by: Rafał Miłecki SVN-Revision: 45174 --- diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh index 9e8db8a137..8c09706ee8 100644 --- a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh @@ -10,53 +10,46 @@ platform_machine() { grep "machine" /proc/cpuinfo | sed "s/.*:[ \t]*//" } -platform_expected_chk_board_id() { +platform_expected_image() { local machine=$(platform_machine) case "$machine" in - "Netgear WGR614 V8") echo "U12H072T00_NETGEAR"; return;; - "Netgear WGR614 V9") echo "U12H094T00_NETGEAR"; return;; - "Netgear WGR614 V10") echo "U12H139T01_NETGEAR"; return;; - "Netgear WNDR3300") echo "U12H093T00_NETGEAR"; return;; - "Netgear WNDR3400 V1") echo "U12H155T00_NETGEAR"; return;; - "Netgear WNDR3400 V2") echo "U12H187T00_NETGEAR"; return;; - "Netgear WNDR3400 V3") echo "U12H208T00_NETGEAR"; return;; - "Netgear WNDR3400 Vcna") echo "U12H155T01_NETGEAR"; return;; - "Netgear WNDR3700 V3") echo "U12H194T00_NETGEAR"; return;; - "Netgear WNDR4000") echo "U12H181T00_NETGEAR"; return;; - "Netgear WNDR4500 V1") echo "U12H189T00_NETGEAR"; return;; - "Netgear WNDR4500 V2") echo "U12H224T00_NETGEAR"; return;; - "Netgear WNR2000 V2") echo "U12H114T00_NETGEAR"; return;; - "Netgear WNR3500L") echo "U12H136T99_NETGEAR"; return;; - "Netgear WNR3500U") echo "U12H136T00_NETGEAR"; return;; - "Netgear WNR3500 V2") echo "U12H127T00_NETGEAR"; return;; - "Netgear WNR3500 V2vc") echo "U12H127T70_NETGEAR"; return;; - "Netgear WNR834B V2") echo "U12H081T00_NETGEAR"; return;; - esac -} - -platform_expected_cybertan_pattern() { - local machine=$(platform_machine) - - case "$machine" in - "Linksys E900 V1") echo "E900"; return;; - "Linksys E1000 V1") echo "E100"; return;; - "Linksys E1000 V2") echo "E100"; return;; - "Linksys E1000 V2.1") echo "E100"; return;; - "Linksys E1200 V2") echo "E122"; return;; - "Linksys E2000 V1") echo "32XN"; return;; - "Linksys E3000 V1") echo "61XN"; return;; - "Linksys E3200 V1") echo "3200"; return;; - "Linksys E4200 V1") echo "4200"; return;; - "Linksys WRT150N V1.1") echo "N150"; return;; - "Linksys WRT150N V1") echo "N150"; return;; - "Linksys WRT160N V1") echo "N150"; return;; - "Linksys WRT160N V3") echo "N150"; return;; - "Linksys WRT300N V1.1") echo "EWCB"; return;; - "Linksys WRT310N V1") echo "310N"; return;; - "Linksys WRT310N V2") echo "310N"; return;; - "Linksys WRT610N V1") echo "610N"; return;; - "Linksys WRT610N V2") echo "610N"; return;; + "Netgear WGR614 V8") echo "chk U12H072T00_NETGEAR"; return;; + "Netgear WGR614 V9") echo "chk U12H094T00_NETGEAR"; return;; + "Netgear WGR614 V10") echo "chk U12H139T01_NETGEAR"; return;; + "Netgear WNDR3300") echo "chk U12H093T00_NETGEAR"; return;; + "Netgear WNDR3400 V1") echo "chk U12H155T00_NETGEAR"; return;; + "Netgear WNDR3400 V2") echo "chk U12H187T00_NETGEAR"; return;; + "Netgear WNDR3400 V3") echo "chk U12H208T00_NETGEAR"; return;; + "Netgear WNDR3400 Vcna") echo "chk U12H155T01_NETGEAR"; return;; + "Netgear WNDR3700 V3") echo "chk U12H194T00_NETGEAR"; return;; + "Netgear WNDR4000") echo "chk U12H181T00_NETGEAR"; return;; + "Netgear WNDR4500 V1") echo "chk U12H189T00_NETGEAR"; return;; + "Netgear WNDR4500 V2") echo "chk U12H224T00_NETGEAR"; return;; + "Netgear WNR2000 V2") echo "chk U12H114T00_NETGEAR"; return;; + "Netgear WNR3500L") echo "chk U12H136T99_NETGEAR"; return;; + "Netgear WNR3500U") echo "chk U12H136T00_NETGEAR"; return;; + "Netgear WNR3500 V2") echo "chk U12H127T00_NETGEAR"; return;; + "Netgear WNR3500 V2vc") echo "chk U12H127T70_NETGEAR"; return;; + "Netgear WNR834B V2") echo "chk U12H081T00_NETGEAR"; return;; + "Linksys E900 V1") echo "cybertan E900"; return;; + "Linksys E1000 V1") echo "cybertan E100"; return;; + "Linksys E1000 V2") echo "cybertan E100"; return;; + "Linksys E1000 V2.1") echo "cybertan E100"; return;; + "Linksys E1200 V2") echo "cybertan E122"; return;; + "Linksys E2000 V1") echo "cybertan 32XN"; return;; + "Linksys E3000 V1") echo "cybertan 61XN"; return;; + "Linksys E3200 V1") echo "cybertan 3200"; return;; + "Linksys E4200 V1") echo "cybertan 4200"; return;; + "Linksys WRT150N V1.1") echo "cybertan N150"; return;; + "Linksys WRT150N V1") echo "cybertan N150"; return;; + "Linksys WRT160N V1") echo "cybertan N150"; return;; + "Linksys WRT160N V3") echo "cybertan N150"; return;; + "Linksys WRT300N V1.1") echo "cybertan EWCB"; return;; + "Linksys WRT310N V1") echo "cybertan 310N"; return;; + "Linksys WRT310N V2") echo "cybertan 310N"; return;; + "Linksys WRT610N V1") echo "cybertan 610N"; return;; + "Linksys WRT610N V2") echo "cybertan 610N"; return;; esac } @@ -96,10 +89,10 @@ platform_check_image() { local header_len=$((0x$(get_magic_long_at "$1" 4))) local board_id_len=$(($header_len - 40)) local board_id=$(dd if="$1" skip=40 bs=1 count=$board_id_len 2>/dev/null | hexdump -v -e '1/1 "%c"') - local dev_board_id=$(platform_expected_chk_board_id) + local dev_board_id=$(platform_expected_image) echo "Found CHK image with device board_id $board_id" - [ -n "$dev_board_id" -a "$board_id" != "$dev_board_id" ] && { + [ -n "$dev_board_id" -a "chk $board_id" != "$dev_board_id" ] && { echo "Firmware board_id doesn't match device board_id ($dev_board_id)" error=1 } @@ -112,10 +105,10 @@ platform_check_image() { ;; "cybertan") local pattern=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"') - local dev_pattern=$(platform_expected_cybertan_pattern) + local dev_pattern=$(platform_expected_image) echo "Found CyberTAN image with device pattern: $pattern" - [ -n "$dev_pattern" -a "$pattern" != "$dev_pattern" ] && { + [ -n "$dev_pattern" -a "cybertan $pattern" != "$dev_pattern" ] && { echo "Firmware pattern doesn't match device pattern ($dev_pattern)" error=1 }