Changeset 30699


Ignore:
Timestamp:
2012-02-23T20:58:06+01:00 (6 years ago)
Author:
juhosg
Message:

ramips: image: introduce mkcmdline helper

File:
1 edited

Legend:

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

    r30698 r30699  
    3434endef 
    3535endif 
     36 
     37define mkcmdline 
     38board=$(1) console=$(2),$(3) 
     39endef 
    3640 
    3741define CompressLzma 
     
    108112 
    109113define BuildFirmware/Buffalo 
    110         $(call MkImageLzma,$(2),board=$(3) $($(4))) 
     114        $(call MkImageLzma,$(2),$(3) $($(4))) 
    111115        $(call Sysupgrade/KRuImage,$(1),$(2),$(5),$(6)) 
    112116        if [ -e "$(call sysupname,$(1),$(2))" ]; then \ 
     
    163167mtdlayout_4M=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,832k(kernel),2944k(rootfs),3776k@0x50000(firmware) 
    164168define Image/Build/Template/GENERIC_4M 
    165         $(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_4M,851968,3014656) 
     169        $(call BuildFirmware/Generic,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5)),mtdlayout_4M,851968,3014656) 
    166170endef 
    167171 
    168172define Image/Build/Template/GENERIC_4M/initramfs 
    169         $(call BuildFirmware/Generic/initramfs,$(1),$(2),board=$(3),mtdlayout_4M) 
     173        $(call BuildFirmware/Generic/initramfs,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5)),mtdlayout_4M) 
    170174endef 
    171175 
     
    174178rootfs_size_8M=7143424 
    175179define Image/Build/Template/GENERIC_8M 
    176         $(call BuildFirmware/Generic,$(1),$(2),board=$(3),mtdlayout_8M,$(kernel_size_8M),$(rootfs_size_8M)) 
     180        $(call BuildFirmware/Generic,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5)),mtdlayout_8M,$(kernel_size_8M),$(rootfs_size_8M)) 
    177181endef 
    178182 
    179183define Image/Build/Template/GENERIC_8M/initramfs 
    180         $(call BuildFirmware/Generic/initramfs,$(1),$(2),board=$(3),mtdlayout_8M) 
     184        $(call BuildFirmware/Generic/initramfs,$(1),$(2),$(call mkcmdline,$(3),$(4),$(5)),mtdlayout_8M) 
    181185endef 
    182186 
     
    241245 
    242246define Image/Build/Profile/ESR9753 
    243         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,esr-9753,ESR-9753) 
     247        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,esr-9753,ESR-9753,ttyS1,57600) 
    244248endef 
    245249 
    246250define Image/Build/Template/FONERA20N 
    247         $(call Image/Build/Template/GENERIC_8M,$(1),fonera20n,FONERA20N) 
     251        $(call Image/Build/Template/GENERIC_8M,$(1),fonera20n,FONERA20N,ttyS1,57600) 
    248252        $(call BuildFirmware/Edimax,$(1),fonera20n,RSDK,NL1T,0x50000,0xc0000) 
    249253endef 
     
    254258 
    255259define Image/Build/Profile/BC2 
    256         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_8M,bc2,BC2) 
     260        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_8M,bc2,BC2,ttyS1,57600) 
    257261endef 
    258262 
     
    267271 
    268272define Image/Build/Profile/NBG419N 
    269         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,nbg-419n,NBG-419N) 
     273        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,nbg-419n,NBG419N,ttyS1,57600) 
    270274endef 
    271275 
    272276define Image/Build/Profile/WL351 
    273         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,wl-351,WL-351) 
     277        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,wl-351,WL-351,ttyS1,57600) 
    274278endef 
    275279 
     
    283287 
    284288define Image/Build/Profile/PWH2004 
    285         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_8M,pwh2004,PWH2004) 
     289        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_8M,pwh2004,PWH2004,ttyS1,57600) 
    286290endef 
    287291 
    288292define Image/Build/Profile/V22RW2X2 
    289         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,v22rw-2x2,V22RW-2X2) 
     293        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,v22rw-2x2,V22RW-2X2,ttyS1,57600) 
    290294endef 
    291295 
    292296mtdlayout_whrg300n=mtdparts=physmap-flash.0:192k(u-boot)ro,64k(u-boot-env)ro,64k(factory)ro,960k(kernel),2752k(rootfs),64k(user)ro,3712k@0x50000(firmware) 
    293297define Image/Build/Template/WHRG300N 
    294         $(call Image/Build/Template/GENERIC_4M,$(1),whr-g300n,WHR-G300N) 
    295         $(call BuildFirmware/Buffalo,$(1),whr-g300n,WHR-G300N,mtdlayout_whrg300n,983040,3801088) 
     298        $(call Image/Build/Template/GENERIC_4M,$(1),whr-g300n,WHR-G300N,ttyS1,57600) 
     299        $(call BuildFirmware/Buffalo,$(1),whr-g300n,$(call mkcmdline,WHR-G300N,ttyS1,57600),mtdlayout_whrg300n,983040,3801088) 
    296300        ( \ 
    297301                echo -n -e "# Airstation FirmWare\nrun u_fw\nreset\n\n" | \ 
     
    308312 
    309313define Image/Build/Profile/HW5503G 
    310         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_8M,hw550-3g,HW550-3G) 
     314        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_8M,hw550-3g,HW550-3G,ttyS1,57600) 
    311315endef 
    312316 
    313317define Image/Build/Profile/MOFI35003GN 
    314         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_8M,mofi3500-3gn,MOFI3500-3GN) 
     318        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_8M,mofi3500-3gn,MOFI3500-3GN,ttyS1,57600) 
    315319endef 
    316320 
    317321define Image/Build/Profile/WCR150GN 
    318         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,wcr150gn,WCR150GN) 
     322        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,wcr150gn,WCR150GN,ttyS1,57600) 
    319323endef 
    320324 
     
    355359 
    356360define Image/Build/Profile/WR5123GN 
    357         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,wr512-3gn-4M,WR512-3GN) 
    358         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_8M,wr512-3gn-8M,WR512-3GN) 
     361        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,wr512-3gn-4M,WR512-3GN,ttyS1,57600) 
     362        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_8M,wr512-3gn-8M,WR512-3GN,ttyS1,57600) 
    359363endef 
    360364 
    361365define Image/Build/Profile/SLR7205 
    362         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,sl-r7205,SL-R7205) 
     366        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,sl-r7205,SL-R7205,ttyS1,57600) 
    363367endef 
    364368 
     
    396400 
    397401define Image/Build/Profile/RTN15 
    398         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,rt-n15,RT-N15) 
     402        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,rt-n15,RT-N15,ttyS1,57600) 
    399403endef 
    400404 
    401405define Image/Build/Profile/V11STFE 
    402         $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,v11st-fe,V11ST-FE) 
     406        $(call Image/Build/Template/$(fs_squash)/$(1),GENERIC_4M,v11st-fe,V11ST-FE,ttyS1,57600) 
    403407endef 
    404408 
Note: See TracChangeset for help on using the changeset viewer.