From 716ca530e1c4515d8683c9d5be3d56b301758b66 Mon Sep 17 00:00:00 2001 From: James <> Date: Wed, 4 Nov 2015 11:49:21 +0000 Subject: trunk-47381 --- target/linux/brcm47xx/base-files/etc/diag.sh | 41 ++++ .../linux/brcm47xx/base-files/etc/init.d/netconfig | 238 +++++++++++++++++++++ .../linux/brcm47xx/base-files/etc/init.d/wmacfixup | 33 +++ .../etc/uci-defaults/03_network_migration | 29 +++ .../base-files/etc/uci-defaults/09_fix_crc | 7 + .../base-files/lib/preinit/05_init_interfaces_brcm | 16 ++ .../lib/preinit/15_set_preinit_interface_brcm | 16 ++ .../brcm47xx/base-files/lib/upgrade/platform.sh | 157 ++++++++++++++ 8 files changed, 537 insertions(+) create mode 100644 target/linux/brcm47xx/base-files/etc/diag.sh create mode 100755 target/linux/brcm47xx/base-files/etc/init.d/netconfig create mode 100755 target/linux/brcm47xx/base-files/etc/init.d/wmacfixup create mode 100644 target/linux/brcm47xx/base-files/etc/uci-defaults/03_network_migration create mode 100644 target/linux/brcm47xx/base-files/etc/uci-defaults/09_fix_crc create mode 100644 target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm create mode 100644 target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm create mode 100644 target/linux/brcm47xx/base-files/lib/upgrade/platform.sh (limited to 'target/linux/brcm47xx/base-files') diff --git a/target/linux/brcm47xx/base-files/etc/diag.sh b/target/linux/brcm47xx/base-files/etc/diag.sh new file mode 100644 index 0000000..67453e6 --- /dev/null +++ b/target/linux/brcm47xx/base-files/etc/diag.sh @@ -0,0 +1,41 @@ +#!/bin/sh +# Copyright (C) 2006 OpenWrt.org + +. /lib/functions/leds.sh + +get_status_led() { + status_led_file=$(find /sys/class/leds/ -name "*power*" |head -n1) + if [ ! -f $status_led_file ]; then + status_led=$(basename $status_led_file) + return + fi; + status_led_file=$(find /sys/class/leds/ -name "*diag*" |head -n1) + if [ ! -f $status_led_file ]; then + status_led=$(basename $status_led_file) + return + fi; + status_led_file=$(find /sys/class/leds/ -name "*wps*" |head -n1) + if [ ! -f $status_led_file ]; then + status_led=$(basename $status_led_file) + return + fi; +} + +set_state() { + get_status_led + + case "$1" in + preinit) + status_led_blink_preinit + ;; + failsafe) + status_led_blink_failsafe + ;; + preinit_regular) + status_led_blink_preinit_regular + ;; + done) + status_led_on + ;; + esac +} diff --git a/target/linux/brcm47xx/base-files/etc/init.d/netconfig b/target/linux/brcm47xx/base-files/etc/init.d/netconfig new file mode 100755 index 0000000..1890cd0 --- /dev/null +++ b/target/linux/brcm47xx/base-files/etc/init.d/netconfig @@ -0,0 +1,238 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2006 OpenWrt.org + +START=05 + +start() { + [ -e /etc/config/network ] && { + local batch + + config_cb() { + case "$1" in + switch) + option_cb() { + case "$1" in + vlan[0-9]|vlan1[0-5]) + local id="${1#vlan}" + local ports="${2%\*}" + append batch "delete network.eth0.${1}${N}" + append batch "set network.eth0_${id}=switch_vlan${N}" + append batch "set network.eth0_${id}.device=eth0${N}" + append batch "set network.eth0_${id}.vlan=${id}${N}" + append batch "set network.eth0_${id}.ports='${ports}'${N}" + ;; + esac + } + ;; + switch_vlan) + option_cb() { :; } + batch="" + ;; + esac + } + + config_load network + + [ -n "$batch" ] && { + logger -t netconfig "migrating switch config to new format ..." + echo "$batch${N}commit network" | uci batch + } + + exit 0 + } + + mkdir -p /etc/config + + local cpuport=5 + [ -e /sbin/swconfig ] && cpuport=$(swconfig dev switch0 help 2>/dev/null | sed -ne "s|.*cpu @ \([0-9]*\).*|\1|p") + local switchname=eth0 + [ -e /sbin/swconfig ] && switchname=$(swconfig dev switch0 help 2>/dev/null | sed -ne "s|switch0: \([^\\\\(]*\).*|\1|p") + local model=$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /machine/ {print $2}' /proc/cpuinfo) + + local network_defs=`( + if grep -E 'mtd0: 000(6|a)0000' /proc/mtd 2>&- >&-; then + # WGT634u + echo boardtype=wgt634u + else + strings "$(find_mtd_part nvram)" + fi + ) | awk -v cpuport="$cpuport" -v model="$model" ' + function macinc(mac, maca, i, result) { + split(mac, maca, ":") + for (i = 1; i <= 6; i++) maca[i] = "0x" maca[i] + if (++maca[6] > 0xff) { + maca[5]++ + maca[6] = 0 + } + for (i = 1; i <= 6; i++) { + if (i != 1) result = result ":" + result = result sprintf("%02x", maca[i]) + } + return result + } + + BEGIN { + FS="=" + c["lan_ifname"]="eth0.1" + c["wan_ifname"]="eth0.2" + c["vlan1ports"]="1 2 3 4 5t" + c["vlan2ports"]="0 5t" + for (i = 0; i < 6; i++) { + if (mac_check != "") mac_check = mac_check ":" + mac_check = mac_check "[0-9a-fA-F][0-9a-fA-F]" + } + if (cpuport == "8") { + c["vlan1ports"]="1 2 3 4 8t" + c["vlan2ports"]="0 8t" + } + } + + ($1 == "boardnum") || ($1 == "boardtype") || ($1 == "boardflags") || ($1 ~ /macaddr/) || \ + ($1 ~ /^vlan[0-9]{1,2}ports$/) { + nvram[$1] = $2 + } + + END { + if (((nvram["vlan0ports"] ~ /^0 1 2 3 8/ ) && (nvram["vlan1ports"] ~ /^4 8/ && (cpuport == "8"))) || \ + ((nvram["vlan1ports"] ~ /^0 1 2 3 8/ ) && (nvram["vlan2ports"] ~ /^4 8/ && (cpuport == "8"))) || \ + ((nvram["vlan2ports"] ~ /^0 1 2 3 8/ ) && (nvram["vlan1ports"] ~ /^4 8/ && (cpuport == "8")))) { + c["vlan1ports"] = "0 1 2 3 8t" + c["vlan2ports"] = "4 8t" + } + if (((nvram["vlan0ports"] ~ /^0 1 2 3 5/ ) && (nvram["vlan1ports"] ~ /^4 5/ && (cpuport == "5"))) || \ + ((nvram["vlan1ports"] ~ /^0 1 2 3 5/ ) && (nvram["vlan2ports"] ~ /^4 5/ && (cpuport == "5"))) || \ + ((nvram["vlan2ports"] ~ /^0 1 2 3 5/ ) && (nvram["vlan1ports"] ~ /^4 5/ && (cpuport == "5")))) { + c["vlan1ports"] = "0 1 2 3 5t" + c["vlan2ports"] = "4 5t" + } + if ((model == "Asus WLHDD") || (model == "Asus WL300G")) { + c["wan_ifname"] = "" + c["lan_ifname"] = "eth1" + } + if (model == "Asus WL330GE") { + c["wan_ifname"] = "" + c["lan_ifname"] = "eth0.1" + c["vlan1ports"] = "4 5t" + c["vlan2ports"] = "" + } + if ((model == "Asus WL500G") || (model == "Microsoft MN-700")) { + c["wan_ifname"] = "eth1" + c["lan_ifname"] = "eth0" + } + if ((model == "Asus WL500GP V2") || (model == "Buffalo WHR-G125")) { + c["vlan1ports"] = "0 1 2 3 5t" + c["vlan2ports"] = "4 5t" + } + if (model == "Dell TrueMobile 2300") { + c["lan_ifname"] = "eth0" + c["wan_ifname"] = "eth1" + c["vlan1ports"] = "0 1 2 3 4 5" + c["vlan2ports"] = "" + } + if (nvram["boardtype"] == "bcm94710r4") { + # Toshiba WRC-1000 + c["lan_ifname"] = "eth0" + c["wan_ifname"] = "eth1" + } + if ((nvram["boardtype"] == "wgt634u") || (nvram["boardtype"] == "0x0467")) { + c["vlan1ports"] = "0 1 2 3 5t" + c["vlan2ports"] = "4 5t" + } + if ((nvram["boardtype"] == "0x042f") || (nvram["boardtype"] == "0x0472")) { + if (nvram["boardnum"] == "45") { + # WL-500gP + c["vlan1ports"] = "1 2 3 4 5t" + c["vlan2ports"] = "0 5t" + } else { + # Generic BCM94704 + c["vlan1ports"] = "0 1 2 3 4 5" + c["vlan2ports"] = "" + c["lan_ifname"] = "eth0" + c["wan_ifname"] = "eth1" + + # MAC addresses on 4704 tend to be screwed up. Add a workaround here + if (nvram["et0macaddr"] ~ mac_check) { + c["lan_macaddr"] = nvram["et0macaddr"] + c["wan_macaddr"] = macinc(c["lan_macaddr"]) + } + } + } + # Buffalo WBR-B11 and Buffalo WBR-G54 + if (nvram["boardtype"] == "bcm94710ap") { + c["vlan1ports"] = "0 1 2 3 4 5" + c["vlan2ports"] = "" + c["lan_ifname"] = "eth0" + c["wan_ifname"] = "eth1" + } + + # WAP54G + if ((nvram["boardnum"] == "2") || \ + (nvram["boardnum"] == "1024")) { + c["lan_ifname"]="eth0" + c["wan_ifname"]="" + } + + # Sitecom WL-105b + if ((nvram["boardum"] == "2") && \ + (nvram["GemtekPmonVer"] == "1")) { + c["lan_ifname"]="eth0" + c["wan_ifname"]="" + } + + # ASUS WL-700gE + # These are actually same as defaults above. For some reason this script applies + # Generic BCM94704 settings instead so we revert to proper settings here. + # Hopefully someone will fix this properly soon. + if (model == "Asus WL700") { + c["lan_ifname"]="eth0.1" + c["wan_ifname"]="eth0.2" + c["vlan1ports"]="1 2 3 4 5t" + c["vlan2ports"]="0 5t" + } + if ((model == "Motorola WR850G") || (model == "Siemens SE505 V2")) { + c["vlan1ports"]="0 1 2 3 5t" + c["vlan2ports"]="4 5t" + } + if (model == "Asus WL500W") { + c["lan_ifname"] = "eth0" + c["wan_ifname"] = "eth1" + c["vlan1ports"] = "0 1 2 3 4 5" + c["vlan2ports"] = "" + } + print "local vlan1ports=\"" c["vlan1ports"] "\";" + print "local vlan2ports=\"" c["vlan2ports"] "\";" + print "local lan_ifname=\"" c["lan_ifname"] "\";" + print "local lan_macaddr=\"" c["lan_macaddr"] "\";" + print "local wan_ifname=\"" c["wan_ifname"] "\";" + print "local wan_macaddr=\"" c["wan_macaddr"] "\";" + }'` + + . /lib/functions/uci-defaults.sh + + touch /etc/config/network + + eval "$network_defs" + + [ -n "$vlan1ports" -o -n "$vlan2ports" ] && { + local cfg=`ucidef_add_switch "$switchname" 1 1` + [ -n "$cfg" ] && uci rename network.$cfg=eth0 + [ -n "$vlan1ports" ] && { + cfg=`ucidef_add_switch_vlan "$switchname" 1 "$vlan1ports"` + } + [ -n "$vlan2ports" ] && { + cfg=`ucidef_add_switch_vlan "$switchname" 2 "$vlan2ports"` + } + } + + ucidef_set_interface_loopback + + ucidef_set_interface_lan "$lan_ifname" + [ -n "$lan_macaddr" ] && ucidef_set_interface_macaddr lan "$lan_macaddr" + + [ -n "$wan_ifname" ] && { + ucidef_set_interface_wan "$wan_ifname" + [ -n "$wan_macaddr" ] && ucidef_set_interface_macaddr wan "$wan_macaddr" + } + + uci commit network +} diff --git a/target/linux/brcm47xx/base-files/etc/init.d/wmacfixup b/target/linux/brcm47xx/base-files/etc/init.d/wmacfixup new file mode 100755 index 0000000..ee1b752 --- /dev/null +++ b/target/linux/brcm47xx/base-files/etc/init.d/wmacfixup @@ -0,0 +1,33 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2010 OpenWrt.org + +START=41 + +boot() { + [ -d /sys/class/ieee80211 ] || exit + + commit=0 + + fixup_wmac() { + local cfg="$1" + local cfmac + + config_get cfmac "$cfg" macaddr + + [ "$cfmac" != "00:90:4c:5f:00:2a" ] || { + local nvmac="$(nvram get il0macaddr 2>/dev/null)" + [ -n "$nvmac" ] && [ "$nvmac != "$cfmac ] && { + uci set wireless.$cfg.macaddr="$nvmac" + commit=1 + } + } + } + + config_load wireless + config_foreach fixup_wmac wifi-device + + [ "$commit" = 1 ] && uci commit wireless +} + +start() { :; } +stop() { :; } diff --git a/target/linux/brcm47xx/base-files/etc/uci-defaults/03_network_migration b/target/linux/brcm47xx/base-files/etc/uci-defaults/03_network_migration new file mode 100644 index 0000000..cef5add --- /dev/null +++ b/target/linux/brcm47xx/base-files/etc/uci-defaults/03_network_migration @@ -0,0 +1,29 @@ +#!/bin/sh +# +# Copyright (C) 2014 OpenWrt.org +# + +uci show network | grep "\.vlan=0" +[ $? -ne 0 ] && exit 0 + +logger -t network "network config is invalid, creating new one" + +local lan_proto="$(uci -q get network.lan.proto)" +local lan_ipaddr="$(uci -q get network.lan.ipaddr)" +local lan_netmask="$(uci -q get network.lan.netmask)" +local wan_proto="$(uci -q get network.wan.proto)" +local wan_ipaddr="$(uci -q get network.wan.ipaddr)" +local wan_netmask="$(uci -q get network.wan.netmask)" + +rm /etc/config/network +/etc/init.d/netconfig start + +uci set network.lan.proto=$lan_proto +uci set network.lan.ipaddr=$lan_ipaddr +uci set network.lan.netmask=$lan_netmask +uci set network.wan.proto=$wan_proto +uci set network.wan.ipaddr=$wan_ipaddr +uci set network.wan.netmask=$wan_netmask +uci commit network + +exit 0 diff --git a/target/linux/brcm47xx/base-files/etc/uci-defaults/09_fix_crc b/target/linux/brcm47xx/base-files/etc/uci-defaults/09_fix_crc new file mode 100644 index 0000000..346a532 --- /dev/null +++ b/target/linux/brcm47xx/base-files/etc/uci-defaults/09_fix_crc @@ -0,0 +1,7 @@ +#!/bin/sh +# +# Copyright (C) 2007 OpenWrt.org +# +# + +mtd fixtrx firmware diff --git a/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm b/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm new file mode 100644 index 0000000..4b0d0eb --- /dev/null +++ b/target/linux/brcm47xx/base-files/lib/preinit/05_init_interfaces_brcm @@ -0,0 +1,16 @@ +#!/bin/sh + +preinit_iface() { + ifname=eth0 + + # hardware specific overrides + case "$(awk 'BEGIN{FS="[ \t]+:[ \t]"} /machine/ {print $2}' /proc/cpuinfo)" in + "Asus WLHDD") ifname=eth1;; + "Asus WL300G") ifname=eth1;; + esac + + local try=0; + while [ $((try++)) -le 5 ] && [ ! -f /sys/class/net/$ifname/operstate ]; do sleep 1; done +} + +boot_hook_add preinit_main preinit_iface diff --git a/target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm b/target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm new file mode 100644 index 0000000..f40e160 --- /dev/null +++ b/target/linux/brcm47xx/base-files/lib/preinit/15_set_preinit_interface_brcm @@ -0,0 +1,16 @@ +#!/bin/sh + +preinit_ip() { + # if the preinit interface isn't specified and ifname is set in + # preinit.arch use that interface + if [ -z "$pi_ifname" ]; then + pi_ifname=$ifname + fi + + [ -n "$pi_ifname" ] && grep -q "$pi_ifname" /proc/net/dev && { + ifconfig $pi_ifname $pi_ip netmask $pi_netmask broadcast $pi_broadcast up + + local try=0; + while [ $((try++)) -le 5 ] && [ ! "$(cat /sys/class/net/$pi_ifname/operstate)" = "up" ]; do sleep 1; done + } +} diff --git a/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh new file mode 100644 index 0000000..cbadefb --- /dev/null +++ b/target/linux/brcm47xx/base-files/lib/upgrade/platform.sh @@ -0,0 +1,157 @@ +PART_NAME=firmware + +# $(1): file to read magic from +# $(2): offset in bytes +get_magic_long_at() { + dd if="$1" skip=$2 bs=1 count=4 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"' +} + +platform_machine() { + grep "machine" /proc/cpuinfo | sed "s/.*:[ \t]*//" +} + +platform_expected_image() { + local machine=$(platform_machine) + + case "$machine" in + "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") echo "cybertan EWCB"; return;; + "Linksys WRT300N V1.1") echo "cybertan EWC2"; 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 +} + +brcm47xx_identify() { + local magic + + magic=$(get_magic_long "$1") + case "$magic" in + "48445230") + echo "trx" + return + ;; + "2a23245e") + echo "chk" + return + ;; + esac + + magic=$(get_magic_long_at "$1" 14) + [ "$magic" = "55324e44" ] && { + echo "cybertan" + return + } + + echo "unknown" +} + +platform_check_image() { + [ "$#" -gt 1 ] && return 1 + + local file_type=$(brcm47xx_identify "$1") + local magic + local error=0 + + case "$file_type" in + "chk") + 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_image) + echo "Found CHK image with device board_id $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 + } + + if ! otrx check "$1" -o "$header_len"; then + echo "No valid TRX firmware in the CHK image" + error=1 + fi + ;; + "cybertan") + local pattern=$(dd if="$1" bs=1 count=4 2>/dev/null | hexdump -v -e '1/1 "%c"') + local dev_pattern=$(platform_expected_image) + echo "Found CyberTAN image with device pattern: $pattern" + + [ -n "$dev_pattern" -a "cybertan $pattern" != "$dev_pattern" ] && { + echo "Firmware pattern doesn't match device pattern ($dev_pattern)" + error=1 + } + + if ! otrx check "$1" -o 32; then + echo "No valid TRX firmware in the CyberTAN image" + error=1 + fi + ;; + "trx") + if ! otrx check "$1"; then + echo "Invalid (corrupted?) TRX firmware" + error=1 + fi + ;; + *) + echo "Invalid image type. Please use only .trx files" + error=1 + ;; + esac + + return $error +} + +platform_trx_from_chk_cmd() { + local header_len=$((0x$(get_magic_long_at "$1" 4))) + + echo -n dd bs=$header_len skip=1 +} + +platform_trx_from_cybertan_cmd() { + echo -n dd bs=32 skip=1 +} + +platform_do_upgrade() { + local file_type=$(brcm47xx_identify "$1") + local trx="$1" + local cmd="" + + case "$file_type" in + "chk") cmd=$(platform_trx_from_chk_cmd "$trx");; + "cybertan") cmd=$(platform_trx_from_cybertan_cmd "$trx");; + esac + + default_do_upgrade "$trx" "$cmd" +} -- cgit v1.2.3