diff options
| author | Daniel Dickinson <daniel@cshore.neomailbox.net> | 2012-09-17 14:17:12 +0000 |
|---|---|---|
| committer | Daniel Dickinson <daniel@cshore.neomailbox.net> | 2012-09-17 14:17:12 +0000 |
| commit | 4ea95cae7d2e182daf804f8b29f303b455b53cea (patch) | |
| tree | 9164a0bfe89c830f217e433bd8d203cda623421a /target/linux/ar71xx/base-files/etc/uci-defaults | |
| parent | 0611e73d533c9ddbe8fa870fe64c17ab94a3e185 (diff) | |
| download | master-187ad058-4ea95cae7d2e182daf804f8b29f303b455b53cea.tar.gz master-187ad058-4ea95cae7d2e182daf804f8b29f303b455b53cea.tar.bz2 master-187ad058-4ea95cae7d2e182daf804f8b29f303b455b53cea.zip | |
[ar71xx] dir-825-b1: Fix wholeflash images: Attempting to flash a wholeflash (-openwrt) image from the normal image would brick (but recoverable via emergency flash) the router if the wholeflash image was larger than the maximum size for a normal image. First we rename the -openwrt images to -wholeflash since -openwrt is really too generic. We also revert the changes to the regular dir-825-b1 image, which now is the same as before, but add a -towholeflash image which is almost the same as the regular dir-825-b1 image, but copies caldata to new location and allows flashing of images that use the full flash (except u-boot, u-boot-env, and caldata paritition space) (these are the -wholeflash images).
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33447 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx/base-files/etc/uci-defaults')
3 files changed, 9 insertions, 3 deletions
diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/caldata-migration b/target/linux/ar71xx/base-files/etc/uci-defaults/caldata-migration index 750ff405d3..486e4ed7b8 100644 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/caldata-migration +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/caldata-migration @@ -44,12 +44,13 @@ getifmac() { } case "$board" in -dir-825-b1) +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 ;; @@ -58,6 +59,7 @@ dir-825-b1-tostock) 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 ;; diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/leds b/target/linux/ar71xx/base-files/etc/uci-defaults/leds index 5e2e9acfb7..e8daba594a 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/leds +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/leds @@ -54,7 +54,10 @@ dir-615-e4) ucidef_set_led_switch "lan4" "LAN4" "d-link:green:lan4" "switch0" "0x10" ;; -dir-825-b1) +dir-825-b1|\ +dir-825-b1-towholeflash|\ +dir-825-b1-wholeflash|\ +dir-825-b1-tostock) 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 f749cc668b..0b7c6a2400 100755 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/network +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/network @@ -33,7 +33,8 @@ rb-2011uas-2hnd) ;; dir-825-b1|\ -dir-825-b1-openwrt|\ +dir-825-b1-towholeflash|\ +dir-825-b1-wholeflash|\ dir-825-b1-tostock|\ tew-673gru) ucidef_set_interfaces_lan_wan "eth0.1" "eth1" |