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/lib | |
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/lib')
-rwxr-xr-x | target/linux/ar71xx/base-files/lib/ar71xx.sh | 7 | ||||
-rwxr-xr-x | target/linux/ar71xx/base-files/lib/upgrade/platform.sh | 3 |
2 files changed, 7 insertions, 3 deletions
diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh index 8db983039c..2b083e1920 100755 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh @@ -201,8 +201,11 @@ ar71xx_board_detect() { *"DIR-825 rev. B1") name="dir-825-b1" ;; - *"DIR-825 rev. B1 OpenWrt") - name="dir-825-b1-openwrt" + *"DIR-825 rev. B1 WHOLEFLASH") + name="dir-825-b1-wholeflash" + ;; + *"DIR-825 rev. B1 TOWHOLEFLASH") + name="dir-825-b1-towholeflash" ;; *"DIR-825 rev. B1 TOSTOCK") name="dir-825-b1-tostock" diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh index 2992aed322..9987b2442e 100755 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh @@ -101,7 +101,8 @@ platform_check_image() { dir-615-c1 | \ dir-615-e4 | \ dir-825-b1 | \ - dir-825-b1-openwrt | \ + dir-825-b1-towholeflash | \ + dir-825-b1-wholeflash | \ dir-825-b1-tostock | \ ew-dorin | \ ew-dorin-router | \ |