Changeset 31114


Ignore:
Timestamp:
2012-03-27T21:38:10+02:00 (4 years ago)
Author:
juhosg
Message:

ar71xx: image: pass mtdlayout variables by value

File:
1 edited

Legend:

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

    r31113 r31114  
    178178 
    179179define Image/Build/WHRHPG300N 
    180         $(call MkuImageLzma,$(2),$(3) $($(4))) 
     180        $(call MkuImageLzma,$(2),$(3) $(4)) 
    181181        $(call Sysupgrade/KRuImage,$(1),$(2),983040,2883584) 
    182182        if [ -e "$(call sysupname,$(1),$(2))" ]; then \ 
     
    228228 
    229229define Image/Build/AthGzip 
    230         $(call MkuImageGzip,$(2),$(3) $($(4))) 
     230        $(call MkuImageGzip,$(2),$(3) $(4)) 
    231231        $(call Image/Build/Ath,$(1),$(2),$(3),$(4),$(5),$(6),$(7)) 
    232232endef 
    233233 
    234234define Image/Build/AthGzip/initramfs 
    235         $(call MkuImageGzip,$(2),$(3) $($(4))) 
     235        $(call MkuImageGzip,$(2),$(3) $(4)) 
    236236        $(CP) $(KDIR_TMP)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin 
    237237endef 
    238238 
    239239define Image/Build/AthLzma 
    240         $(call MkuImageLzma,$(2),$(3) $($(4))) 
     240        $(call MkuImageLzma,$(2),$(3) $(4)) 
    241241        $(call Image/Build/Ath,$(1),$(2),$(3),$(4),$(5),$(6),$(7)) 
    242242endef 
    243243 
    244244define Image/Build/AthLzma/initramfs 
    245         $(call MkuImageLzma,$(2),$(3) $($(4))) 
     245        $(call MkuImageLzma,$(2),$(3) $(4)) 
    246246        $(CP) $(KDIR_TMP)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin 
    247247endef 
     
    512512 
    513513define Image/Build/Netgear/initramfs 
    514         $(call MkuImageLzma,$(2),$(3) $($(4))) 
     514        $(call MkuImageLzma,$(2),$(3) $(4)) 
    515515        $(STAGING_DIR_HOST)/bin/wndr3700 \ 
    516516                $(KDIR_TMP)/vmlinux-$(2).uImage \ 
     
    625625alfa_ap96_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13312k(rootfs),2048k(kernel),512k(caldata)ro,15360k@0x80000(firmware) 
    626626define Image/Build/Profile/ALFAAP96 
    627         $(call Image/Build/Template/$(fs_128k)/$(1),AthLzma,alfa-ap96,$(alfa_ap96_cmdline),alfa_ap96_mtdlayout,2097152,13631488,RKuImage) 
     627        $(call Image/Build/Template/$(fs_128k)/$(1),AthLzma,alfa-ap96,$(alfa_ap96_cmdline),$(alfa_ap96_mtdlayout),2097152,13631488,RKuImage) 
    628628endef 
    629629 
     
    631631ap113_cmdline=board=AP113 console=ttyS0,115200 
    632632define Image/Build/Profile/AP113 
    633         $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap113,$(ap113_cmdline),ap113_mtd_layout,917504,3080192,RK) 
     633        $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap113,$(ap113_cmdline),$(ap113_mtd_layout),917504,3080192,RK) 
    634634endef 
    635635 
     
    639639ap121_cmdline=board=AP121 console=ttyATH0,115200 
    640640define Image/Build/Profile/AP121 
    641         $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-2M,$(ap121_cmdline),ap121_mtdlayout_2M,720896,1245184,RKuImage) 
    642         $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-4M,$(ap121_cmdline),ap121_mtdlayout_4M,917504,2818048,RKuImage) 
     641        $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-2M,$(ap121_cmdline),$(ap121_mtdlayout_2M),720896,1245184,RKuImage) 
     642        $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-4M,$(ap121_cmdline),$(ap121_mtdlayout_4M),917504,2818048,RKuImage) 
    643643endef 
    644644 
    645645ap121_mini_cmdline=board=AP121-MINI console=ttyATH0,115200 
    646646define Image/Build/Profile/AP121MINI 
    647         $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-mini,$(ap121_mini_cmdline),ap121_mtdlayout_4M,917504,2818048,RKuImage) 
     647        $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-mini,$(ap121_mini_cmdline),$(ap121_mtdlayout_4M),917504,2818048,RKuImage) 
    648648endef 
    649649 
     
    661661ap96_mtdlayout=mtdparts=spi0.0:192k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1728k(kernel),64k(art)ro,7872k@0x40000(firmware) 
    662662define Image/Build/Profile/AP96 
    663         $(call Image/Build/Template/$(fs_64k)/$(1),AthGzip,ap96,$(ap96_cmdline),ap96_mtdlayout,1769472,6291456,RKuImage) 
     663        $(call Image/Build/Template/$(fs_64k)/$(1),AthGzip,ap96,$(ap96_cmdline),$(ap96_mtdlayout),1769472,6291456,RKuImage) 
    664664endef 
    665665 
     
    667667db120_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) 
    668668define Image/Build/Profile/DB120 
    669         $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,db120,$(db120_cmdline),db120_mtdlayout,1441792,6488064,RKuImage) 
     669        $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,db120,$(db120_cmdline),$(db120_mtdlayout),1441792,6488064,RKuImage) 
    670670endef 
    671671 
     
    964964whrg301n_cmdline=board=WHR-G301N console=ttyS0,115200 
    965965define Image/Build/Profile/WHRG301N 
    966         $(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-g301n,$(whrg301n_cmdline),whrhpg300n_mtdlayout,WHR-G301N) 
     966        $(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-g301n,$(whrg301n_cmdline),$(whrhpg300n_mtdlayout),WHR-G301N) 
    967967endef 
    968968 
     
    970970whrhpg300n_mtdlayout=mtdparts=spi0.0:248k(u-boot)ro,8k(u-boot-env)ro,960k(kernel),2816k(rootfs),64k(art)ro,3712k@0x40000(firmware) 
    971971define Image/Build/Profile/WHRHPG300N 
    972         $(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-hp-g300n,$(whrhpg300n_cmdline),whrhpg300n_mtdlayout,WHR-HP-G300N) 
     972        $(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-hp-g300n,$(whrhpg300n_cmdline),$(whrhpg300n_mtdlayout),WHR-HP-G300N) 
    973973endef 
    974974 
    975975whrhpgn_cmdline=board=WHR-HP-GN console=ttyS0,115200 
    976976define Image/Build/Profile/WHRHPGN 
    977         $(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-hp-gn,$(whrhpgn_cmdline),whrhpg300n_mtdlayout,WHR-HP-GN) 
     977        $(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-hp-gn,$(whrhpgn_cmdline),$(whrhpg300n_mtdlayout),WHR-HP-GN) 
    978978endef 
    979979 
Note: See TracChangeset for help on using the changeset viewer.