Changeset 33459


Ignore:
Timestamp:
2012-09-18T16:30:57+02:00 (5 years ago)
Author:
juhosg
Message:

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"

Location:
trunk/target/linux/ar71xx
Files:
2 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar71xx/base-files/etc/diag.sh

    r33447 r33459  
    6565                status_led="d-link:green:status" 
    6666                ;; 
    67         dir-825-b1 |\ 
    68         dir-825-b1-towholeflash |\ 
    69         dir-825-b1-wholeflash |\ 
    70         dir-825-b1-stock) 
     67        dir-825-b1) 
    7168                status_led="d-link:orange:power" 
    7269                ;; 
  • trunk/target/linux/ar71xx/base-files/etc/uci-defaults/leds

    r33447 r33459  
    5555        ;; 
    5656 
    57 dir-825-b1|\ 
    58 dir-825-b1-towholeflash|\ 
    59 dir-825-b1-wholeflash|\ 
    60 dir-825-b1-tostock) 
     57dir-825-b1) 
    6158        ucidef_set_led_usbdev "usb" "USB" "d-link:blue:usb" "1-1" 
    6259        ;; 
  • trunk/target/linux/ar71xx/base-files/etc/uci-defaults/network

    r33447 r33459  
    3434 
    3535dir-825-b1|\ 
    36 dir-825-b1-towholeflash|\ 
    37 dir-825-b1-wholeflash|\ 
    38 dir-825-b1-tostock|\ 
    3936tew-673gru) 
    4037        ucidef_set_interfaces_lan_wan "eth0.1" "eth1" 
  • trunk/target/linux/ar71xx/base-files/lib/ar71xx.sh

    r33447 r33459  
    202202                name="dir-825-b1" 
    203203                ;; 
    204         *"DIR-825 rev. B1 WHOLEFLASH") 
    205                 name="dir-825-b1-wholeflash" 
    206                 ;; 
    207         *"DIR-825 rev. B1 TOWHOLEFLASH") 
    208                 name="dir-825-b1-towholeflash" 
    209                 ;; 
    210         *"DIR-825 rev. B1 TOSTOCK") 
    211                 name="dir-825-b1-tostock" 
    212                 ;; 
    213204        *EAP7660D) 
    214205                name="eap7660d" 
  • trunk/target/linux/ar71xx/base-files/lib/upgrade/platform.sh

    r33447 r33459  
    102102        dir-615-e4 | \ 
    103103        dir-825-b1 | \ 
    104         dir-825-b1-towholeflash | \ 
    105         dir-825-b1-wholeflash | \ 
    106         dir-825-b1-tostock | \ 
    107104        ew-dorin | \ 
    108105        ew-dorin-router | \ 
  • trunk/target/linux/ar71xx/generic/profiles/d-link.mk

    r33447 r33459  
    5151$(eval $(call Profile,DIR615E4)) 
    5252 
    53 define Profile/DIR825B1_ALL 
    54         NAME:=D-Link DIR-825 rev. B1 - all flavours 
    55         PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev 
    56 endef 
    57  
    58 define Profile/DIR825B1_ALL/Description 
    59     Build all D-Link DIR-825 rev. B1 images 
    60 endef 
    61  
    62 $(eval $(call Profile,DIR825B1_ALL)) 
    6353 
    6454define Profile/DIR825B1 
     
    6959define Profile/DIR825B1/Description 
    7060        Package set optimized for the D-Link DIR-825 rev. B1. 
    71         WARNING: Flashing wholeflash (openwrt optimized) image may brick your router 
    72         .  This will occur if your openwrt optimized image is larger than the 
    73         maximum size for a regular dir-825 b1 image (a little more than 6MB). 
    74         Please flash a TOWHOLEFLASH image instead of this image before flashing 
    75 a  
    76         WHOLEFLASH image. 
    7761endef 
    7862 
    7963$(eval $(call Profile,DIR825B1)) 
    80  
    81 define Profile/DIR825B1_TOWHOLEFLASH 
    82         NAME:=D-Link DIR-825 rev. B1 designed for transition to image using whole flash 
    83         PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev 
    84 endef 
    85  
    86 define Profile/DIR825B1_TOWHOLEFLASH/Description 
    87         Package set optimized for the D-Link DIR-825 rev. B1. design for transtion to 
    88         image using whole flash. 
    89         Copies the calibration data to the last erase block so that, if desired, 
    90         an image optimized for use with OpenWrt (access to full flash) can be flashed. 
    91 endef 
    92  
    93 $(eval $(call Profile,DIR825B1_TOWHOLEFLASH)) 
    94  
    95 define Profile/DIR825B1_WHOLEFLASH 
    96         NAME:=D-Link DIR-825 rev. B1 optimized for OpenWrt which uses full 8M flash 
    97         PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev 
    98 endef 
    99  
    100 define Profile/DIR825B1_WHOLEFLASH/Description 
    101         Package set optimized for the D-Link DIR-825 rev. B1. using wholeflash 
    102         Can only be flashed from OpenWrt because it requires that the calibration data 
    103         be on the last sector of the flash (which the 'standard' version that can be flashed from 
    104         stock will ensure).      
    105 endef 
    106  
    107 $(eval $(call Profile,DIR825B1_WHOLEFLASH)) 
    108  
    109 define Profile/DIR825B1_TOSTOCK 
    110         NAME:=D-Link DIR-825 rev. B1 that undoes OpenWrt optimization (i.e. wholeflash) 
    111         PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev 
    112 endef 
    113  
    114 define Profile/DIR825B1_TOSTOCK/Description 
    115         Package set optimized for the D-Link DIR-825 rev. B1. that undoes OpenWrt optimization 
    116         Copies the calibration data from the last erase block to the erase block normally used 
    117         by the stock firmware for said data. 
    118 endef 
    119  
    120 $(eval $(call Profile,DIR825B1_TOSTOCK)) 
    121  
  • trunk/target/linux/ar71xx/image/Makefile

    r33447 r33459  
    172172db120_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6336k(rootfs),1408k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware) 
    173173dir825b1_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,1024k(kernel),5184k(rootfs),64k(caldata)ro,1600k(unknown)ro,6208k@0x50000(firmware) 
    174 dir825b1_towholeflash_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,1024k(kernel),5184k(rootfs),64k(caldata)ro,1536k(unknown)ro,64k(owrt_caldata),7808k@0x50000(firmware) 
    175 dir825b1_wholeflash_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,1024k(kernel),6784k(rootfs),64k(caldata)ro,7808k@0x50000(firmware) 
    176174ew-dorin_mtdlayout_4M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),1024k(kernel),2688k(rootfs),64k(art),3712k@0x50000(firmware) 
    177 dir825b1_tostock_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,1024k(kernel),5184k(rootfs),64k(caldata),1536k(unknown)ro,64k(owrt_caldata)ro,6208k@0x50000(firmware) 
    178175pb92_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2752k(rootfs),896k(kernel),64k(nvram),64k(art)ro,3648k@0x50000(firmware) 
    179176planex_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,960k(kernel),6784k(rootfs),128k(art)ro,7744k@0x50000(firmware) 
     
    220217                fi; \ 
    221218        fi 
    222 endef 
    223  
    224 define Image/Build/DIR825B1_TOWHOLEFLASH 
    225         $(call MkuImageLzma,$(2),$(3) $(dir825b1_towholeflash_mtdlayout)) 
    226         $(call Sysupgrade/KRuImage,$(1),$(2),1048576,5308416) 
    227         if [ -e "$(call sysupname,$(1),$(2))" ]; then \ 
    228                 ( \ 
    229                         dd if=$(call sysupname,$(1),$(2)); \ 
    230                         echo -n "$(4)"; \ 
    231                 ) > $(call imgname,$(1),$(2))-backup-loader.bin; \ 
    232                 if [ `stat -c%s $(call sysupname,$(1),$(2))` -gt 4194304 ]; then \ 
    233                         echo "Warning: $(call sysupname,$(1),$(2)) is too big"; \ 
    234                 else \ 
    235                         ( \ 
    236                                 dd if=$(call sysupname,$(1),$(2)) bs=4096k conv=sync; \ 
    237                                 echo -n "$(5)"; \ 
    238                         ) > $(call factoryname,$(1),$(2)); \ 
    239                 fi; \ 
    240         fi 
    241 endef 
    242  
    243 define Image/Build/DIR825B1_WHOLEFLASH 
    244         $(call MkuImageLzma,$(2),$(3) $(dir825b1_wholeflash_mtdlayout)) 
    245         $(call Sysupgrade/KRuImage,$(1),$(2),1048576,6946816) 
    246 endef 
    247  
    248 define Image/Build/DIR825B1_TOSTOCK 
    249         $(call MkuImageLzma,$(2),$(3) $(dir825b1_tostock_mtdlayout)) 
    250         $(call Sysupgrade/KRuImage,$(1),$(2),1048576,5308416) 
    251219endef 
    252220 
     
    790758 
    791759$(eval $(call SingleProfile,DIR825B1,$(fs_64k),DIR825B1,dir-825-b1,DIR-825-B1,ttyS0,115200,01AP94-AR7161-RT-080619-00,00AP94-AR7161-RT-080619-00)) 
    792 $(eval $(call SingleProfile,DIR825B1_TOWHOLEFLASH,$(fs_64k),DIR825B1_TOWHOLEFLASH,dir-825-b1-towholeflash,DIR-825-B1_TOWHOLEFLASH,ttyS0,115200,01AP94-AR7161-RT-080619-00,00AP94-AR7161-RT-080619-00)) 
    793 $(eval $(call SingleProfile,DIR825B1_WHOLEFLASH,$(fs_64k),DIR825B1_WHOLEFLASH,dir-825-b1-wholeflash,DIR-825-B1_WHOLEFLASH,ttyS0,115200,01AP94-AR7161-RT-080619-00,00AP94-AR7161-RT-080619-00)) 
    794 $(eval $(call SingleProfile,DIR825B1_TOSTOCK,$(fs_64k),DIR825B1_TOSTOCK,dir-825-b1-tostock,DIR-825-B1_TOSTOCK,ttyS0,115200,01AP94-AR7161-RT-080619-00,00AP94-AR7161-RT-080619-00)) 
    795760$(eval $(call SingleProfile,DIR825B1,$(fs_64k),TEW673GRU,tew-637gru,TEW-673GRU,ttyS0,115200,01AP94-AR7161-RT-080619-01,00AP94-AR7161-RT-080619-01)) 
    796761 
     
    883848 
    884849$(eval $(call MultiProfile,AP121,AP121_2M AP121_4M)) 
    885 $(eval $(call MultiProfile,DIR825B1_ALL,DIR825B1 DIR825B1_TOWHOLEFLASH DIR825B1_WHOLEFLASH DIR825B1_TOSTOCK)) 
    886850$(eval $(call MultiProfile,EWDORIN, EWDORINAP EWDORINRT)) 
    887851$(eval $(call MultiProfile,TEW652BRP,TEW652BRP_FW TEW652BRP_RECOVERY)) 
Note: See TracChangeset for help on using the changeset viewer.