ar71xx: rename TL-WRx41 images, because newer factory web interface does

[openwrt.git] / target / linux / ar71xx / image / Makefile

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index dac7ded..79f7b7c 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -138,6 +138,22 @@ define Image/Build/MyLoader
                $(call imgname,$(1),$(2))-16M.img
 endef
 
                $(call imgname,$(1),$(2))-16M.img
 endef
 

+ubntxm_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,1024k(kernel),6528k(rootfs),256k(cfg)ro,64k(EEPROM)ro,7552k@0x50000(firmware)
+define Image/Build/UBNTXM
+       $(call PatchKernelLzma,$(2),$(3) $(ubntxm_mtdlayout))
+       $(call MkImageLzma,$(KDIR)/vmlinux-$(2).bin.lzma,$(KDIR)/vmlinux-$(2).uImage.bin)
+       dd if=$(KDIR)/vmlinux-$(2).uImage.bin of=$(KDIR)/vmlinux-$(2).uImage bs=1024k conv=sync
+       -$(STAGING_DIR_HOST)/bin/mkfwimage \
+               -B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
+               -k $(KDIR)/vmlinux-$(2).uImage \
+               -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
+               -o $(call imgname,$(1),$(2))-factory.bin
+       ( \
+               dd if=$(KDIR)/vmlinux-$(2).uImage; \
+               dd if=$(BIN_DIR)/openwrt-$(BOARD)-root.$(1); \
+       ) > $(call imgname,$(1),$(2))-sysupgrade.bin
+endef
+

 define Image/Build/UBNT
        $(call PatchKernelLzma,$(2),$(3))
        dd if=$(KDIR)/vmlinux-$(2).bin.lzma of=$(KDIR)/vmlinux-$(2).lzma bs=64k conv=sync
 define Image/Build/UBNT
        $(call PatchKernelLzma,$(2),$(3))
        dd if=$(KDIR)/vmlinux-$(2).bin.lzma of=$(KDIR)/vmlinux-$(2).lzma bs=64k conv=sync


@@ -145,7 +161,11 @@ define Image/Build/UBNT
                -B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
                -k $(KDIR)/vmlinux-$(2).lzma \
                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
                -B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
                -k $(KDIR)/vmlinux-$(2).lzma \
                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \

-               -o $(call imgname,$(1),$(2)).bin
+               -o $(call imgname,$(1),$(2))-factory.bin
+       -sh $(TOPDIR)/scripts/combined-image.sh \
+               "$(KDIR)/vmlinux-$(2).lzma" \
+               "$(BIN_DIR)/openwrt-$(BOARD)-root.$(1)" \
+               $(call imgname,$(1),$(2))-sysupgrade.bin

 endef
 
 define Image/Build/Planex
 endef
 
 define Image/Build/Planex


@@ -177,7 +197,7 @@ define Image/Build/TPLINK
                -B $(4) -N OpenWrt -V $(REVISION)\
                -k $(KDIR)/vmlinux-$(2).bin.gz \
                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
                -B $(4) -N OpenWrt -V $(REVISION)\
                -k $(KDIR)/vmlinux-$(2).bin.gz \
                -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \

-               -o $(call imgname,$(1),$(2)).uni
+               -o $(call imgname,$(1),$(2))-universal.bin

 endef
 
 define Image/Build/CyberTAN
 endef
 
 define Image/Build/CyberTAN


@@ -260,7 +280,7 @@ define Image/Build/Template/TPLINK4K
 endef
 
 define Image/Build/Template/TPLINK4K/squashfs
 endef
 
 define Image/Build/Template/TPLINK4K/squashfs

-       $(call Image/Build/Template/TPLINK,squashfs-4k,$(1),$(2),$(3))
+       $(call Image/Build/Template/TPLINK,squashfs,$(1),$(2),$(3))

 endef
 
 define Image/Build/Template/UBNT
 endef
 
 define Image/Build/Template/UBNT


@@ -275,6 +295,18 @@ define Image/Build/Template/UBNT/jffs2-64k
        $(call Image/Build/Template/UBNT,jffs2-64k,$(1),$(2),$(3),$(4),$(5))
 endef
 
        $(call Image/Build/Template/UBNT,jffs2-64k,$(1),$(2),$(3),$(4),$(5))
 endef
 

+define Image/Build/Template/UBNTXM
+       $(call Image/Build/UBNTXM,$(1),$(2),$(3),$(4),$(5),$(6))
+endef
+
+define Image/Build/Template/UBNTXM/squashfs
+       $(call Image/Build/Template/UBNTXM,squashfs,$(1),$(2),$(3),$(4),$(5))
+endef
+
+define Image/Build/Template/UBNTXM/jffs2-64k
+       $(call Image/Build/Template/UBNTXM,jffs2-64k,$(1),$(2),$(3),$(4),$(5))
+endef
+

 define Image/Build/Template/Planex
        $(call Image/Build/Planex,$(1),$(2),$(3))
 endef
 define Image/Build/Template/Planex
        $(call Image/Build/Planex,$(1),$(2),$(3))
 endef


@@ -323,10 +355,25 @@ define Image/Build/Profile/UBNTLSSR71
        $(call Image/Build/Template/UBNT/$(1),ubnt-ls-sr71,board=UBNT-LS-SR71,LS-SR71,LS-SR71,ar7100)
 endef
 
        $(call Image/Build/Template/UBNT/$(1),ubnt-ls-sr71,board=UBNT-LS-SR71,LS-SR71,LS-SR71,ar7100)
 endef
 

+define Image/Build/Profile/UBNTBULLETM
+       $(call Image/Build/Template/UBNTXM/$(1),ubnt-bullet-m,board=UBNT-BM,XM,UBNTXM,ar7240)
+endef
+
+define Image/Build/Profile/UBNTROCKETM
+       $(call Image/Build/Template/UBNTXM/$(1),ubnt-rocket-m,board=UBNT-RM,XM,UBNTXM,ar7240)
+endef
+
+define Image/Build/Profile/UBNTNANOM
+       $(call Image/Build/Template/UBNTXM/$(1),ubnt-nano-m,board=UBNT-NM,XM,UBNTXM,ar7240)
+endef
+

 define Image/Build/Profile/UBNT
        $(call Image/Build/Profile/UBNTRS,$(1))
        $(call Image/Build/Profile/UBNTRSPRO,$(1))
        $(call Image/Build/Profile/UBNTLSSR71,$(1))
 define Image/Build/Profile/UBNT
        $(call Image/Build/Profile/UBNTRS,$(1))
        $(call Image/Build/Profile/UBNTRSPRO,$(1))
        $(call Image/Build/Profile/UBNTLSSR71,$(1))

+       $(call Image/Build/Profile/UBNTBULLETM,$(1))
+       $(call Image/Build/Profile/UBNTROCKETM,$(1))
+       $(call Image/Build/Profile/UBNTNANOM,$(1))

 endef
 
 define Image/Build/Profile/MZKW04NU
 endef
 
 define Image/Build/Profile/MZKW04NU


@@ -380,14 +427,19 @@ define Image/Build/Profile/Default
 endef
 
 define Image/Build/Profile/Madwifi
 endef
 
 define Image/Build/Profile/Madwifi

-       $(call Image/Build/Profile/UBNT,$(1))
+       $(call Image/Build/Profile/UBNTRS,$(1))
+       $(call Image/Build/Profile/UBNTRSPRO,$(1))
+       $(call Image/Build/Profile/UBNTLSSR71,$(1))

        $(call Image/Build/Profile/WP543,$(1))
 endef
 
 define Image/Build/squashfs
        $(call Image/Build/Profile/WP543,$(1))
 endef
 
 define Image/Build/squashfs

-       dd if=$(KDIR)/root.squashfs of=$(IMGNAME)-root.squashfs-4k bs=4k conv=sync
-       $(call add_jffs2_mark,$(IMGNAME)-root.squashfs-4k)

        $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
        $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)

+       dd if=$(KDIR)/root.squashfs of=$(KDIR)/root.squashfs-4k.tmp0 bs=4k conv=sync
+       $(call add_jffs2_mark,$(KDIR)/root.squashfs-4k.tmp0)
+       dd if=$(KDIR)/root.squashfs-4k.tmp0 of=$(IMGNAME)-root.squashfs-4k bs=4k conv=sync
+       $(call add_jffs2_mark,$(IMGNAME)-root.squashfs-4k)
+       rm -f $(KDIR)/root.squashfs-4k.tmp0

 endef
 
 define Image/Build
 endef
 
 define Image/Build