ar71xx: image: unify CyberTAN macros
authorGabor Juhos <juhosg@openwrt.org>
Sat, 30 Nov 2013 18:31:01 +0000 (18:31 +0000)
committerGabor Juhos <juhosg@openwrt.org>
Sat, 30 Nov 2013 18:31:01 +0000 (18:31 +0000)
Make the Image/Build/CyberTAN macro more generic,
and use simple wrappers for the GZIP/LZMA variants.
This simplifies the Makefile a bit, and allows to
build sysupgrade images for the devices which are
using LZMA compressed uImages.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 38965

target/linux/ar71xx/image/Makefile

index dee44077bfabf1bc4f05791ae96eed97288ce2da..0f2a2bbc10927d14e10c2ba9016d196425478305 100644 (file)
@@ -664,35 +664,30 @@ define Image/Build/TPLINK-LZMA/initramfs
                -o $(call imgname,$(1),$(2))-uImage.bin
 endef
 
-Image/Build/CyberTAN/loader=$(call Image/BuildLoader,$(1),gz,$(2),0x80060000)
-Image/Build/CyberTAN/buildkernel=$(call MkuImage,gzip,,$(KDIR)/loader-$(2).gz,$(KDIR_TMP)/vmlinux-$(2).uImage)
 
 define Image/Build/CyberTAN
        echo -n '' > $(KDIR_TMP)/empty.bin
        $(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp \
                -f $(KDIR_TMP)/vmlinux-$(2).uImage -F $(KDIR_TMP)/empty.bin \
                -x 32 -a 0x10000 -x -32 -f $(KDIR)/root.$(1)
-       -$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(4) \
+       -$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(5) \
                -i $(KDIR)/image.tmp \
                -o $(call sysupname,$(1),$(2))
        $(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp -f $(KDIR_TMP)/vmlinux-$(2).uImage \
                -x 32 -a 0x10000 -x -32 -f $(KDIR)/root.$(1)
-       -$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(4) -g \
+       -$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(5) -g \
                -i $(KDIR)/image.tmp \
                -o $(call factoryname,$(1),$(2))
        rm $(KDIR)/image.tmp
 endef
 
+Image/Build/CyberTANGZIP/loader=$(call Image/BuildLoader,$(1),gz,$(2),0x80060000)
+Image/Build/CyberTANGZIP/buildkernel=$(call MkuImage,gzip,,$(KDIR)/loader-$(2).gz,$(KDIR_TMP)/vmlinux-$(2).uImage)
+Image/Build/CyberTANGZIP=$(call Image/Build/CyberTAN,$(1),$(2),$(3),$(4),$(5))
+
 Image/Build/CyberTANLZMA/buildkernel=$(call MkuImageLzma,$(2),$(3) $(4))
+Image/Build/CyberTANLZMA=$(call Image/Build/CyberTAN,$(1),$(2),$(3),$(4),$(5))
 
-define Image/Build/CyberTANLZMA
-       $(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp -f $(KDIR_TMP)/vmlinux-$(2).uImage \
-               -x 32 -a 0x10000 -x -32 -f $(KDIR)/root.$(1)
-       -$(STAGING_DIR_HOST)/bin/addpattern -B $(2) -v v$(5) -g \
-               -i $(KDIR)/image.tmp \
-               -o $(call factoryname,$(1),$(2))
-       rm $(KDIR)/image.tmp
-endef
 
 Image/Build/Netgear/initramfs=$(call MkuImageLzma/initramfs,$(2),$(3) $(4),,-M $(5))
 
@@ -917,7 +912,7 @@ $(eval $(call SingleProfile,CameoDB120,64kraw,DIR835A1,dir-835-a1,DIR-835-A1,tty
 
 $(eval $(call SingleProfile,CameoDB120_8M,64kraw,TEW732BR,tew-732br,TEW-732BR,ttyS0,115200,"00DB120AR9341-RT-120906-NA"))
 
-$(eval $(call SingleProfile,CyberTAN,64k,WRT160NL,wrt160nl,WRT160NL,ttyS0,115200,1.00.01))
+$(eval $(call SingleProfile,CyberTANGZIP,64k,WRT160NL,wrt160nl,WRT160NL,ttyS0,115200,,1.00.01))
 
 $(eval $(call SingleProfile,CyberTANLZMA,64k,MYNETREXT,mynet-rext,MYNET-REXT,ttyS0,115200,$$(mynet_rext_mtdlayout) root=31:4,1.00.01))