projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ar71xx: compress kernel binaries in Image/Prepare stage
[openwrt.git] / target / linux / ar71xx / image / Makefile
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 78bf7e3..c3dc8a0 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -25,16 +25,15 @@ endef
 
 LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR)
 
+KDIR_TMP:=$(KDIR)/tmp
 VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux
 UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage
 fs_squash:=squashfs-only
-fs_all:=all
 fs_64k:=64k
 fs_64kraw:=64kraw
 fs_128k:=128k
 ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
        fs_squash:=initramfs
-       fs_all:=initramfs
        fs_64k:=initramfs
        fs_64kraw:=initramfs
        fs_128k:=initramfs
@@ -47,15 +46,15 @@ define CompressLzma
 endef
 
 define PatchKernelLzma
-       cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(1)
-       $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(1) "$(strip $(2))"
-       $(call CompressLzma,$(KDIR)/vmlinux-$(1),$(KDIR)/vmlinux-$(1).bin.lzma)
+       cp $(KDIR)/vmlinux $(KDIR_TMP)/vmlinux-$(1)
+       $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR_TMP)/vmlinux-$(1) "$(strip $(2))"
+       $(call CompressLzma,$(KDIR_TMP)/vmlinux-$(1),$(KDIR_TMP)/vmlinux-$(1).bin.lzma)
 endef
 
 define PatchKernelGzip
-       cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(1)
-       $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(1) "$(strip $(2))"
-       gzip -9 -c $(KDIR)/vmlinux-$(1) > $(KDIR)/vmlinux-$(1).bin.gz
+       cp $(KDIR)/vmlinux $(KDIR_TMP)/vmlinux-$(1)
+       $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR_TMP)/vmlinux-$(1) "$(strip $(2))"
+       gzip -9 -c $(KDIR_TMP)/vmlinux-$(1) > $(KDIR_TMP)/vmlinux-$(1).bin.gz
 endef
 
 define MkuImage
@@ -66,16 +65,16 @@ endef
 
 define MkuImageLzma
        $(call PatchKernelLzma,$(1),$(2))
-       $(call MkuImage,lzma,,$(KDIR)/vmlinux-$(1).bin.lzma,$(KDIR)/vmlinux-$(1).uImage)
+       $(call MkuImage,lzma,,$(KDIR_TMP)/vmlinux-$(1).bin.lzma,$(KDIR_TMP)/vmlinux-$(1).uImage)
 endef
 
 define MkuImageGzip
        $(call PatchKernelGzip,$(1),$(2))
-       $(call MkuImage,gzip,,$(KDIR)/vmlinux-$(1).bin.gz,$(KDIR)/vmlinux-$(1).uImage)
+       $(call MkuImage,gzip,,$(KDIR_TMP)/vmlinux-$(1).bin.gz,$(KDIR_TMP)/vmlinux-$(1).uImage)
 endef
 
 define MkuImageOKLI
-       $(call MkuImage,lzma,-M 0x4f4b4c49,$(KDIR)/vmlinux.bin.lzma,$(KDIR)/vmlinux-$(1).okli)
+       $(call MkuImage,lzma,-M 0x4f4b4c49,$(KDIR)/vmlinux.bin.lzma,$(KDIR_TMP)/vmlinux-$(1).okli)
 endef
 
 define CatFiles
@@ -89,11 +88,15 @@ define CatFiles
 endef
 
 define Sysupgrade/KR
-       $(call CatFiles,$(KDIR)/vmlinux-$(2).uImage,$(3),$(KDIR)/root.$(1),$(4),$(call sysupname,$(1),$(2)))
+       $(call CatFiles,$(2),$(3),$(KDIR)/root.$(1),$(4),$(call sysupname,$(1),$(5)))
 endef
 
-define Sysupgrade/RK
-       $(call CatFiles,$(KDIR)/root.$(1),$(4),$(KDIR)/vmlinux-$(2).uImage,$(3),$(call sysupname,$(1),$(2)))
+define Sysupgrade/KRuImage
+       $(call CatFiles,$(KDIR_TMP)/vmlinux-$(2).uImage,$(3),$(KDIR)/root.$(1),$(4),$(call sysupname,$(1),$(2)))
+endef
+
+define Sysupgrade/RKuImage
+       $(call CatFiles,$(KDIR)/root.$(1),$(4),$(KDIR_TMP)/vmlinux-$(2).uImage,$(3),$(call sysupname,$(1),$(2)))
 endef
 
 define Image/BuildLoader
@@ -119,27 +122,26 @@ endef
 define Image/BuildKernel
        cp $(KDIR)/vmlinux.elf $(VMLINUX).elf
        cp $(KDIR)/vmlinux $(VMLINUX).bin
-       gzip -9 -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
-       $(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 MkuImage,gzip,,$(KDIR)/vmlinux.bin.gz,$(UIMAGE)-gzip.bin)
        $(call MkuImage,lzma,,$(KDIR)/vmlinux.bin.lzma,$(UIMAGE)-lzma.bin)
+       -mkdir -p $(KDIR_TMP)
        $(call Image/Build/Initramfs)
 endef
 
 define Image/Build/WRT400N
        $(call MkuImageLzma,$(2),$(3))
-       $(call Sysupgrade/KR,$(1),$(2),1310720,6488064)
+       $(call Sysupgrade/KRuImage,$(1),$(2),1310720,6488064)
        if [ -e "$(call sysupname,$(1),$(2))" ]; then \
-               wrt400n $(KDIR)/vmlinux-$(2).uImage $(KDIR)/root.$(1) $(call factoryname,$(1),$(2)); \
+               wrt400n $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR)/root.$(1) $(call factoryname,$(1),$(2)); \
        fi
 endef
 
 dir825b1_mtdlayout=mtdparts=spi0.0:256k(uboot)ro,64k(config)ro,1024k(kernel),5184k(rootfs),64k(caldata)ro,1600k(unknown)ro,6208k@0x50000(firmware)
 define Image/Build/DIR825B1
        $(call MkuImageLzma,$(2),$(3) $(dir825b1_mtdlayout))
-       $(call Sysupgrade/KR,$(1),$(2),1048576,5308416)
+       $(call Sysupgrade/KRuImage,$(1),$(2),1048576,5308416)
        if [ -e "$(call sysupname,$(1),$(2))" ]; then \
                ( \
                        dd if=$(call sysupname,$(1),$(2)); \
@@ -158,7 +160,7 @@ endef
 
 define Image/Build/WZRHPG30XNH
        $(call MkuImageLzma,$(2),$(3))
-       $(call Sysupgrade/KR,$(1),$(2),1048576,31850496)
+       $(call Sysupgrade/KRuImage,$(1),$(2),1048576,31850496)
        if [ -e "$(call sysupname,$(1),$(2))" ]; then \
                ( \
                        echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
@@ -166,17 +168,17 @@ define Image/Build/WZRHPG30XNH
                ) > $(call imgname,$(1),$(2))-tftp.bin; \
                buffalo-enc -p $(4) -v 1.99 \
                        -i $(call sysupname,$(1),$(2)) \
-                       -o $(KDIR)/$(2).enc; \
+                       -o $(KDIR_TMP)/$(2).enc; \
                buffalo-tag -b $(4) -p $(4) -a ath -v 1.99 -m 1.01 -l mlang8 \
                        -w 3 -c 0x80041000 -d 0x801e8000 -f 1 -r M_ \
-                       -i $(KDIR)/$(2).enc \
+                       -i $(KDIR_TMP)/$(2).enc \
                        -o $(call factoryname,$(1),$(2)); \
        fi
 endef
 
 define Image/Build/WHRHPG300N
        $(call MkuImageLzma,$(2),$(3) $($(4)))
-       $(call Sysupgrade/KR,$(1),$(2),917504,2883584)
+       $(call Sysupgrade/KRuImage,$(1),$(2),917504,2883584)
        if [ -e "$(call sysupname,$(1),$(2))" ]; then \
                ( \
                        echo -n -e "# Airstation Public Fmt1\x00\x00\x00\x00\x00\x00\x00\x00"; \
@@ -184,20 +186,20 @@ define Image/Build/WHRHPG300N
                ) > $(call imgname,$(1),$(2))-tftp.bin; \
                buffalo-enc -p $(5) -v 1.99 \
                        -i $(call sysupname,$(1),$(2)) \
-                       -o $(KDIR)/$(2).enc; \
+                       -o $(KDIR_TMP)/$(2).enc; \
                buffalo-tag -b $(5) -p $(5) -a ath -v 1.99 -m 1.01 -l mlang8 \
                        -w 3 -c 0x80041000 -d 0x801e8000 -f 1 -r M_ \
-                       -i $(KDIR)/$(2).enc \
+                       -i $(KDIR_TMP)/$(2).enc \
                        -o $(call factoryname,$(1),$(2)); \
        fi
 endef
 
 define Image/Build/Cameo
        $(call MkuImageLzma,$(2),$(3) $($(4)))
-       $(call Sysupgrade/KR,$(1),$(2),$(5),$(6))
+       $(call Sysupgrade/KRuImage,$(1),$(2),$(5),$(6))
        if [ -e "$(call sysupname,$(1),$(2))" ]; then \
                ( \
-                       dd if=$(KDIR)/vmlinux-$(2).uImage bs=$(5) conv=sync; \
+                       dd if=$(KDIR_TMP)/vmlinux-$(2).uImage bs=$(5) conv=sync; \
                        dd if=$(KDIR)/root.$(1) bs=$(6) conv=sync; \
                        echo -n $(7); \
                ) > $(call factoryname,$(1),$(2)); \
@@ -217,7 +219,7 @@ endef
 define Image/Build/Ath
        $(call Sysupgrade/$(7),$(1),$(2),$(5),$(6))
        if [ -e "$(call sysupname,$(1),$(2))" ]; then \
-               dd if=$(KDIR)/vmlinux-$(2).uImage \
+               dd if=$(KDIR_TMP)/vmlinux-$(2).uImage \
                        of=$(call imgname,kernel,$(2)).bin bs=64k conv=sync; \
                dd if=$(KDIR)/root.$(1) \
                        of=$(call imgname,$(1),$(2)-rootfs).bin bs=128k conv=sync; \
@@ -231,7 +233,7 @@ endef
 
 define Image/Build/AthGzip/initramfs
        $(call MkuImageLzma,$(2),$(3) $($(4)))
-       $(CP) $(KDIR)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin
+       $(CP) $(KDIR_TMP)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin
 endef
 
 define Image/Build/AthLzma
@@ -241,12 +243,12 @@ endef
 
 define Image/Build/AthLzma/initramfs
        $(call MkuImageLzma,$(2),$(3) $($(4)))
-       $(CP) $(KDIR)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin
+       $(CP) $(KDIR_TMP)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin
 endef
 
 define Image/Build/PB4X
        $(call PatchKernelLzma,$(2),$(3))
-       dd if=$(KDIR)/vmlinux-$(2).bin.lzma \
+       dd if=$(KDIR_TMP)/vmlinux-$(2).bin.lzma \
           of=$(call imgname,kernel,$(2)).bin bs=64k conv=sync
        dd if=$(KDIR)/root.$(1) \
           of=$(call imgname,$(1),$(2)-rootfs).bin bs=128k conv=sync
@@ -258,41 +260,52 @@ endef
 
 
 define Image/Build/MyLoader
-       -$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) -s $(3) \
-               -p0x030000:0xe0000:al:0x80060000:kernel:$(KDIR)/vmlinux.bin.lzma \
+       $(call PatchKernelLzma,$(2),$(3))
+       -$(STAGING_DIR_HOST)/bin/mkmylofw -B $(2) -s $(4) \
+               -p0x030000:0xe0000:al:0x80060000:kernel:$(KDIR_TMP)/vmlinux-$(2).bin.lzma \
                -p0x110000:0:::rootfs:$(KDIR)/root.$(1) \
-               $(call imgname,$(1),$(2))-$(4)-factory.img
+               $(call imgname,$(1),$(2))-$(5)-factory.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 MkuImageLzma,$(2),$(3) $(ubntxm_mtdlayout))
-       $(call Sysupgrade/KR,$(1),$(2),1048576,6684672)
-       dd if=$(KDIR)/vmlinux-$(2).uImage of=$(KDIR)/vmlinux-$(2).uImage.bin bs=1024k conv=sync
+       $(call Sysupgrade/KRuImage,$(1),$(2),1048576,6684672)
+       dd if=$(KDIR_TMP)/vmlinux-$(2).uImage of=$(KDIR_TMP)/vmlinux-$(2).uImage.bin bs=1024k conv=sync
        -$(STAGING_DIR_HOST)/bin/mkfwimage \
                -B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
-               -k $(KDIR)/vmlinux-$(2).uImage.bin \
+               -k $(KDIR_TMP)/vmlinux-$(2).uImage.bin \
                -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
                -o $(call factoryname,$(1),$(2))
 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
+       dd if=$(KDIR_TMP)/vmlinux-$(2).bin.lzma of=$(KDIR_TMP)/vmlinux-$(2).lzma bs=64k conv=sync
        -$(STAGING_DIR_HOST)/bin/mkfwimage \
                -B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \
-               -k $(KDIR)/vmlinux-$(2).lzma \
+               -k $(KDIR_TMP)/vmlinux-$(2).lzma \
                -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
                -o $(call factoryname,$(1),$(2))
        -sh $(TOPDIR)/scripts/combined-image.sh \
-               "$(KDIR)/vmlinux-$(2).lzma" \
+               "$(KDIR_TMP)/vmlinux-$(2).lzma" \
                "$(BIN_DIR)/$(IMG_PREFIX)-root.$(1)" \
   $(call sysupname,$(1),$(2))
 endef
 
+planex_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,960k(kernel),6784k(rootfs),128k(art)ro,7744k@0x50000(firmware)
+define Image/Build/Planex/loader
+       $(call Image/BuildLoaderAlone,$(1),gz,$(2) $(planex_mtdlayout),0x52000,0)
+endef
+
 define Image/Build/Planex
-       $(call MkuImageGzip,$(2),$(3))
-       $(call Sysupgrade/KR,$(1),$(2),1441792,6356992)
+       $(call MkuImage,gzip,,$(KDIR)/loader-$(2).gz,$(KDIR_TMP)/vmlinux-$(2).uImage)
+       $(call MkuImageOKLI,$(2))
+       ( \
+               dd if=$(KDIR_TMP)/vmlinux-$(2).uImage bs=8k count=1 conv=sync; \
+               dd if=$(KDIR_TMP)/vmlinux-$(2).okli; \
+       ) > $(KDIR_TMP)/kernel-$(2).bin
+       $(call Sysupgrade/KR,$(1),$(KDIR_TMP)/kernel-$(2).bin,983040,6815744,$(2))
        if [ -e "$(call sysupname,$(1),$(2))" ]; then \
                $(STAGING_DIR_HOST)/bin/mkplanexfw \
                        -B $(2) \
@@ -305,12 +318,12 @@ endef
 alfa_mtdlayout_8M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6144k(rootfs),1600k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware)
 define Image/Build/ALFA
        $(call MkuImageLzma,$(2),$(3))
-       $(call Sysupgrade/RK,$(1),$(2),$(4),$(5))
+       $(call Sysupgrade/RKuImage,$(1),$(2),$(4),$(5))
        if [ -e "$(call sysupname,$(1),$(2))" ]; then \
                rm -rf $(KDIR)/$(1); \
                mkdir -p $(KDIR)/$(1); \
                cd $(KDIR)/$(1); \
-               cp $(KDIR)/vmlinux-$(2).uImage $(KDIR)/$(1)/$(6); \
+               cp $(KDIR_TMP)/vmlinux-$(2).uImage $(KDIR)/$(1)/$(6); \
                cp $(KDIR)/root.$(1) $(KDIR)/$(1)/$(7); \
                $(TAR) zcf $(call factoryname,$(1),$(2)) -C $(KDIR)/$(1) $(6) $(7); \
                ( \
@@ -320,21 +333,24 @@ define Image/Build/ALFA
        fi
 endef
 
+define Image/Build/TPLINKOLD/loader
+       $(call Image/BuildLoaderAlone,$(1),gz,$(2),0x22000,0)
+endef
+
 define Image/Build/TPLINKOLD
-       $(call Image/BuildLoaderAlone,$(2),gz,$(3),0x22000,0)
        $(call MkuImageOKLI,$(2))
        ( \
                dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \
-               dd if=$(KDIR)/vmlinux-$(2).okli conv=sync; \
-       ) > $(KDIR)/kernel-$(2).bin
+               dd if=$(KDIR_TMP)/vmlinux-$(2).okli conv=sync; \
+       ) > $(KDIR_TMP)/kernel-$(2).bin
        -$(STAGING_DIR_HOST)/bin/mktplinkfw \
                -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\
-               -k $(KDIR)/kernel-$(2).bin \
+               -k $(KDIR_TMP)/kernel-$(2).bin \
                -r $(KDIR)/root.$(1) \
                -o $(call factoryname,$(1),$(2))
        -$(STAGING_DIR_HOST)/bin/mktplinkfw \
                -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s\
-               -k $(KDIR)/kernel-$(2).bin \
+               -k $(KDIR_TMP)/kernel-$(2).bin \
                -r $(KDIR)/root.$(1) \
                -o $(call sysupname,$(1),$(2))
 endef
@@ -347,22 +363,25 @@ define Image/Build/TPLINKOLD/initramfs
                -o $(call imgname,$(1),$(2))-uImage.bin
 endef
 
+define Image/Build/TPLINK/loader
+       $(call Image/BuildLoaderAlone,$(1),gz,$(2),0x22000,0)
+endef
+
 define Image/Build/TPLINK
-       $(call Image/BuildLoaderAlone,$(2),gz,$(3),0x22000,0)
        $(call MkuImageOKLI,$(2))
        ( \
                dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \
-               dd if=$(KDIR)/vmlinux-$(2).okli conv=sync; \
-       ) > $(KDIR)/kernel-$(2).bin
+               dd if=$(KDIR_TMP)/vmlinux-$(2).okli conv=sync; \
+       ) > $(KDIR_TMP)/kernel-$(2).bin
        -$(STAGING_DIR_HOST)/bin/mktplinkfw \
                -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\
-               -k $(KDIR)/kernel-$(2).bin \
+               -k $(KDIR_TMP)/kernel-$(2).bin \
                -r $(KDIR)/root.$(1) \
                -a $(call rootfs_align,$(1)) -j \
                -o $(call factoryname,$(1),$(2))
        -$(STAGING_DIR_HOST)/bin/mktplinkfw \
                -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s\
-               -k $(KDIR)/kernel-$(2).bin \
+               -k $(KDIR_TMP)/kernel-$(2).bin \
                -r $(KDIR)/root.$(1) \
                -a $(call rootfs_align,$(1)) -j \
                -o $(call sysupname,$(1),$(2))
@@ -380,13 +399,13 @@ define Image/Build/TPLINK-LZMA
        $(call PatchKernelLzma,$(2),$(3))
        -$(STAGING_DIR_HOST)/bin/mktplinkfw \
                -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\
-               -k $(KDIR)/vmlinux-$(2).bin.lzma \
+               -k $(KDIR_TMP)/vmlinux-$(2).bin.lzma \
                -r $(KDIR)/root.$(1) \
                -a $(call rootfs_align,$(1)) -j \
                -o $(call factoryname,$(1),$(2))
        -$(STAGING_DIR_HOST)/bin/mktplinkfw \
                -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s \
-               -k $(KDIR)/vmlinux-$(2).bin.lzma \
+               -k $(KDIR_TMP)/vmlinux-$(2).bin.lzma \
                -r $(KDIR)/root.$(1) \
                -a $(call rootfs_align,$(1)) -j \
                -o $(call sysupname,$(1),$(2))
@@ -396,13 +415,13 @@ define Image/Build/TPLINK-LZMA/initramfs
        $(call PatchKernelLzma,$(2),$(3))
        -$(STAGING_DIR_HOST)/bin/mktplinkfw -c \
                -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s \
-               -k $(KDIR)/vmlinux-$(2).bin.lzma \
+               -k $(KDIR_TMP)/vmlinux-$(2).bin.lzma \
                -o $(call imgname,$(1),$(2))-uImage.bin
 endef
 
 define Image/Build/CyberTAN
        $(call MkuImageGzip,$(2),$(3))
-       $(STAGING_DIR_HOST)/bin/trx -o $(KDIR)/image.tmp -f $(KDIR)/vmlinux-$(2).uImage \
+       $(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) \
                -i $(KDIR)/image.tmp \
@@ -418,23 +437,23 @@ define Image/Build/Netgear/Build_uImage
        -rm -rf $(KDIR)/$(1)
        mkdir -p $(KDIR)/$(1)/image
        $(STAGING_DIR_HOST)/bin/wndr3700 \
-               $(KDIR)/vmlinux-$(1).uImage \
+               $(KDIR_TMP)/vmlinux-$(1).uImage \
                $(KDIR)/$(1)/image/uImage \
                $(4)
        $(STAGING_DIR_HOST)/bin/mksquashfs-lzma \
-               $(KDIR)/$(1) $(KDIR)/vmlinux-$(1).uImage.squashfs.tmp \
+               $(KDIR)/$(1) $(KDIR_TMP)/vmlinux-$(1).uImage.squashfs.tmp \
                -nopad -noappend -root-owned -be
        -rm -rf $(KDIR)/$(1)
        mkimage -A mips -O linux -T filesystem -C none \
                -a 0xbf070000 -e 0xbf070000 \
                -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-               -d $(KDIR)/vmlinux-$(1).uImage.squashfs.tmp \
-               $(KDIR)/vmlinux-$(1).uImage.squashfs.tmp2
+               -d $(KDIR_TMP)/vmlinux-$(1).uImage.squashfs.tmp \
+               $(KDIR_TMP)/vmlinux-$(1).uImage.squashfs.tmp2
        $(STAGING_DIR_HOST)/bin/wndr3700 \
-               $(KDIR)/vmlinux-$(1).uImage.squashfs.tmp2 \
-               $(KDIR)/vmlinux-$(1).uImage.squashfs \
+               $(KDIR_TMP)/vmlinux-$(1).uImage.squashfs.tmp2 \
+               $(KDIR_TMP)/vmlinux-$(1).uImage.squashfs \
                $(4)
-       -rm -f $(KDIR)/vmlinux-$(1).uImage.squashfs.tmp*
+       -rm -f $(KDIR_TMP)/vmlinux-$(1).uImage.squashfs.tmp*
 endef
 
 define Image/Build/Netgear/Estimate_uImage
@@ -444,38 +463,38 @@ define Image/Build/Netgear/Estimate_uImage
                kk=`echo '$(3)' | sed -e 's/.*[:,]\([0-9]*\)k(kernel).*/\1/'`; \
                rk=`echo '$(3)' | sed -e 's/.*[:,]\([0-9]*\)k(rootfs).*/\1/'`; \
                let 'tk = kk + rk'; \
-               s=`stat -c'%s' '$(KDIR)/vmlinux-$(1)_est.uImage.squashfs'`; \
+               s=`stat -c'%s' '$(KDIR_TMP)/vmlinux-$(1)_est.uImage.squashfs'`; \
                c=`echo '$(3)' | wc -c`; \
                let 'kk = (((s + c) / (64 * 1024) + 1) * 64)'; \
                let 'rk = tk - kk'; \
                echo '$(3)' | sed -e "s/[0-9]*k(kernel)/$$$${kk}k(kernel)/" \
                                  -e "s/[0-9]*k(rootfs)/$$$${rk}k(rootfs)/" > \
-                       '$(KDIR)/$(1)_mtdparts'; \
+                       '$(KDIR_TMP)/$(1)_mtdparts'; \
                let 'k = kk * 1024'; \
-               echo "$$$${k}" > '$(KDIR)/$(1)_kernel_maxsize'; \
+               echo "$$$${k}" > '$(KDIR_TMP)/$(1)_kernel_maxsize'; \
                let 'r = rk * 1024'; \
-               echo "$$$${r}" > '$(KDIR)/$(1)_rootfs_maxsize'; \
+               echo "$$$${r}" > '$(KDIR_TMP)/$(1)_rootfs_maxsize'; \
        )
-       -rm -f $(KDIR)/vmlinux-$(1)_est \
-              $(KDIR)/vmlinux-$(1)_est.bin.lzma \
-              $(KDIR)/vmlinux-$(1)_est.uImage \
-              $(KDIR)/vmlinux-$(1)_est.uImage.squashfs
+       -rm -f $(KDIR_TMP)/vmlinux-$(1)_est \
+              $(KDIR_TMP)/vmlinux-$(1)_est.bin.lzma \
+              $(KDIR_TMP)/vmlinux-$(1)_est.uImage \
+              $(KDIR_TMP)/vmlinux-$(1)_est.uImage.squashfs
 endef
 
 define Image/Build/Netgear
        $(call Image/Build/Netgear/Estimate_uImage,$(2),$(3),$(4),$(5))
-       $(call Image/Build/Netgear/Build_uImage,$(2),$(3),`cat $(KDIR)/$(2)_mtdparts`,$(5))
-       if [ `stat -c%s '$(KDIR)/vmlinux-$(2).uImage.squashfs'` -gt \
-            `cat '$(KDIR)/$(2)_kernel_maxsize'` ]; then \
-                echo "$(KDIR)/vmlinux-$(2).uImage.squashfs is too big" >& 2; \
+       $(call Image/Build/Netgear/Build_uImage,$(2),$(3),`cat $(KDIR_TMP)/$(2)_mtdparts`,$(5))
+       if [ `stat -c%s '$(KDIR_TMP)/vmlinux-$(2).uImage.squashfs'` -gt \
+            `cat '$(KDIR_TMP)/$(2)_kernel_maxsize'` ]; then \
+                echo "$(KDIR_TMP)/vmlinux-$(2).uImage.squashfs is too big" >& 2; \
        else if [ `stat -c%s '$(KDIR)/root.$(1)'` -gt \
-            `cat '$(KDIR)/$(2)_rootfs_maxsize'` ]; then \
+            `cat '$(KDIR_TMP)/$(2)_rootfs_maxsize'` ]; then \
                 echo "$(KDIR)/root.$(1) is too big" >& 2; \
        else \
                ( \
                        set -e; \
-                       dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs \
-                       bs=`cat '$(KDIR)/$(2)_kernel_maxsize'` conv=sync; \
+                       dd if=$(KDIR_TMP)/vmlinux-$(2).uImage.squashfs \
+                       bs=`cat '$(KDIR_TMP)/$(2)_kernel_maxsize'` conv=sync; \
                        dd if=$(KDIR)/root.$(1) bs=64k; \
                ) > $(call sysupname,$(1),$(2)); \
                for r in $(7) ; do \
@@ -491,7 +510,7 @@ endef
 define Image/Build/Netgear/initramfs
        $(call MkuImageLzma,$(2),$(3) $($(4)))
        $(STAGING_DIR_HOST)/bin/wndr3700 \
-               $(KDIR)/vmlinux-$(2).uImage \
+               $(KDIR_TMP)/vmlinux-$(2).uImage \
                $(call imgname,$(1),$(2))-uImage.bin \
                $(5)
 endef
@@ -499,7 +518,7 @@ endef
 ifdef CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh
   define Image/Build/ZyXEL
        $(call MkuImageLzma,$(2),$(3))
-       $(call Sysupgrade/KR,$(1),$(2),917504,2752512)
+       $(call Sysupgrade/KRuImage,$(1),$(2),917504,2752512)
        if [ -e "$(call sysupname,$(1),$(2))" ]; then \
                if [ ! -f $(BIN_DIR)/$(IMG_PREFIX)-$(2)-u-boot.bin ]; then \
                        echo "Warning: $(IMG_PREFIX)-$(2)-u-boot.bin not found"; \
@@ -517,22 +536,22 @@ define Image/Build/OpenMesh
        $(call MkuImageLzma,$(2))
        -sh $(TOPDIR)/scripts/om2p-fwupgradecfg-gen.sh \
                "$(BUILD_DIR)/om2p-fwupgrade.cfg" \
-               "$(KDIR)/vmlinux-$(2).uImage" \
+               "$(KDIR_TMP)/vmlinux-$(2).uImage" \
                "$(KDIR)/root.$(1)"
        -sh $(TOPDIR)/scripts/combined-ext-image.sh \
                "$(3)" "$(call factoryname,$(1),$(2))" \
                "$(BUILD_DIR)/om2p-fwupgrade.cfg" "fwupgrade.cfg" \
-               "$(KDIR)/vmlinux-$(2).uImage" "kernel" \
+               "$(KDIR_TMP)/vmlinux-$(2).uImage" "kernel" \
                "$(KDIR)/root.$(1)" "rootfs"
 endef
 
 define Image/Build/Zcomax
        $(call MkuImageLzma,$(2),$(3))
-       $(call Sysupgrade/RK,$(1),$(2),1507328,6356992)
+       $(call Sysupgrade/RKuImage,$(1),$(2),1507328,6356992)
        if [ -e "$(call sysupname,$(1),$(2))" ]; then \
                $(STAGING_DIR_HOST)/bin/mkzcfw \
                        -B $(2) \
-                       -k $(KDIR)/vmlinux-$(2).uImage \
+                       -k $(KDIR_TMP)/vmlinux-$(2).uImage \
                        -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
                        -o $(call imgname,$(1),$(2))-factory.img; \
        fi
@@ -554,10 +573,18 @@ define Image/Build/Template/all/jffs2-128k
        $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
+define Image/Build/Template/squashfs-only/loader
+       $(call Image/Build/$(1)/loader,$(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),$(8))
 endef
 
+define Image/Build/Template/64k/loader
+       $(call Image/Build/$(1)/loader,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
+endef
+
 define Image/Build/Template/64k/squashfs
        $(call Image/Build/$(1),squashfs-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
@@ -566,6 +593,10 @@ define Image/Build/Template/64k/jffs2-64k
        $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
 
+define Image/Build/Template/64kraw/loader
+       $(call Image/Build/$(1)/loader,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
+endef
+
 define Image/Build/Template/64kraw/squashfs
        $(call Image/Build/$(1),squashfs-raw,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
 endef
@@ -587,39 +618,51 @@ define Image/Build/Profile/ALFANX
        $(call Image/Build/Template/$(fs_64k)/$(1),ALFA,alfa-nx,$(alfa_nx_cmdline),1638400,6291456,vmlinux.gz.uImage,pb9x-2.6.31-jffs2)
 endef
 
+alfa_ap96_cmdline=board=ALFA-AP96 console=ttyS0,115200
+alfa_ap96_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,256k(u-boot-env)ro,13312k(rootfs),2048k(kernel),512k(caldata)ro,15360k@0x80000(firmware)
+define Image/Build/Profile/ALFAAP96
+       $(call Image/Build/Template/$(fs_128k)/$(1),AthLzma,alfa-ap96,$(alfa_ap96_cmdline),alfa_ap96_mtdlayout,2097152,13631488,RKuImage)
+endef
+
+ap113_mtd_layout=64k(u-boot),3008k(rootfs),896k(uImage),64k(NVRAM),64k(ART),3904k@0x10000(firmware)
+ap113_cmdline=board=AP113 console=ttyS0,115200
+define Image/Build/Profile/AP113
+       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap113,$(ap113_cmdline),ap113_mtd_layout,917504,3080192,RK)
+endef
+
 ap121_mtdlayout_2M=mtdparts=spi0.0:64k(u-boot)ro,1216k(rootfs),704k(kernel),64k(art)ro,1920k@0x10000(firmware)
 ap121_mtdlayout_4M=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,2752k(rootfs),896k(kernel),64k(nvram),64k(art)ro,3648k@0x50000(firmware)
 
 ap121_cmdline=board=AP121 console=ttyATH0,115200
 define Image/Build/Profile/AP121
-       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-2M,$(ap121_cmdline),ap121_mtdlayout_2M,720896,1245184,RK)
-       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-4M,$(ap121_cmdline),ap121_mtdlayout_4M,917504,2818048,RK)
+       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-2M,$(ap121_cmdline),ap121_mtdlayout_2M,720896,1245184,RKuImage)
+       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-4M,$(ap121_cmdline),ap121_mtdlayout_4M,917504,2818048,RKuImage)
 endef
 
 ap121_mini_cmdline=board=AP121-MINI console=ttyATH0,115200
 define Image/Build/Profile/AP121MINI
-       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-mini,$(ap121_mini_cmdline),ap121_mtdlayout_4M,917504,2818048,RK)
+       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,ap121-mini,$(ap121_mini_cmdline),ap121_mtdlayout_4M,917504,2818048,RKuImage)
 endef
 
 ap81_cmdline=board=AP81 console=ttyS0,115200
 define Image/Build/Profile/AP81
-       $(call Image/Build/Template/$(fs_64k)/$(1),AthGzip,ap81,$(ap81_cmdline),,1310720,6619136,KR)
+       $(call Image/Build/Template/$(fs_64k)/$(1),AthGzip,ap81,$(ap81_cmdline),,1310720,6619136,KRuImage)
 endef
 
 ap83_cmdline=board=AP83 console=ttyS0,115200
 define Image/Build/Profile/AP83
-       $(call Image/Build/Template/$(fs_64k)/$(1),AthGzip,ap83,$(ap83_cmdline),,1310720,6619136,KR)
+       $(call Image/Build/Template/$(fs_64k)/$(1),AthGzip,ap83,$(ap83_cmdline),,1310720,6619136,KRuImage)
 endef
 
 ap96_cmdline=board=AP96 console=ttyS0,115200
 define Image/Build/Profile/AP96
-       $(call Image/Build/Template/$(fs_64k)/$(1),AthGzip,ap96,$(ap96_cmdline),ap96_mtdlayout,1769472,6291456,RK)
+       $(call Image/Build/Template/$(fs_64k)/$(1),AthGzip,ap96,$(ap96_cmdline),ap96_mtdlayout,1769472,6291456,RKuImage)
 endef
 
 db120_cmdline=board=DB120 console=ttyS0,115200
 db120_mtdlayout=mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,6336k(rootfs),1408k(kernel),64k(nvram),64k(art)ro,7744k@0x50000(firmware)
 define Image/Build/Profile/DB120
-       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,db120,$(db120_cmdline),db120_mtdlayout,1441792,6488064,RK)
+       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,db120,$(db120_cmdline),db120_mtdlayout,1441792,6488064,RKuImage)
 endef
 
 pb42_cmdline=board=PB42 console=ttyS0,115200
@@ -634,14 +677,20 @@ endef
 
 pb92_cmdline=board=PB92 console=ttyS0,115200
 define Image/Build/Profile/PB92
-       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,pb92,$(pb92_cmdline),,917504,2818048,KR)
+       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,pb92,$(pb92_cmdline),,917504,2818048,KRuImage)
 endef
 
+wp543_cmdline=console=ttyS0,115200
 define Image/Build/Profile/WP543
-       $(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,0x200000,2M)
-       $(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,0x400000,4M)
-       $(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,0x800000,8M)
-       $(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,0x1000000,16M)
+       $(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,$(wp543_cmdline),0x200000,2M)
+       $(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,$(wp543_cmdline),0x400000,4M)
+       $(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,$(wp543_cmdline),0x800000,8M)
+       $(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wp543,$(wp543_cmdline),0x1000000,16M)
+endef
+
+wpe72_cmdline=console=ttyS0,115200
+define Image/Build/Profile/WPE72
+       $(call Image/Build/Template/$(fs_64k)/$(1),MyLoader,wpe72,$(wpe72_cmdline),0x800000,8M)
 endef
 
 dir600a1_cmdline=board=DIR-600-A1 console=ttyS0,115200
@@ -679,6 +728,11 @@ define Image/Build/Profile/DIR615C1
        $(call Image/Build/Template/$(fs_squash)/$(1),Cameo913x,dir-615-c1,$(dir615c1_cmdline),"AP81-AR9130-RT-070614-02")
 endef
 
+rw2458n_cmdline=board=RW2458N console=ttyS0,115200
+define Image/Build/Profile/RW2458N
+       $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,rw2458n,$(rw2458n_cmdline),XM,UBNTXM,ar7240)
+endef
+
 tew632brp_cmdline=board=TEW-632BRP console=ttyS0,115200
 define Image/Build/Profile/TEW632BRP
        $(call Image/Build/Template/$(fs_squash)/$(1),Cameo913x,tew-632brp,$(tew632brp_cmdline),"AP81-AR9130-RT-070614-00")
@@ -730,7 +784,7 @@ define Image/Build/Profile/UBNTNANOM
        $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-nano-m,$(ubntnanom_cmdline),XM,UBNTXM,ar7240)
 endef
 
-ubntunifi_cmdline=board=UBNT-XM console=ttyS0,115200
+ubntunifi_cmdline=board=UBNT-UF console=ttyS0,115200
 define Image/Build/Profile/UBNTUNIFI
        $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-unifi,$(ubntunifi_cmdline),XM,UBNTXM,ar7240)
 endef
@@ -841,6 +895,11 @@ define Image/Build/Profile/TLWR1043
        $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr1043nd-v1,$(tlwr1043_cmdline),0x10430001,1,8M)
 endef
 
+tlwr2543_cmdline=board=TL-WR2543N console=ttyS0,115200
+define Image/Build/Profile/TLWR2543
+       $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK-LZMA,tl-wr2543n-v1,$(tlwr2543_cmdline),0x25430001,1,8Mlzma)
+endef
+
 wndr3700_cmdline=board=WNDR3700 console=ttyS0,115200
 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)
@@ -895,7 +954,7 @@ endef
 
 wzrhpag300h_cmdline=board=WZR-HP-AG300H console=ttyS0,115200
 define Image/Build/Profile/WZRHPAG300H
-       $(call Image/Build/Template/$(fs_128k)/$(1),WZRHPG30XNH,wzr-hp-ag300h,$(wzrhpag300h_cmdline),WZR-HP-AG300H)
+       $(call Image/Build/Template/$(fs_64k)/$(1),WZRHPG30XNH,wzr-hp-ag300h,$(wzrhpag300h_cmdline),WZR-HP-AG300H)
 endef
 
 wzrhpg450h_cmdline=board=WZR-HP-G450H console=ttyS0,115200
@@ -915,12 +974,14 @@ endef
 
 all0258n_cmdline=board=ALL0258N console=ttyS0,115200
 define Image/Build/Profile/ALL0258N
-       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,all0258n,$(all0258n_cmdline),,917504,5505024,KR)
+       $(call Image/Build/Template/$(fs_64k)/$(1),AthLzma,all0258n,$(all0258n_cmdline),,917504,5505024,KRuImage)
 endef
 
 define Image/Build/Profile/Default
+       $(call Image/Build/Profile/ALFAAP96,$(1))
        $(call Image/Build/Profile/ALFANX,$(1))
        $(call Image/Build/Profile/ALL0258N,$(1))
+       $(call Image/Build/Profile/AP113,$(1))
        $(call Image/Build/Profile/AP121,$(1))
        $(call Image/Build/Profile/AP121MINI,$(1))
        $(call Image/Build/Profile/AP81,$(1))
@@ -942,6 +1003,7 @@ define Image/Build/Profile/Default
        $(call Image/Build/Profile/PB42,$(1))
        $(call Image/Build/Profile/PB44,$(1))
        $(call Image/Build/Profile/PB92,$(1))
+       $(call Image/Build/Profile/RW2458N,$(1))
        $(call Image/Build/Profile/TEW632BRP,$(1))
        $(call Image/Build/Profile/TEW652BRP,$(1))
        $(call Image/Build/Profile/TLMR3020,$(1))
@@ -956,8 +1018,10 @@ define Image/Build/Profile/Default
        $(call Image/Build/Profile/TLWR841,$(1))
        $(call Image/Build/Profile/TLWR941,$(1))
        $(call Image/Build/Profile/TLWR1043,$(1))
+       $(call Image/Build/Profile/TLWR2543,$(1))
        $(call Image/Build/Profile/UBNT,$(1))
        $(call Image/Build/Profile/WP543,$(1))
+       $(call Image/Build/Profile/WPE72,$(1))
        $(call Image/Build/Profile/WNDR3700,$(1))
        $(call Image/Build/Profile/AP96,$(1))
        $(call Image/Build/Profile/WRT400N,$(1))
@@ -997,6 +1061,12 @@ define Image/Build/Initramfs
        $(call Image/Build/Profile/$(PROFILE),initramfs)
 endef
 
+define Image/Prepare
+       gzip -9 -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
+       $(call CompressLzma,$(KDIR)/vmlinux,$(KDIR)/vmlinux.bin.lzma)
+       $(call Image/Build/Profile/Default,loader)
+endef
+
 define Image/Build
        $(call Image/Build/$(1))
        dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
Personal OpenWRT clone
This page took 0.055352 seconds and 4 git commands to generate.