X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/c1679af6b381809d1c133fbc609f0c5c465a512a..e310d5b786eb4c7e461f0aa609b3d3642db95465:/target/linux/ar71xx/image/Makefile diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index ddbbafa32..324899d40 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -19,6 +19,8 @@ define factoryname $(call imgname,$(1),$(2))-factory.bin endef +LOADER_MAKE := $(NO_TRACE_MAKE) -C lzma-loader KDIR=$(KDIR) + VMLINUX:=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux UIMAGE:=$(BIN_DIR)/$(IMG_PREFIX)-uImage fs_squash:=squashfs-only @@ -53,19 +55,23 @@ define PatchKernelGzip 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)/vmlinux-$(1).bin.lzma,$(KDIR)/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)/vmlinux-$(1).bin.gz,$(KDIR)/vmlinux-$(1).uImage) +endef + +define MkuImageOKLI + $(call MkuImage,lzma,-M 0x4f4b4c49,$(KDIR)/vmlinux.bin.lzma,$(KDIR)/vmlinux-$(1).okli) endef define CatFiles @@ -86,6 +92,26 @@ define Sysupgrade/RK $(call CatFiles,$(KDIR)/root.$(1),$(4),$(KDIR)/vmlinux-$(2).uImage,$(3),$(call sysupname,$(1),$(2))) endef +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 @@ -93,8 +119,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 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) $(call Image/Build/Initramfs) endef @@ -272,46 +298,78 @@ define Image/Build/Planex fi endef -define Image/Build/TPLINK - $(call PatchKernelGzip,$(2),$(3)) +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 -$(STAGING_DIR_HOST)/bin/mktplinkfw \ - -B $(4) -N OpenWrt -V $(REVISION)\ - -k $(KDIR)/vmlinux-$(2).bin.gz \ + -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\ + -k $(KDIR)/kernel-$(2).bin \ -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \ -o $(call factoryname,$(1),$(2)) -$(STAGING_DIR_HOST)/bin/mktplinkfw \ - -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)/kernel-$(2).bin \ -r $(BIN_DIR)/$(IMG_PREFIX)-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 + $(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 + -$(STAGING_DIR_HOST)/bin/mktplinkfw \ + -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\ + -k $(KDIR)/kernel-$(2).bin \ + -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) -a 0x10000 \ + -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 \ + -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) -a 0x10000 \ + -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 \ - -B $(4) -N OpenWrt -V $(REVISION)\ + -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION)\ -k $(KDIR)/vmlinux-$(2).bin.lzma \ - -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \ + -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) -a 0x10000 \ -o $(call factoryname,$(1),$(2)) -$(STAGING_DIR_HOST)/bin/mktplinkfw \ - -B $(4) -N OpenWrt -V $(REVISION) -s \ + -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s \ -k $(KDIR)/vmlinux-$(2).bin.lzma \ - -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \ + -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) -a 0x10000 \ -o $(call sysupname,$(1),$(2)) endef define Image/Build/TPLINK-LZMA/initramfs $(call PatchKernelLzma,$(2),$(3)) -$(STAGING_DIR_HOST)/bin/mktplinkfw -c \ - -B $(4) -N OpenWrt -V $(REVISION) -s \ + -H $(4) -W $(5) -F $(6) -N OpenWrt -V $(REVISION) -s \ -k $(KDIR)/vmlinux-$(2).bin.lzma \ -o $(call imgname,$(1),$(2))-uImage.bin endef @@ -669,92 +727,67 @@ define Image/Build/Profile/OM2P 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) +define Image/Build/Profile/TLMR3220 + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-mr3220-v1,$(tlmr3220_cmdline),0x32200001,1,4M) 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) -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) -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) -endef - -tlwr741ndv1_cmdline=board=TL-WR741ND console=ttyS0,115200 -define Image/Build/Profile/TLWR741NDV1 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr741nd-v1,$(tlwr741ndv1_cmdline),TL-WR741NDv1) -endef - -tlwr741ndv4_cmdline=board=TL-WR741ND-v4 console=ttyATH0,115200 -define Image/Build/Profile/TLWR741NDV4 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK-LZMA,tl-wr741nd-v4,$(tlwr741ndv4_cmdline),TL-WR741NDv4) -endef - -tlwr740nv1_cmdline=board=TL-WR741ND console=ttyS0,115200 -define Image/Build/Profile/TLWR740NV1 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr740n-v1,$(tlwr740nv1_cmdline),TL-WR740Nv1) -endef - -tlwr740nv3_cmdline=board=TL-WR741ND console=ttyS0,115200 -define Image/Build/Profile/TLWR740NV3 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr740n-v3,$(tlwr740nv3_cmdline),TL-WR740Nv3) -endef - -define Image/Build/Profile/TLWR743NDV1 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr743nd-v1,$(tlwr741ndv1_cmdline),TL-WR743NDv1) -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) +define Image/Build/Profile/TLMR3420 + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-mr3420-v1,$(tlmr3420_cmdline),0x34200001,1,4M) 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) +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_64k)/$(1),TPLINK,tl-wa901nd-v1,$(tlwa901_cmdline),0x09010001,1,4M) + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wa901nd-v2,$(tlwa901v2_cmdline),0x09010002,1,4M) 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) +tlwr703_cmdline=board=TL-WR703N console=ttyATH0,115200 +define Image/Build/Profile/TLWR703 + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK-LZMA,tl-wr703n-v1,$(tlwr703_cmdline),0x07030101,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) +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_64k)/$(1),TPLINK,tl-wr740n-v1,$(tlwr740_cmdline),0x07400001,1,4M) + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr740n-v3,$(tlwr740_cmdline),0x07400003,1,4M) + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK-LZMA,tl-wr740n-v4,$(tlwr740v4_cmdline),0x07400004,1,4Mlzma) 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) +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_64k)/$(1),TPLINK,tl-wr741nd-v1,$(tlwr741_cmdline),0x07410001,1,4M) + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK-LZMA,tl-wr741nd-v4,$(tlwr741v4_cmdline),0x07410004,1,4Mlzma) 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) +define Image/Build/Profile/TLWR743 + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr743nd-v1,$(tlwr741_cmdline),0x07430001,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) +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 +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_squash)/$(1),TPLINK,tl-wr841nd-v3,$(tlwr841v3_cmdline),0x08410003,3,4M) + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr841nd-v5,$(tlwr841v5_cmdline),0x08410005,1,4M) + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr841nd-v7,$(tlwr841v5_cmdline),0x08410007,1,4M) 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) +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_squash)/$(1),TPLINK,tl-wr941nd-v2,$(tlwr941v2_cmdline),0x09410002,2,4M) + $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v3,$(tlwr941v2_cmdline),0x09410002,2,4M) + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr941nd-v4,$(tlwr941v4_cmdline),0x09410004,1,4M) endef -tlwr703n_cmdline=board=TL-WR703N console=ttyATH0,115200 -define Image/Build/Profile/TLWR703NV1 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK-LZMA,tl-wr703n-v1,$(tlwr703n_cmdline),TL-WR703Nv1) +tlwr1043_cmdline=board=TL-WR1043ND console=ttyS0,115200 +define Image/Build/Profile/TLWR1043 + $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr1043nd-v1,$(tlwr1043_cmdline),0x10430001,1,8M) endef wndr3700_cmdline=board=WNDR3700 console=ttyS0,115200 @@ -851,24 +884,16 @@ define Image/Build/Profile/Default $(call Image/Build/Profile/PB92,$(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/TLWR741NDV4,$(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/TLWR703NV1,$(1)) + $(call Image/Build/Profile/TLMR3220,$(1)) + $(call Image/Build/Profile/TLMR3420,$(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/UBNT,$(1)) $(call Image/Build/Profile/WP543,$(1)) $(call Image/Build/Profile/WNDR3700,$(1))