Changeset 38130


Ignore:
Timestamp:
2013-09-23T11:22:50+02:00 (4 years ago)
Author:
juhosg
Message:

ar71xx: image: update the Image/Build/CameoHornet macro

  • append the root squashfs directly to the kernel,
  • use the 64kraw-nojffs template instead of sqashfs-only
  • ensure that the generated images have enough erase blocks for JFFS2 garbage collection,

Tested on a TEW-712BR devices only.

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

File:
1 edited

Legend:

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

    r38129 r38130  
    391391 
    392392define Image/Build/CameoHornet 
    393         $(call Sysupgrade/KRuImage,$(1),$(2),$(5),$(6)) 
    394         if [ -e "$(call sysupname,$(1),$(2))" ]; then \ 
    395                 for r in $(9); do \ 
     393        $(eval fwsize=$(call mtdpartsize,firmware,$(4))) 
     394        $(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64) 
     395        if [ -e "$(call sysupname,$(1),$(2))" ]; then \ 
     396                for r in $(7); do \ 
    396397                        [ -n "$$$$r" ] && dashr="-$$$$r" || dashr=; \ 
    397398                        [ -z "$$$$r" ] && r="DEF"; \ 
    398                         mkcameofw -M HORNET -R "$$$$r" -S $(7) -V $(8) -c \ 
    399                                 -K $(10) -I $(11) \ 
     399                        mkcameofw -M HORNET -R "$$$$r" -S $(5) -V $(6) -c \ 
     400                                -K $(8) -I $(fwsize) \ 
    400401                                -k "$(call sysupname,$(1),$(2))" \ 
    401402                                -o $(call imgname,$(1),$(2))-factory$$$$dashr.bin; \ 
     
    406407 
    407408Image/Build/CameoAP121/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo_ap121_mtdlayout)) 
    408 Image/Build/CameoAP121=$(call Image/Build/CameoHornet,$(1),$(2),$(3),$(cameo_ap121_mtdlayout),65536,2686976,$(4),$(5),$(6),0xe0000,3735552) 
     409Image/Build/CameoAP121=$(call Image/Build/CameoHornet,$(1),$(2),$(3),$(cameo_ap121_mtdlayout),$(4),$(5),$(6),0xe0000) 
    409410Image/Build/CameoAP121/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo_ap121_mtdlayout)) 
    410411 
    411412Image/Build/CameoAP121_8M/buildkernel=$(call MkuImageLzma,$(2),$(3) $(cameo_ap121_mtdlayout_8M)) 
    412 Image/Build/CameoAP121_8M=$(call Image/Build/CameoHornet,$(1),$(2),$(3),$(cameo_ap121_mtdlayout_8M),65536,6422528,$(4),$(5),$(6),0x100000,7864320) 
     413Image/Build/CameoAP121_8M=$(call Image/Build/CameoHornet,$(1),$(2),$(3),$(cameo_ap121_mtdlayout_8M),$(4),$(5),$(6),0x100000) 
    413414Image/Build/CameoAP121_8M/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(cameo_ap121_mtdlayout_8M)) 
    414415 
     
    868869$(eval $(call SingleProfile,CameoAP81,64kraw-nojffs,TEW652BRP_RECOVERY,tew-652brp-recovery,TEW-632BRP,ttyS0,115200,"AP81-AR9130-RT-070614-02")) 
    869870 
    870 $(eval $(call SingleProfile,CameoAP121,squashfs-only,TEW712BR,tew-712br,TEW-712BR,ttyATH0,115200,"HORNET-RT-TEW712BR-3",1.99,"")) 
    871 $(eval $(call SingleProfile,CameoAP121,squashfs-only,DIR601B1,dir-601-b1,TEW-712BR,ttyATH0,115200,"HORNET-RT-DIR601B1-3",2.99.99,"" "NA")) 
    872 $(eval $(call SingleProfile,CameoAP121_8M,squashfs-only,DIR505A1,dir-505-a1,DIR-505-A1,ttyATH0,115200,"HORNET-PACKET-DIR505A1-3",1.99.99,"")) 
     871$(eval $(call SingleProfile,CameoAP121,64kraw-nojffs,TEW712BR,tew-712br,TEW-712BR,ttyATH0,115200,"HORNET-RT-TEW712BR-3",1.99,"")) 
     872$(eval $(call SingleProfile,CameoAP121,64kraw-nojffs,DIR601B1,dir-601-b1,TEW-712BR,ttyATH0,115200,"HORNET-RT-DIR601B1-3",2.99.99,"" "NA")) 
     873$(eval $(call SingleProfile,CameoAP121_8M,64kraw-nojffs,DIR505A1,dir-505-a1,DIR-505-A1,ttyATH0,115200,"HORNET-PACKET-DIR505A1-3",1.99.99,"")) 
    873874 
    874875$(eval $(call SingleProfile,CameoDB120,64kraw,DIR825C1,dir-825-c1,DIR-825-C1,ttyS0,115200,"00DB120AR9344-RT-101214-00")) 
Note: See TracChangeset for help on using the changeset viewer.