Changeset 38153


Ignore:
Timestamp:
2013-09-24T11:36:26+02:00 (4 years ago)
Author:
juhosg
Message:

ar71xx: update the Image/Build/WZRHP macro

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

Tested on WZR-HP-G300NH and WZR-600DHP boards.

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

File:
1 edited

Legend:

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

    r38152 r38153  
    269269 
    270270define Image/Build/WZRHP 
    271         $(call Sysupgrade/KRuImage,$(1),$(2),$(3),$(4)) 
     271        $(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(3)-4*$(4)*1024)),$(4)) 
    272272        if [ -e "$(call sysupname,$(1),$(2))" ]; then \ 
    273273                ( \ 
     
    287287Image/Build/WZRHP64K/buildkernel=$(call MkuImageLzma,$(2),$(3)) 
    288288Image/Build/WZRHP64K/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4)) 
    289 Image/Build/WZRHP64K=$(call Image/Build/WZRHP,$(1),$(2),65536,31850496,$(4)) 
     289Image/Build/WZRHP64K=$(call Image/Build/WZRHP,$(1),$(2),33095680,64,$(4)) 
    290290 
    291291Image/Build/WZRHP128K/buildkernel=$(call MkuImageLzma,$(2),$(3)) 
    292292Image/Build/WZRHP128K/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4)) 
    293 Image/Build/WZRHP128K=$(call Image/Build/WZRHP,$(1),$(2),131072,31850496,$(4)) 
     293Image/Build/WZRHP128K=$(call Image/Build/WZRHP,$(1),$(2),33030144,128,$(4)) 
    294294 
    295295 
     
    787787$(eval $(call BuildTemplate,64kraw-nojffs,-raw)) 
    788788$(eval $(call BuildTemplate,128k,,128k)) 
     789$(eval $(call BuildTemplate,128kraw,-raw,128k)) 
    789790$(eval $(call BuildTemplate,256k,,256k)) 
    790791$(eval $(call BuildTemplate,all,,64k 128k 256k)) 
     
    955956$(eval $(call SingleProfile,WRT400N,64k,WRT400N,wrt400n,WRT400N,ttyS0,115200)) 
    956957 
    957 $(eval $(call SingleProfile,WZRHP128K,128k,WZRHPG300NH,wzr-hp-g300nh,WZR-HP-G300NH,ttyS0,115200,WZR-HP-G300NH)) 
    958 $(eval $(call SingleProfile,WZRHP64K,64k,WZRHPG300NH2,wzr-hp-g300nh2,WZR-HP-G300NH2,ttyS0,115200,WZR-HP-G300NH2)) 
    959 $(eval $(call SingleProfile,WZRHP64K,64k,WZRHPAG300H,wzr-hp-ag300h,WZR-HP-AG300H,ttyS0,115200,WZR-HP-AG300H)) 
    960 $(eval $(call SingleProfile,WZRHP64K,64k,WZRHPG450H,wzr-hp-g450h,WZR-HP-G450H,ttyS0,115200,WZR-HP-AG450H)) 
    961 $(eval $(call SingleProfile,WZRHP64K,64k,WZR600DHP,wzr-600dhp,WZR-HP-AG300H,ttyS0,115200,WZR-600DHP)) 
     958$(eval $(call SingleProfile,WZRHP128K,128kraw,WZRHPG300NH,wzr-hp-g300nh,WZR-HP-G300NH,ttyS0,115200,WZR-HP-G300NH)) 
     959$(eval $(call SingleProfile,WZRHP64K,64kraw,WZRHPG300NH2,wzr-hp-g300nh2,WZR-HP-G300NH2,ttyS0,115200,WZR-HP-G300NH2)) 
     960$(eval $(call SingleProfile,WZRHP64K,64kraw,WZRHPAG300H,wzr-hp-ag300h,WZR-HP-AG300H,ttyS0,115200,WZR-HP-AG300H)) 
     961$(eval $(call SingleProfile,WZRHP64K,64kraw,WZRHPG450H,wzr-hp-g450h,WZR-HP-G450H,ttyS0,115200,WZR-HP-AG450H)) 
     962$(eval $(call SingleProfile,WZRHP64K,64kraw,WZR600DHP,wzr-600dhp,WZR-HP-AG300H,ttyS0,115200,WZR-600DHP)) 
    962963 
    963964$(eval $(call SingleProfile,Zcomax,64k,ZCN1523H28,zcn-1523h-2-8,ZCN-1523H-2,ttyS0,115200,$$(zcn1523h_mtdlayout))) 
Note: See TracChangeset for help on using the changeset viewer.