Changeset 38146


Ignore:
Timestamp:
2013-09-24T07:58:31+02:00 (4 years ago)
Author:
juhosg
Message:

ar71xx: image: use a common macro for UBNTXM/UBNTDEV

The firmware generation part is the same for both
macros. Move that into a separate macro and use the
new macro for Image/Build/UB{NTXM,DEV}.

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

File:
1 edited

Legend:

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

    r38141 r38146  
    488488 
    489489 
    490 Image/Build/UBNTXM/buildkernel=$(call MkuImageLzma,$(2),$(3) $(ubntxm_mtdlayout)) 
    491  
    492 define Image/Build/UBNTXM 
     490define Image/Build/UBNT2 
    493491        $(call Sysupgrade/KRuImage,$(1),$(2),65536,6684672) 
    494492        dd if=$(KDIR_TMP)/vmlinux-$(2).uImage of=$(KDIR_TMP)/vmlinux-$(2).uImage.bin bs=64k conv=sync 
     
    500498endef 
    501499 
     500Image/Build/UBNTXM/buildkernel=$(call MkuImageLzma,$(2),$(3) $(ubntxm_mtdlayout)) 
     501Image/Build/UBNTXM=$(call Image/Build/UBNT2,$(1),$(2),$(ubntxm_mtdlayout),$(4),$(5),$(6),$(7)) 
    502502 
    503503Image/Build/UBDEV/buildkernel=$(call MkuImageLzma,$(2),$(3) $(ubdev_mtdlayout)) 
    504  
    505 define Image/Build/UBDEV 
    506         $(call Sysupgrade/KRuImage,$(1),$(2),65536,6684672) 
    507         dd if=$(KDIR_TMP)/vmlinux-$(2).uImage of=$(KDIR_TMP)/vmlinux-$(2).uImage.bin bs=64k conv=sync 
    508         -$(STAGING_DIR_HOST)/bin/mkfwimage \ 
    509                 -B $(4) -v $(5).$(6).v6.0.0-OpenWrt-$(REVISION) \ 
    510                 -k $(KDIR_TMP)/vmlinux-$(2).uImage.bin \ 
    511                 -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \ 
    512                 -o $(call factoryname,$(1),$(2)) 
    513 endef 
     504Image/Build/UBDEV=$(call Image/Build/UBNT2,$(1),$(2),$(ubdev_mtdlayout),$(4),$(5),$(6),$(7)) 
    514505 
    515506 
Note: See TracChangeset for help on using the changeset viewer.