Changeset 38139


Ignore:
Timestamp:
2013-09-23T14:14:20+02:00 (4 years ago)
Author:
juhosg
Message:

ar71xx: image: update Build/Image/Planex macro

  • remove the 'kernel' and 'rootfs' partitions from the mtd layout,
  • move the .okli image into the uImage,
  • 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 the MZK-W300NH board only.

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

File:
1 edited

Legend:

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

    r38138 r38139  
    189189dlrtdev_mtdlayout_fat=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,7168k(firmware),640k(certs),64k(caldata)ro,64k@0x660000(caldata_orig),6208k@0x50000(firmware_orig) 
    190190pb92_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) 
    191 planex_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1024k(kernel),6656k(rootfs),128k(art)ro,7744k@0x50000(firmware) 
     191planex_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7744k(firmware),128k(art)ro 
    192192ubntxm_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,7552k(firmware),256k(cfg)ro,64k(EEPROM)ro 
    193193uap_pro_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1536k(kernel),14208k(rootfs),256k(cfg)ro,64k(EEPROM)ro,15744k@0x50000(firmware) 
     
    534534define Image/Build/Planex/buildkernel 
    535535        [ -e "$(KDIR)/loader-$(2).gz" ] 
    536         $(call MkuImage,gzip,,$(KDIR)/loader-$(2).gz,$(KDIR_TMP)/vmlinux-$(2).uImage) 
    537536        $(call MkuImageOKLI,$(2)) 
    538537        ( \ 
    539                 dd if=$(KDIR_TMP)/vmlinux-$(2).uImage bs=8k count=1 conv=sync; \ 
     538                dd if=$(KDIR)/loader-$(2).gz bs=8128 count=1 conv=sync; \ 
    540539                dd if=$(KDIR_TMP)/vmlinux-$(2).okli; \ 
    541540        ) > $(KDIR_TMP)/kernel-$(2).bin 
     541        $(call MkuImage,gzip,,$(KDIR_TMP)/kernel-$(2).bin,$(KDIR_TMP)/vmlinux-$(2).uImage) 
    542542endef 
    543543 
    544544define Image/Build/Planex 
    545         $(call Sysupgrade/KR,$(1),$(KDIR_TMP)/kernel-$(2).bin,1048576,6750208,$(2)) 
     545        $(eval fwsize=$(call mtdpartsize,firmware,$(planex_mtdlayout))) 
     546        $(call Sysupgrade/KRuImage,$(1),$(2),0,$$$$(($(fwsize)-4*64*1024)),64) 
    546547        if [ -e "$(call sysupname,$(1),$(2))" ]; then \ 
    547548                $(STAGING_DIR_HOST)/bin/mkplanexfw \ 
     
    926927$(eval $(call SingleProfile,PB4X,64k,PB44,pb44,PB44,ttyS0,115200)) 
    927928 
    928 $(eval $(call SingleProfile,Planex,64k,MZKW04NU,mzk-w04nu,MZK-W04NU,ttyS0,115200)) 
    929 $(eval $(call SingleProfile,Planex,64k,MZKW300NH,mzk-w300nh,MZK-W300NH,ttyS0,115200)) 
     929$(eval $(call SingleProfile,Planex,64kraw,MZKW04NU,mzk-w04nu,MZK-W04NU,ttyS0,115200)) 
     930$(eval $(call SingleProfile,Planex,64kraw,MZKW300NH,mzk-w300nh,MZK-W300NH,ttyS0,115200)) 
    930931 
    931932$(eval $(call SingleProfile,Seama,64k,MYNETN600,mynet-n600,MYNET-N600,ttyS0,115200,$$(mynet_n600_mtdlayout),wrgnd16_wd_db600,1310720,16187392)) 
Note: See TracChangeset for help on using the changeset viewer.