X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Fimage%2FMakefile;h=f923efc37085a36c41fe0c6438e47ff6b2c20547;hp=e4163b33e5705e9edd665993f435657929500699;hb=81f15f502667749faa72fc73944c51be18907b34;hpb=ef2431c8d9e77ee0e28edabbecce4ec8a86507fa diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index e4163b33e5..f923efc370 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -11,6 +11,10 @@ define imgname $(BIN_DIR)/$(IMG_PREFIX)-$(2)-$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1))) endef +define rootfs_align +$(patsubst %-128k,0x20000,$(patsubst %-64k,0x10000,$(patsubst squashfs-%,0x4,$(1)))) +endef + define sysupname $(call imgname,$(1),$(2))-sysupgrade.bin endef @@ -19,18 +23,19 @@ define factoryname $(call imgname,$(1),$(2))-factory.bin 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_4k:=4k fs_64k:=64k +fs_64kraw:=64kraw fs_128k:=128k ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) fs_squash:=initramfs - fs_all:=initramfs - fs_4k:=initramfs fs_64k:=initramfs + fs_64kraw:=initramfs fs_128k:=initramfs VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux-initramfs UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage-initramfs @@ -41,31 +46,35 @@ 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 - mkimage -A mips -O linux -T kernel -a 0x80060000 -C $(1) \ + mkimage -A mips -O linux -T kernel -a 0x80060000 -C $(1) $(2) \ -e 0x80060000 -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \ - -d $(2) $(3) + -d $(3) $(4) 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_TMP)/vmlinux-$(1).okli) endef define CatFiles @@ -79,48 +88,71 @@ 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/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 Sysupgrade/RK - $(call CatFiles,$(KDIR)/root.$(1),$(4),$(KDIR)/vmlinux-$(2).uImage,$(3),$(call sysupname,$(1),$(2))) +define Image/BuildLoader + -rm -rf $(KDIR)/lzma-loader + $(LOADER_MAKE) LOADER=loader-$(1).$(2) KERNEL_CMDLINE="$(3)"\ + LZMA_TEXT_START=0x80a00000 LOADADDR=0x80060000 \ + LOADER_DATA="$(KDIR)/vmlinux.bin.lzma" \ + compile loader.$(2) +endef + +define Image/BuildLoaderAlone + -rm -rf $(KDIR)/lzma-loader + $(LOADER_MAKE) LOADER=loader-$(1).$(2) KERNEL_CMDLINE="$(3)" \ + LZMA_TEXT_START=0x80a00000 LOADADDR=0x80060000 \ + FLASH_OFFS=$(4) FLASH_MAX=$(5) \ + compile loader.$(2) +endef + +define Build/Clean + $(LOADER_MAKE) clean 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) + $(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)); \ - echo -n "01AP94-AR7161-RT-080619-00"; \ + echo -n "$(4)"; \ ) > $(call imgname,$(1),$(2))-backup-loader.bin; \ if [ `stat -c%s $(call sysupname,$(1),$(2))` -gt 4194304 ]; then \ echo "Warning: $(call sysupname,$(1),$(2)) is too big"; \ else \ ( \ dd if=$(call sysupname,$(1),$(2)) bs=4096k conv=sync; \ - echo -n "00AP94-AR7161-RT-080619-00"; \ + echo -n "$(5)"; \ ) > $(call factoryname,$(1),$(2)); \ fi; \ fi @@ -128,28 +160,46 @@ 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"; \ dd if=$(call sysupname,$(1),$(2)); \ ) > $(call imgname,$(1),$(2))-tftp.bin; \ - buffalo-enc -p $(4) -v 1.76 \ + buffalo-enc -p $(4) -v 1.99 \ -i $(call sysupname,$(1),$(2)) \ - -o $(KDIR)/$(2).enc; \ - buffalo-tag -b $(4) -p $(4) -a ath -v 1.76 -m 1.01 -l mlang8 \ + -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/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"; \ + dd if=$(call sysupname,$(1),$(2)); \ + ) > $(call imgname,$(1),$(2))-tftp.bin; \ + buffalo-enc -p $(5) -v 1.99 \ + -i $(call sysupname,$(1),$(2)) \ + -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_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)); \ @@ -169,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; \ @@ -183,6 +233,7 @@ endef define Image/Build/AthGzip/initramfs $(call MkuImageLzma,$(2),$(3) $($(4))) + $(CP) $(KDIR_TMP)/vmlinux-$(2).uImage $(call imgname,$(1),$(2))-uImage.bin endef define Image/Build/AthLzma @@ -192,11 +243,12 @@ endef define Image/Build/AthLzma/initramfs $(call MkuImageLzma,$(2),$(3) $($(4))) + $(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 @@ -208,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) \ @@ -252,31 +315,113 @@ define Image/Build/Planex fi 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/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_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); \ + ( \ + echo WRM7222C | dd bs=32 count=1 conv=sync; \ + echo -ne '\xfe'; \ + ) >> $(call factoryname,$(1),$(2)); \ + fi +endef + +define Image/Build/TPLINKOLD/loader + $(call Image/BuildLoaderAlone,$(1),gz,$(2),0x22000,0) +endef + +define Image/Build/TPLINKOLD + $(call MkuImageOKLI,$(2)) + ( \ + dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \ + 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_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_TMP)/kernel-$(2).bin \ + -r $(KDIR)/root.$(1) \ + -o $(call sysupname,$(1),$(2)) +endef + +define Image/Build/TPLINKOLD/initramfs + $(call Image/BuildLoader,$(2),gz,$(3),0x80060000) + -$(STAGING_DIR_HOST)/bin/mktplinkfw -c \ + -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s\ + -k $(KDIR)/loader-$(2).gz \ + -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 PatchKernelGzip,$(2),$(3)) + $(call MkuImageOKLI,$(2)) + ( \ + dd if=$(KDIR)/loader-$(2).gz bs=7680 count=1 conv=sync; \ + dd if=$(KDIR_TMP)/vmlinux-$(2).okli conv=sync; \ + ) > $(KDIR_TMP)/kernel-$(2).bin -$(STAGING_DIR_HOST)/bin/mktplinkfw \ - -B $(4) -N OpenWrt -V $(REVISION)\ - -k $(KDIR)/vmlinux-$(2).bin.gz \ - -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \ + -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\ + -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 \ - -B $(4) -N OpenWrt -V $(REVISION) -s \ - -k $(KDIR)/vmlinux-$(2).bin.gz \ - -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \ + -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s\ + -k $(KDIR_TMP)/kernel-$(2).bin \ + -r $(KDIR)/root.$(1) \ + -a $(call rootfs_align,$(1)) -j \ -o $(call sysupname,$(1),$(2)) endef define Image/Build/TPLINK/initramfs - $(call PatchKernelGzip,$(2),$(3)) + $(call Image/BuildLoader,$(2),gz,$(3),0x80060000) -$(STAGING_DIR_HOST)/bin/mktplinkfw -c \ - -B $(4) -N OpenWrt -V $(REVISION) -s \ - -k $(KDIR)/vmlinux-$(2).bin.gz \ + -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s\ + -k $(KDIR)/loader-$(2).gz \ + -o $(call imgname,$(1),$(2))-uImage.bin +endef + +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_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_TMP)/vmlinux-$(2).bin.lzma \ + -r $(KDIR)/root.$(1) \ + -a $(call rootfs_align,$(1)) -j \ + -o $(call sysupname,$(1),$(2)) +endef + +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_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 \ @@ -287,44 +432,85 @@ define Image/Build/CyberTAN rm $(KDIR)/image.tmp endef -define Image/Build/Netgear - $(call MkuImageLzma,$(2),$(3) $($(4))) - mkdir -p $(KDIR)/wndr3700/image +define Image/Build/Netgear/Build_uImage + $(call MkuImageLzma,$(1),$(2) $(3)) + -rm -rf $(KDIR)/$(1) + mkdir -p $(KDIR)/$(1)/image $(STAGING_DIR_HOST)/bin/wndr3700 \ - $(KDIR)/vmlinux-$(2).uImage \ - $(KDIR)/wndr3700/image/uImage \ - $(5) + $(KDIR_TMP)/vmlinux-$(1).uImage \ + $(KDIR)/$(1)/image/uImage \ + $(4) $(STAGING_DIR_HOST)/bin/mksquashfs-lzma \ - $(KDIR)/wndr3700 $(KDIR)/vmlinux-$(2).uImage.squashfs.tmp \ + $(KDIR)/$(1) $(KDIR_TMP)/vmlinux-$(1).uImage.squashfs.tmp \ -nopad -noappend -root-owned -be - -rm -rf $(KDIR)/wndr3700 + -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-$(2).uImage.squashfs.tmp \ - $(KDIR)/vmlinux-$(2).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-$(2).uImage.squashfs.tmp2 \ - $(KDIR)/vmlinux-$(2).uImage.squashfs \ - $(5) - -rm -f $(KDIR)/vmlinux-$(2).uImage.squashfs.tmp* + $(KDIR_TMP)/vmlinux-$(1).uImage.squashfs.tmp2 \ + $(KDIR_TMP)/vmlinux-$(1).uImage.squashfs \ + $(4) + -rm -f $(KDIR_TMP)/vmlinux-$(1).uImage.squashfs.tmp* +endef + +define Image/Build/Netgear/Estimate_uImage + $(call Image/Build/Netgear/Build_uImage,$(1)_est,$(2),$(3),$(4)) ( \ - dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs bs=1024k conv=sync; \ - dd if=$(KDIR)/root.$(1) bs=64k; \ - ) > $(call sysupname,$(1),$(2)) - 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 sysupname,$(1),$(2)) \ - -o $(call imgname,$(1),$(2))-factory$$$$dashr.img; \ - done + set -e; \ + 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_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_TMP)/$(1)_mtdparts'; \ + let 'k = kk * 1024'; \ + echo "$$$${k}" > '$(KDIR_TMP)/$(1)_kernel_maxsize'; \ + let 'r = rk * 1024'; \ + echo "$$$${r}" > '$(KDIR_TMP)/$(1)_rootfs_maxsize'; \ + ) + -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_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_TMP)/$(2)_rootfs_maxsize'` ]; then \ + echo "$(KDIR)/root.$(1) is too big" >& 2; \ + else \ + ( \ + set -e; \ + 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 \ + [ -n "$$$$r" ] && dashr="-$$$$r" || dashr= ; \ + $(STAGING_DIR_HOST)/bin/mkdniimg \ + -B $(6) -v OpenWrt.$(REVISION) -r "$$$$r" $(8) \ + -i $(call sysupname,$(1),$(2)) \ + -o $(call imgname,$(1),$(2))-factory$$$$dashr.img; \ + done; \ + fi; fi 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 @@ -332,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"; \ @@ -346,13 +532,26 @@ ifdef CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh endef endif +define Image/Build/OpenMesh + $(call MkuImageLzma,$(2)) + -sh $(TOPDIR)/scripts/om2p-fwupgradecfg-gen.sh \ + "$(BUILD_DIR)/om2p-fwupgrade.cfg" \ + "$(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_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 @@ -374,12 +573,16 @@ 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/4k/squashfs - $(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) +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 @@ -390,6 +593,18 @@ 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 + +define Image/Build/Template/64kraw/jffs2-64k + $(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),$(8)) endef @@ -398,39 +613,56 @@ define Image/Build/Template/128k/jffs2-128k $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) endef +alfa_nx_cmdline=board=ALFA-NX console=ttyS0,115200 $(alfa_mtdlayout_8M) +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_4k)/$(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),,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 @@ -445,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 @@ -460,11 +698,21 @@ define Image/Build/Profile/DIR600A1 $(call Image/Build/Template/$(fs_64k)/$(1),Cameo7240,dir-600-a1,$(dir600a1_cmdline),"AP91-AR7240-RT-090223-00") endef +dir615e4_cmdline=board=DIR-615-E4 console=ttyS0,115200 +define Image/Build/Profile/DIR615E4 + $(call Image/Build/Template/$(fs_64k)/$(1),Cameo7240,dir-615-e4,$(dir615e4_cmdline),"AP99-AR7240-RT-091105-05") +endef + eap7660d_cmdline=board=EAP7660D console=ttyS0,115200 define Image/Build/Profile/EAP7660D $(call Image/Build/Template/$(fs_128k)/$(1),PB4X,eap7660d,$(eap7660d_cmdline)) endef +hornetub_cmdline=board=HORNET-UB console=ttyATH0,115200 $(alfa_mtdlayout_8M) +define Image/Build/Profile/HORNETUB + $(call Image/Build/Template/$(fs_64k)/$(1),ALFA,hornet-ub,$(hornetub_cmdline),1638400,6291456,kernel_image,rootfs_image) +endef + ja76pf_cmdline=board=JA76PF console=ttyS0,115200 define Image/Build/Profile/JA76PF $(call Image/Build/Template/$(fs_64k)/$(1),PB4X,ja76pf,$(ja76pf_cmdline)) @@ -485,6 +733,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") @@ -501,6 +754,11 @@ define Image/Build/Profile/A02RBW300N $(call Image/Build/Template/$(fs_squash)/$(1),Cameo913x,a02-rb-w300n,$(a05rbw300n_cmdline),"AP81-AR9130-RT-070614-03") endef +ubntairrouter_cmdline=board=UBNT-AR console=ttyS0,115200 +define Image/Build/Profile/UBNTAIRROUTER + $(call Image/Build/Template/$(fs_64k)/$(1),UBNTXM,ubnt-airrouter,$(ubntairrouter_cmdline),XM,UBNTXM,ar7240) +endef + ubntrs_cmdline=board=UBNT-RS console=ttyS0,115200 define Image/Build/Profile/UBNTRS $(call Image/Build/Template/$(fs_64k)/$(1),UBNT,ubnt-rs,$(ubntrs_cmdline),RS,RSx,ar7100) @@ -531,12 +789,13 @@ 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 define Image/Build/Profile/UBNT + $(call Image/Build/Profile/UBNTAIRROUTER,$(1)) $(call Image/Build/Profile/UBNTRS,$(1)) $(call Image/Build/Profile/UBNTRSPRO,$(1)) $(call Image/Build/Profile/UBNTLSSR71,$(1)) @@ -561,92 +820,105 @@ define Image/Build/Profile/NBG_460N_550N_550NH $(call Image/Build/Template/$(fs_64k)/$(1),ZyXEL,nbg460n_550n_550nh,$(nbg460n_cmdline),NBG-460N) endef -tlmr3220_cmdline=board=TL-MR3220 console=ttyS0,115200 -define Image/Build/Profile/TLMR3220V1 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-mr3220-v1,$(tlmr3220_cmdline),TL-MR3220v1) -endef - -tlmr3420_cmdline=board=TL-MR3420 console=ttyS0,115200 -define Image/Build/Profile/TLMR3420V1 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-mr3420-v1,$(tlmr3420_cmdline),TL-MR3420v1) +define Image/Build/Profile/OM2P + $(call Image/Build/Template/$(fs_squash)/$(1),OpenMesh,om2p,OM2P) endef -tlwa901nd_cmdline=board=TL-WA901ND console=ttyS0,115200 -define Image/Build/Profile/TLWA901NDV1 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wa901nd-v1,$(tlwa901nd_cmdline),TL-WA901NDv1) +tlmr11u_cmdline=board=TL-MR11U console=ttyATH0,115200 +define Image/Build/Profile/TLMR11U + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK-LZMA,tl-mr11u-v1,$(tlmr11u_cmdline),0x00110101,1,4Mlzma) endef -tlwa901ndv2_cmdline=board=TL-WA901ND-v2 console=ttyS0,115200 -define Image/Build/Profile/TLWA901NDV2 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wa901nd-v2,$(tlwa901ndv2_cmdline),TL-WA901NDv2) +tlmr3020_cmdline=board=TL-MR3020 console=ttyATH0,115200 +define Image/Build/Profile/TLMR3020 + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK-LZMA,tl-mr3020-v1,$(tlmr3020_cmdline),0x30200001,1,4Mlzma) endef -tlwe741ndv1_cmdline=board=TL-WR741ND console=ttyS0,115200 -define Image/Build/Profile/TLWR741NDV1 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr741nd-v1,$(tlwe741ndv1_cmdline),TL-WR741NDv1) +tlmr3220_cmdline=board=TL-MR3220 console=ttyS0,115200 +define Image/Build/Profile/TLMR3220 + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-mr3220-v1,$(tlmr3220_cmdline),0x32200001,1,4M) endef -tlwe740nv1_cmdline=board=TL-WR741ND console=ttyS0,115200 -define Image/Build/Profile/TLWR740NV1 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr740n-v1,$(tlwe740nv1_cmdline),TL-WR740Nv1) +tlmr3420_cmdline=board=TL-MR3420 console=ttyS0,115200 +define Image/Build/Profile/TLMR3420 + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-mr3420-v1,$(tlmr3420_cmdline),0x34200001,1,4M) endef -tlwe740nv3_cmdline=board=TL-WR741ND console=ttyS0,115200 -define Image/Build/Profile/TLWR740NV3 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr740n-v3,$(tlwe740nv3_cmdline),TL-WR740Nv3) +tlwa701_cmdline=board=TL-WA901ND console=ttyS0,115200 +define Image/Build/Profile/TLWA701 + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wa701n-v1,$(tlwa701_cmdline),0x07010001,1,4M) endef -define Image/Build/Profile/TLWR743NDV1 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr743nd-v1,$(tlwe741ndv1_cmdline),TL-WR743NDv1) +tlwa901_cmdline=board=TL-WA901ND console=ttyS0,115200 +tlwa901v2_cmdline=board=TL-WA901ND-v2 console=ttyS0,115200 +define Image/Build/Profile/TLWA901 + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wa901nd-v1,$(tlwa901_cmdline),0x09010001,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wa901nd-v2,$(tlwa901v2_cmdline),0x09010002,1,4M) endef -tlwr841nv15_cmdline=board=TL-WR841N-v1.5 console=ttyS0,115200 -define Image/Build/Profile/TLWR841NV15 - $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr841n-v1.5,$(tlwr841nv15_cmdline),TL-WR841Nv1.5) +tlwr703_cmdline=board=TL-WR703N console=ttyATH0,115200 +define Image/Build/Profile/TLWR703 + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK-LZMA,tl-wr703n-v1,$(tlwr703_cmdline),0x07030101,1,4Mlzma) endef -tlwr841ndv3_cmdline=board=TL-WR941ND console=ttyS0,115200 -define Image/Build/Profile/TLWR841NDV3 - $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr841nd-v3,$(tlwr841ndv3_cmdline),TL-WR841NDv3) +tlwr740_cmdline=board=TL-WR741ND console=ttyS0,115200 +tlwr740v4_cmdline=board=TL-WR741ND-v4 console=ttyATH0,115200 +define Image/Build/Profile/TLWR740 + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr740n-v1,$(tlwr740_cmdline),0x07400001,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr740n-v3,$(tlwr740_cmdline),0x07400003,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK-LZMA,tl-wr740n-v4,$(tlwr740v4_cmdline),0x07400004,1,4Mlzma) endef -tlwr841ndv5_cmdline=board=TL-WR741ND console=ttyS0,115200 -define Image/Build/Profile/TLWR841NDV5 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr841nd-v5,$(tlwr841ndv5_cmdline),TL-WR841NDv5) +tlwr741_cmdline=board=TL-WR741ND console=ttyS0,115200 +tlwr741v4_cmdline=board=TL-WR741ND-v4 console=ttyATH0,115200 +define Image/Build/Profile/TLWR741 + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr741nd-v1,$(tlwr741_cmdline),0x07410001,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr741nd-v2,$(tlwr741_cmdline),0x07410001,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK-LZMA,tl-wr741nd-v4,$(tlwr741v4_cmdline),0x07410004,1,4Mlzma) endef -tlwr841ndv7_cmdline=board=TL-WR741ND console=ttyS0,115200 -define Image/Build/Profile/TLWR841NDV7 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr841nd-v7,$(tlwr841ndv7_cmdline),TL-WR841NDv7) +define Image/Build/Profile/TLWR743 + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr743nd-v1,$(tlwr741_cmdline),0x07430001,1,4M) endef -tlwr941ndv2_cmdline=board=TL-WR941ND console=ttyS0,115200 -define Image/Build/Profile/TLWR941NDV2 - $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v2,$(tlwr941ndv2_cmdline),TL-WR941NDv2) +tlwr841v15_cmdline=board=TL-WR841N-v1.5 console=ttyS0,115200 +tlwr841v3_cmdline=board=TL-WR941ND console=ttyS0,115200 +tlwr841v5_cmdline=board=TL-WR741ND console=ttyS0,115200 +tlwr841v7_cmdline=board=TL-WR841N-v7 console=ttyS0,115200 +define Image/Build/Profile/TLWR841 + $(call Image/Build/Template/$(fs_squash)/$(1),TPLINKOLD,tl-wr841n-v1.5,$(tlwr841v15_cmdline),0x08410002,2,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr841nd-v3,$(tlwr841v3_cmdline),0x08410003,3,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr841nd-v5,$(tlwr841v5_cmdline),0x08410005,1,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr841nd-v7,$(tlwr841v7_cmdline),0x08410007,1,4M) endef -tlwr941ndv3_cmdline=board=TL-WR941ND console=ttyS0,115200 -define Image/Build/Profile/TLWR941NDV3 - $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v3,$(tlwr941ndv3_cmdline),TL-WR941NDv2) +tlwr941v2_cmdline=board=TL-WR941ND console=ttyS0,115200 +tlwr941v4_cmdline=board=TL-WR741ND console=ttyS0,115200 +define Image/Build/Profile/TLWR941 + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr941nd-v2,$(tlwr941v2_cmdline),0x09410002,2,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr941nd-v3,$(tlwr941v2_cmdline),0x09410002,2,4M) + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr941nd-v4,$(tlwr941v4_cmdline),0x09410004,1,4M) endef -tlwr941ndv4_cmdline=board=TL-WR741ND console=ttyS0,115200 -define Image/Build/Profile/TLWR941NDV4 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr941nd-v4,$(tlwr941ndv4_cmdline),TL-WR941NDv4) +tlwr1043_cmdline=board=TL-WR1043ND console=ttyS0,115200 +define Image/Build/Profile/TLWR1043 + $(call Image/Build/Template/$(fs_64kraw)/$(1),TPLINK,tl-wr1043nd-v1,$(tlwr1043_cmdline),0x10430001,1,8M) endef -tlwr1043nd_cmdline=board=TL-WR1043ND console=ttyS0,115200 -define Image/Build/Profile/TLWR1043NDV1 - $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr1043nd-v1,$(tlwr1043nd_cmdline),TL-WR1043NDv1) +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_cmdline=board=WNDR3700v2 console=ttyS0,115200 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),Netgear,wndr3700,$(wndr3700_cmdline),wndr3700_mtdlayout,3700,WNDR3700,"" NA,) - $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,$(wndr3700v2_cmdline),wndr3700v2_mtdlayout,3701,WNDR3700v2,"",-H 29763654+16+64) + $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700,$(wndr3700_cmdline),$(wndr3700_mtdlayout),3700,WNDR3700,"" NA,) + $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,$(wndr3700_cmdline),$(wndr3700v2_mtdlayout),3701,WNDR3700v2,"",-H 29763654+16+64) + $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndrmac,$(wndr3700_cmdline),$(wndr3700v2_mtdlayout),3701,WNDRMAC,"",-H 29763654+16+64) + $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3800,$(wndr3700_cmdline),$(wndr3700v2_mtdlayout),3701,WNDR3800,"",-H 29763654+16+128) + $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndrmacv2,$(wndr3700_cmdline),$(wndr3700v2_mtdlayout),3701,WNDRMACv2,"",-H 29763654+16+128) endef wr400n_cmdline=board=WRT400N console=ttyS0,115200 @@ -656,7 +928,12 @@ endef dir825b1_cmdline=board=DIR-825-B1 console=ttyS0,115200 define Image/Build/Profile/DIR825B1 - $(call Image/Build/Template/$(fs_64k)/$(1),DIR825B1,dir-825-b1,$(dir825b1_cmdline)) + $(call Image/Build/Template/$(fs_64k)/$(1),DIR825B1,dir-825-b1,$(dir825b1_cmdline),01AP94-AR7161-RT-080619-00,00AP94-AR7161-RT-080619-00) +endef + +tew673gru_cmdline=board=TEW-673GRU console=ttyS0,115200 +define Image/Build/Profile/TEW673GRU + $(call Image/Build/Template/$(fs_64k)/$(1),DIR825B1,tew-673gru,$(tew673gru_cmdline),01AP94-AR7161-RT-080619-01,00AP94-AR7161-RT-080619-01) endef wrt160nl_cmdline=board=WRT160NL console=ttyS0,115200 @@ -664,14 +941,40 @@ define Image/Build/Profile/WRT160NL $(call Image/Build/Template/$(fs_64k)/$(1),CyberTAN,wrt160nl,$(wrt160nl_cmdline),1.00.01) endef +whrg301n_cmdline=board=WHR-G301N console=ttyS0,115200 +define Image/Build/Profile/WHRG301N + $(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-g301n,$(whrg301n_cmdline),whrhpg300n_mtdlayout,WHR-G301N) +endef + +whrhpg300n_cmdline=board=WHR-HP-G300N console=ttyS0,115200 +whrhpg300n_mtdlayout=mtdparts=spi0.0:248k(u-boot)ro,8k(u-boot-env)ro,896k(kernel),2816k(rootfs),64k(user_property),64k(art)ro,3712k@0x40000(firmware) +define Image/Build/Profile/WHRHPG300N + $(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-hp-g300n,$(whrhpg300n_cmdline),whrhpg300n_mtdlayout,WHR-HP-G300N) +endef + +whrhpgn_cmdline=board=WHR-HP-GN console=ttyS0,115200 +define Image/Build/Profile/WHRHPGN + $(call Image/Build/Template/$(fs_64k)/$(1),WHRHPG300N,whr-hp-gn,$(whrhpgn_cmdline),whrhpg300n_mtdlayout,WHR-HP-GN) +endef + wzrhpg300nh_cmdline=board=WZR-HP-G300NH console=ttyS0,115200 define Image/Build/Profile/WZRHPG300NH $(call Image/Build/Template/$(fs_128k)/$(1),WZRHPG30XNH,wzr-hp-g300nh,$(wzrhpg300nh_cmdline),WZR-HP-G300NH) endef +wzrhpg300nh2_cmdline=board=WZR-HP-G300NH2 console=ttyS0,115200 +define Image/Build/Profile/WZRHPG300NH2 + $(call Image/Build/Template/$(fs_128k)/$(1),WZRHPG30XNH,wzr-hp-g300nh2,$(wzrhpg300nh2_cmdline),WZR-HP-G300NH2) +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 +define Image/Build/Profile/WZRHPG450H + $(call Image/Build/Template/$(fs_64k)/$(1),WZRHPG30XNH,wzr-hp-g450h,$(wzrhpg450h_cmdline),WZR-HP-AG450H) endef zcn1523h28_cmdline=board=ZCN-1523H-2 console=ttyS0,115200 @@ -684,7 +987,16 @@ define Image/Build/Profile/ZCN1523H516 $(call Image/Build/Template/$(fs_64k)/$(1),Zcomax,zcn-1523h-5-16,$(zcn1523h516_cmdline)) 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,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)) @@ -693,43 +1005,52 @@ define Image/Build/Profile/Default $(call Image/Build/Profile/DB120,$(1)) $(call Image/Build/Profile/DIR600A1,$(1)) $(call Image/Build/Profile/DIR615C1,$(1)) + $(call Image/Build/Profile/DIR615E4,$(1)) $(call Image/Build/Profile/DIR825B1,$(1)) $(call Image/Build/Profile/EAP7660D,$(1)) $(call Image/Build/Profile/FR54RTR,$(1)) + $(call Image/Build/Profile/HORNETUB,$(1)) $(call Image/Build/Profile/JA76PF,$(1)) $(call Image/Build/Profile/JWAP003,$(1)) $(call Image/Build/Profile/MZKW04NU,$(1)) $(call Image/Build/Profile/MZKW300NH,$(1)) $(call Image/Build/Profile/NBG_460N_550N_550NH,$(1)) + $(call Image/Build/Profile/OM2P,$(1)) $(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/TLMR3220V1,$(1)) - $(call Image/Build/Profile/TLMR3420V1,$(1)) - $(call Image/Build/Profile/TLWA901NDV1,$(1)) - $(call Image/Build/Profile/TLWA901NDV2,$(1)) - $(call Image/Build/Profile/TLWR741NDV1,$(1)) - $(call Image/Build/Profile/TLWR740NV1,$(1)) - $(call Image/Build/Profile/TLWR740NV3,$(1)) - $(call Image/Build/Profile/TLWR743NDV1,$(1)) - $(call Image/Build/Profile/TLWR841NV15,$(1)) - $(call Image/Build/Profile/TLWR841NDV3,$(1)) - $(call Image/Build/Profile/TLWR841NDV5,$(1)) - $(call Image/Build/Profile/TLWR841NDV7,$(1)) - $(call Image/Build/Profile/TLWR941NDV2,$(1)) - $(call Image/Build/Profile/TLWR941NDV3,$(1)) - $(call Image/Build/Profile/TLWR941NDV4,$(1)) - $(call Image/Build/Profile/TLWR1043NDV1,$(1)) + $(call Image/Build/Profile/TEW673GRU,$(1)) + $(call Image/Build/Profile/TLMR11U,$(1)) + $(call Image/Build/Profile/TLMR3020,$(1)) + $(call Image/Build/Profile/TLMR3220,$(1)) + $(call Image/Build/Profile/TLMR3420,$(1)) + $(call Image/Build/Profile/TLWA701,$(1)) + $(call Image/Build/Profile/TLWA901,$(1)) + $(call Image/Build/Profile/TLWR703,$(1)) + $(call Image/Build/Profile/TLWR740,$(1)) + $(call Image/Build/Profile/TLWR741,$(1)) + $(call Image/Build/Profile/TLWR743,$(1)) + $(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)) $(call Image/Build/Profile/WRT160NL,$(1)) + $(call Image/Build/Profile/WHRG301N,$(1)) + $(call Image/Build/Profile/WHRHPG300N,$(1)) + $(call Image/Build/Profile/WHRHPGN,$(1)) $(call Image/Build/Profile/WZRHPG300NH,$(1)) + $(call Image/Build/Profile/WZRHPG300NH2,$(1)) $(call Image/Build/Profile/WZRHPAG300H,$(1)) + $(call Image/Build/Profile/WZRHPG450H,$(1)) $(call Image/Build/Profile/ZCN1523H28,$(1)) $(call Image/Build/Profile/ZCN1523H516,$(1)) endef @@ -747,11 +1068,9 @@ define Image/Build/Profile/Madwifi endef define Image/Build/squashfs - cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-4k - $(STAGING_DIR_HOST)/bin/padjffs2 $(KDIR)/root.squashfs-4k 4 - cp $(KDIR)/root.squashfs-4k $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs-4k + cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-raw cp $(KDIR)/root.squashfs $(KDIR)/root.squashfs-64k - $(STAGING_DIR_HOST)/bin/padjffs2 $(KDIR)/root.squashfs-64k 4 8 64 + $(STAGING_DIR_HOST)/bin/padjffs2 $(KDIR)/root.squashfs-64k 64 cp $(KDIR)/root.squashfs-64k $(BIN_DIR)/$(IMG_PREFIX)-root.squashfs-64k $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) endef @@ -760,6 +1079,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