Changeset 38151


Ignore:
Timestamp:
2013-09-24T10:14:44+02:00 (4 years ago)
Author:
juhosg
Message:

ar71xx: image: update Image/Build/CameoAP94 macro

  • append the root squashfs directly after the kernel,
  • use the 64kraw template instead of the 64k,
  • ensure that the generated images have enough erase blocks for JFFS2 garbage collection,

Tested on a TEW-673GRU board.

Signed-off-by: Gabor Juhos <juhosg@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar71xx/image/Makefile

    r38150 r38151  
    241241 
    242242define Image/Build/CameoAP94 
    243         $(call Sysupgrade/KRuImage,$(1),$(2),65536,5308416) 
     243        $(eval fwsize=$(call mtdpartsize,firmware,$(4))) 
     244        $(eval fwsize_fat=$(call mtdpartsize,firmware,$(5))) 
     245        $(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64) 
    244246        if [ -e "$(call sysupname,$(1),$(2))" ]; then \ 
    245247                ( \ 
     
    256258                fi; \ 
    257259        fi 
    258         $(call CatFiles,$(KDIR_TMP)/vmlinux-$(2)-fat.uImage,65536,$(KDIR)/root.$(1),6946816,$(KDIR_TMP)/$(2)-fat.bin) 
     260        $(call CatFiles,$(KDIR_TMP)/vmlinux-$(2)-fat.uImage,0,$(KDIR)/root.$(1),$$$$(($(fwsize_fat)-4*64*1024)),$(KDIR_TMP)/$(2)-fat.bin,64) 
    259261        if [ -e "$(KDIR_TMP)/$(2)-fat.bin" ]; then \ 
    260262                echo -n "" > $(KDIR_TMP)/$(2)-fat.dummy; \ 
     
    854856$(eval $(call SingleProfile,CyberTAN,64k,WRT160NL,wrt160nl,WRT160NL,ttyS0,115200,1.00.01)) 
    855857 
    856 $(eval $(call SingleProfile,CameoAP94,64k,DIR825B1,dir-825-b1,DIR-825-B1,ttyS0,115200,$$(cameo_ap94_mtdlayout),$$(cameo_ap94_mtdlayout_fat),01AP94-AR7161-RT-080619-00,00AP94-AR7161-RT-080619-00)) 
    857 $(eval $(call SingleProfile,CameoAP94,64k,TEW673GRU,tew-673gru,TEW-673GRU,ttyS0,115200,$$(cameo_ap94_mtdlayout),$$(cameo_ap94_mtdlayout_fat),01AP94-AR7161-RT-080619-01,00AP94-AR7161-RT-080619-01)) 
    858 $(eval $(call SingleProfile,CameoAP94,64k,DLRTDEV01,dlrtdev01,DIR-825-B1,ttyS0,115200,$$(dlrtdev_mtdlayout),$$(dlrtdev_mtdlayout_fat),01AP94-AR7161-RT-080619-00,00AP94-AR7161-RT-080619-00)) 
     858$(eval $(call SingleProfile,CameoAP94,64kraw,DIR825B1,dir-825-b1,DIR-825-B1,ttyS0,115200,$$(cameo_ap94_mtdlayout),$$(cameo_ap94_mtdlayout_fat),01AP94-AR7161-RT-080619-00,00AP94-AR7161-RT-080619-00)) 
     859$(eval $(call SingleProfile,CameoAP94,64kraw,TEW673GRU,tew-673gru,TEW-673GRU,ttyS0,115200,$$(cameo_ap94_mtdlayout),$$(cameo_ap94_mtdlayout_fat),01AP94-AR7161-RT-080619-01,00AP94-AR7161-RT-080619-01)) 
     860$(eval $(call SingleProfile,CameoAP94,64kraw,DLRTDEV01,dlrtdev01,DIR-825-B1,ttyS0,115200,$$(dlrtdev_mtdlayout),$$(dlrtdev_mtdlayout_fat),01AP94-AR7161-RT-080619-00,00AP94-AR7161-RT-080619-00)) 
    859861 
    860862$(eval $(call SingleProfile,MyLoader,64k,WP543_2M,wp543,,ttyS0,115200,0x200000,2M)) 
Note: See TracChangeset for help on using the changeset viewer.