ar71xx: rename initramfs u-boot images

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

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 96611bb..cde709f 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -14,8 +14,10 @@ $(IMGNAME)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
 endef
 
 VMLINUX:=$(IMGNAME)-vmlinux
+UIMAGE:=$(IMGNAME)-uImage
 ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
        VMLINUX:=$(IMGNAME)-vmlinux-initramfs
+       UIMAGE:=$(IMGNAME)-uImage-initramfs
 endif
 
 define CompressLzma
@@ -53,8 +55,8 @@ define Image/BuildKernel
        $(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma)
        dd if=$(KDIR)/vmlinux.bin.lzma of=$(VMLINUX).lzma bs=65536 conv=sync
        dd if=$(KDIR)/vmlinux.bin.gz of=$(VMLINUX).gz bs=65536 conv=sync
-       $(call MkImageGzip,$(KDIR)/vmlinux.bin.gz,$(IMGNAME)-uImage-gzip.bin)
-       $(call MkImageLzma,$(KDIR)/vmlinux.bin.lzma,$(IMGNAME)-uImage-lzma.bin)
+       $(call MkImageGzip,$(KDIR)/vmlinux.bin.gz,$(UIMAGE)-gzip.bin)
+       $(call MkImageLzma,$(KDIR)/vmlinux.bin.lzma,$(UIMAGE)-lzma.bin)
 endef
 
 define Image/Build/WRT400N
@@ -126,9 +128,13 @@ define Image/Build/WZRHPG300NH
                        -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
                        -d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage; \
                ( \
-                       dd if=$(KDIR)/vmlinux-$(2).uImage bs=1M conv=sync; \
+                       dd if=$(KDIR)/vmlinux-$(2).uImage bs=1024k conv=sync; \
                        dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
                ) > $(call imgname,$(1),$(2))-sysupgrade.bin; \
+               ( \
+                       echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
+                       dd if=$(call imgname,$(1),$(2))-sysupgrade.bin; \
+               ) > $(call imgname,$(1),$(2))-tftp.bin; \
        fi; fi
 endef
 
@@ -305,7 +311,7 @@ define Image/Build/WNDR3700
                $(KDIR)/vmlinux-$(2).uImage.squashfs
        -rm -f $(KDIR)/vmlinux-$(2).uImage.squashfs.tmp*
        ( \
-               dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs bs=1M conv=sync; \
+               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 \
@@ -330,6 +336,10 @@ define Image/Build/Template/squashfs-only/squashfs
        $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
 endef
 
+define Image/Build/Template/4k/squashfs
+       $(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7))
+endef
+
 define Image/Build/Template/64k/squashfs
        $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7))
 endef
@@ -428,7 +438,7 @@ define Image/Build/Profile/MZKW300NH
 endef
 
 define Image/Build/Profile/TLWR741NDV1
-       $(call Image/Build/Template/squashfs-only/$(1),TPLINK4K,tl-wr741nd-v1,board=TL-WR741ND,TL-WR741NDv1)
+       $(call Image/Build/Template/4k/$(1),TPLINK,tl-wr741nd-v1,board=TL-WR741ND,TL-WR741NDv1)
 endef
 
 define Image/Build/Profile/TLWR841NV15
@@ -440,7 +450,7 @@ define Image/Build/Profile/TLWR841NDV3
 endef
 
 define Image/Build/Profile/TLWR841NDV5
-       $(call Image/Build/Template/squashfs-only/$(1),TPLINK4K,tl-wr841nd-v5,board=TL-WR741ND,TL-WR841NDv5)
+       $(call Image/Build/Template/4k/$(1),TPLINK,tl-wr841nd-v5,board=TL-WR741ND,TL-WR841NDv5)
 endef
 
 define Image/Build/Profile/TLWR941NDV2