[backfire] ar71xx: backport r27053, fix WNDR3800 commandline
[openwrt-10.03/.git] / target / linux / ar71xx / image / Makefile
index f8ecb42c013e1cff20f0278c3da35f943b3b4438..111b8971a76f2e8aeda7987623f73db1025e5717 100644 (file)
@@ -319,14 +319,14 @@ define Image/Build/CyberTAN
        rm $(KDIR)/image.tmp
 endef
 
-wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),6656k(rootfs),64k(art)ro,7680k@0x70000(firmware)
-define Image/Build/WNDR3700
-       $(call PatchKernelLzma,$(2),$(3) $(wndr3700_mtdlayout))
+define Image/Build/Netgear
+       $(call PatchKernelLzma,$(2),$(3) $($(4)))
        $(call MkImageLzma,$(KDIR)/vmlinux-$(2).bin.lzma,$(KDIR)/vmlinux-$(2).uImage)
        mkdir -p $(KDIR)/wndr3700/image
        $(STAGING_DIR_HOST)/bin/wndr3700 \
                $(KDIR)/vmlinux-$(2).uImage \
-               $(KDIR)/wndr3700/image/uImage
+               $(KDIR)/wndr3700/image/uImage \
+               $(5)
        $(STAGING_DIR_HOST)/bin/mksquashfs-lzma \
                $(KDIR)/wndr3700 $(KDIR)/vmlinux-$(2).uImage.squashfs.tmp \
                -nopad -noappend -root-owned -be
@@ -338,64 +338,69 @@ define Image/Build/WNDR3700
                $(KDIR)/vmlinux-$(2).uImage.squashfs.tmp2
        $(STAGING_DIR_HOST)/bin/wndr3700 \
                $(KDIR)/vmlinux-$(2).uImage.squashfs.tmp2 \
-               $(KDIR)/vmlinux-$(2).uImage.squashfs
+               $(KDIR)/vmlinux-$(2).uImage.squashfs \
+               $(5)
        -rm -f $(KDIR)/vmlinux-$(2).uImage.squashfs.tmp*
        ( \
                dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs bs=1024k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=64k; \
        ) > $(call imgname,$(1),$(2))-sysupgrade.bin
-       $(STAGING_DIR_HOST)/bin/mkdniimg \
-               -B WNDR3700 -v OpenWrt.$(REVISION) \
-               -i $(call imgname,$(1),$(2))-sysupgrade.bin \
-               -o $(call imgname,$(1),$(2))-factory.img
+       for r in $(7) ; do \
+               [ -n "$$$$r" ] && dashr="-$$$$r" || dashr= ; \
+               $(STAGING_DIR_HOST)/bin/mkdniimg \
+                       -B $(6) -v OpenWrt.$(REVISION) -r "$$$$r" $(8) \
+                       -i $(call imgname,$(1),$(2))-sysupgrade.bin \
+                       -o $(call imgname,$(1),$(2))-factory$$$$dashr.img; \
+       done
 endef
 
-define Image/Build/WNDR3700/initramfs
-       $(call PatchKernelLzma,$(2),$(3) $(wndr3700_mtdlayout))
+define Image/Build/Netgear/initramfs
+       $(call PatchKernelLzma,$(2),$(3) $($(4)))
        $(call MkImageLzma,$(KDIR)/vmlinux-$(2).bin.lzma,$(KDIR)/vmlinux-$(2).uImage)
        $(STAGING_DIR_HOST)/bin/wndr3700 \
                $(KDIR)/vmlinux-$(2).uImage \
-               $(call imgname,$(1),$(2))-uImage.bin
+               $(call imgname,$(1),$(2))-uImage.bin \
+               $(5)
 endef
 
 define Image/Build/Template/initramfs/initramfs
-       $(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7))
+       $(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/all/squashfs
-       $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
+       $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/all/jffs2-64k
-       $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7))
+       $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/all/jffs2-128k
-       $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7))
+       $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/squashfs-only/squashfs
-       $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
+       $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/4k/squashfs
-       $(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7))
+       $(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/64k/squashfs
-       $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
+       $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/64k/jffs2-64k
-       $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7))
+       $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/128k/squashfs
-       $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
+       $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Template/128k/jffs2-128k
-       $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7))
+       $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
 define Image/Build/Profile/AP81
@@ -439,6 +444,7 @@ endef
 
 define Image/Build/Profile/TEW652BRP
        $(call Image/Build/Template/$(fs_squash)/$(1),Cameo,tew-652brp,board=TEW-632BRP,"AP81-AR9130-RT-080609-05")
+       $(call Image/Build/Template/$(fs_squash)/$(1),Cameo,tew-652brp-recovery,board=TEW-632BRP,"AP81-AR9130-RT-070614-02")
 endef
 
 define Image/Build/Profile/A02RBW300N
@@ -486,10 +492,18 @@ define Image/Build/Profile/MZKW300NH
        $(call Image/Build/Template/$(fs_64k)/$(1),Planex,mzk-w300nh,board=MZK-W300NH)
 endef
 
+define Image/Build/Profile/TLMR3420V1
+       $(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-mr3420-v1,board=TL-MR3420,TL-MR3420v1)
+endef
+
 define Image/Build/Profile/TLWR741NDV1
        $(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-wr741nd-v1,board=TL-WR741ND,TL-WR741NDv1)
 endef
 
+define Image/Build/Profile/TLWR740NV1
+       $(call Image/Build/Template/$(fs_4k)/$(1),TPLINK,tl-wr740n-v1,board=TL-WR741ND,TL-WR740Nv1)
+endef
+
 define Image/Build/Profile/TLWR841NV15
        $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr841n-v1.5,board=TL-WR841N-v1.5,TL-WR841Nv1.5)
 endef
@@ -518,8 +532,12 @@ define Image/Build/Profile/TLWR1043NDV1
        $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr1043nd-v1,board=TL-WR1043ND,TL-WR1043NDv1)
 endef
 
+wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),6656k(rootfs),64k(art)ro,7680k@0x70000(firmware)
+wndr3700v2_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),14848k(rootfs),64k(art)ro,15872k@0x70000(firmware)
 define Image/Build/Profile/WNDR3700
-       $(call Image/Build/Template/$(fs_64k)/$(1),WNDR3700,wndr3700,board=WNDR3700)
+       $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700,board=WNDR3700,wndr3700_mtdlayout,3700,WNDR3700,"" NA,)
+       $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,board=WNDR3700v2,wndr3700v2_mtdlayout,3701,WNDR3700v2,"",-H 29763654+16+64)
+       $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3800,board=WNDR3700v2,wndr3700v2_mtdlayout,3701,WNDR3800,"",-H 29763654+16+128)
 endef
 
 define Image/Build/Profile/WRT400N
@@ -552,7 +570,9 @@ define Image/Build/Profile/Default
        $(call Image/Build/Profile/PB44,$(1))
        $(call Image/Build/Profile/TEW632BRP,$(1))
        $(call Image/Build/Profile/TEW652BRP,$(1))
+       $(call Image/Build/Profile/TLMR3420V1,$(1))
        $(call Image/Build/Profile/TLWR741NDV1,$(1))
+       $(call Image/Build/Profile/TLWR740NV1,$(1))
        $(call Image/Build/Profile/TLWR841NV15,$(1))
        $(call Image/Build/Profile/TLWR841NDV3,$(1))
        $(call Image/Build/Profile/TLWR841NDV5,$(1))