diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-09-18 14:30:57 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-09-18 14:30:57 +0000 |
commit | 2b115509384a525e6dd16d0e0ad38447876c8dd3 (patch) | |
tree | f6721f6b8faeb57c0c40c95e4e434044a0135ac5 /target/linux/ar71xx/base-files/etc | |
parent | 06276fdcf62b9ffe32e29bff5d96be659eb5ca10 (diff) | |
download | master-187ad058-2b115509384a525e6dd16d0e0ad38447876c8dd3.tar.gz master-187ad058-2b115509384a525e6dd16d0e0ad38447876c8dd3.tar.bz2 master-187ad058-2b115509384a525e6dd16d0e0ad38447876c8dd3.zip |
ar71xx: revert DIR-825-B1 wholeflash image support.
It should be implemmented in a cleaner way.
This reverts the following commits:
[ar71xx] dir-825-b1: Fix wholeflash images
[ar71xx] dir825b1: Add image for DIR-825-B1 that uses the whole flash"
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33459 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/base-files/etc')
4 files changed, 2 insertions, 79 deletions
diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh index 52176a8579..420d690245 100755 --- a/target/linux/ar71xx/base-files/etc/diag.sh +++ b/target/linux/ar71xx/base-files/etc/diag.sh @@ -64,10 +64,7 @@ get_status_led() { dir-615-c1) status_led="d-link:green:status" ;; - dir-825-b1 |\ - dir-825-b1-towholeflash |\ - dir-825-b1-wholeflash |\ - dir-825-b1-stock) + dir-825-b1) status_led="d-link:orange:power" ;; eap7660d) diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/caldata-migration b/target/linux/ar71xx/base-files/etc/uci-defaults/caldata-migration deleted file mode 100644 index 486e4ed7b8..0000000000 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/caldata-migration +++ /dev/null @@ -1,68 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2011 OpenWrt.org -# - -. /lib/functions/uci-defaults.sh -. /lib/ar71xx.sh - -board=$(ar71xx_board_name) - -findmtd() { - local partname="$1" - grep "\"$partname\"" /proc/mtd | awk -F: '{ print $1 }' -} - -getcalmac() { - local partname="$1" - local offset="$2" - - hexdump -e '17/1 "%c"' -s $offset -n 17 /dev/$(findmtd $partname) | tr -d : | tr 'A-Z' 'a-z' -} - -calcmacX() { - local mac="$1" - local X="$2" - - local oui="$(expr substr "$mac" 1 6)" - local end="$(expr substr "$mac" 7 12)" - - echo -n $oui - expr substr "$(printf "%6lx" "$(($(printf "%lu" 0x${end}) + $X))")" 1 6 -} - -getifmac() { - local ifname="$1" - - local ifmac - - ifmac="$(ifconfig "$ifname" | grep HWaddr)" - ifmac="${ifmac#*HWaddr }" - ifmac="${ifmac%% *}" - - echo "$ifmac" | tr -d : | tr 'A-Z' 'a-z' -} - -case "$board" in -dir-825-b1-towholeflash) - mac1="$(getcalmac caldata 65440)" - mac1="$(calcmacX "$mac1" 2)" - mac2="$(calcmacX "$mac1" 1)" - - if grep -q '"owrt_caldata"' /proc/mtd && [ "$mac1" = "$(getifmac eth0)" ] && [ "$mac2" = "$(getifmac eth1)" ]; then - mtd erase owrt_caldata - dd if=/dev/$(findmtd caldata) of=/dev/$(findmtd owrt_caldata) bs=65536 count=1 - fi - ;; -dir-825-b1-tostock) - mac1="$(getcalmac owrt_caldata 65440)" - mac1="$(calcmacX "$mac1" 2)" - mac2="$(calcmacX "$mac1" 1)" - if grep -q '"owrt_caldata"' /proc/mtd && [ "$mac1" = "$(getifmac eth0)" ] && [ "$mac2" = "$(getifmac eth1)" ]; then - mtd erase caldata - dd if=/dev/$(findmtd owrt_caldata) of=/dev/$(findmtd caldata) bs=65536 count=1 - fi - ;; -esac - -return 0 diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/leds b/target/linux/ar71xx/base-files/etc/uci-defaults/leds index e8daba594a..5e2e9acfb7 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/leds +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/leds @@ -54,10 +54,7 @@ dir-615-e4) ucidef_set_led_switch "lan4" "LAN4" "d-link:green:lan4" "switch0" "0x10" ;; -dir-825-b1|\ -dir-825-b1-towholeflash|\ -dir-825-b1-wholeflash|\ -dir-825-b1-tostock) +dir-825-b1) ucidef_set_led_usbdev "usb" "USB" "d-link:blue:usb" "1-1" ;; diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/network b/target/linux/ar71xx/base-files/etc/uci-defaults/network index 0b7c6a2400..3f8795031e 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/network +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/network @@ -33,9 +33,6 @@ rb-2011uas-2hnd) ;; dir-825-b1|\ -dir-825-b1-towholeflash|\ -dir-825-b1-wholeflash|\ -dir-825-b1-tostock|\ tew-673gru) ucidef_set_interfaces_lan_wan "eth0.1" "eth1" ucidef_add_switch "rtl8366s" "1" "1" |