From fbfad4e9b42f48d9c5d13c966704b6cab440ed57 Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Tue, 6 Dec 2011 16:26:43 +0000 Subject: [PATCH] ar71xx: use hw_id, hw_rev and flash_layout with mktplinkfw SVN-Revision: 29467 --- target/linux/ar71xx/image/Makefile | 54 +++++++++++++++--------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 7af0c05bc0..c1c0f48213 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -306,12 +306,12 @@ define Image/Build/TPLINKOLD dd if=$(KDIR)/vmlinux-$(2).okli conv=sync; \ ) > $(KDIR)/kernel-$(2).bin -$(STAGING_DIR_HOST)/bin/mktplinkfw \ - -B $(4) -N OpenWrt -V $(REVISION)\ + -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 \ + -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)) @@ -320,7 +320,7 @@ endef define Image/Build/TPLINKOLD/initramfs $(call Image/BuildLoader,$(2),gz,$(3),0x80060000) -$(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)/loader-$(2).gz \ -o $(call imgname,$(1),$(2))-uImage.bin endef @@ -333,12 +333,12 @@ define Image/Build/TPLINK dd if=$(KDIR)/vmlinux-$(2).okli conv=sync; \ ) > $(KDIR)/kernel-$(2).bin -$(STAGING_DIR_HOST)/bin/mktplinkfw \ - -B $(4) -N OpenWrt -V $(REVISION)\ + -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 \ - -B $(4) -N OpenWrt -V $(REVISION) -s \ + -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)) @@ -347,7 +347,7 @@ endef define Image/Build/TPLINK/initramfs $(call Image/BuildLoader,$(2),gz,$(3),0x80060000) -$(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)/loader-$(2).gz \ -o $(call imgname,$(1),$(2))-uImage.bin endef @@ -355,12 +355,12 @@ 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) -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) -a 0x10000 \ -o $(call sysupname,$(1),$(2)) @@ -369,7 +369,7 @@ 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 @@ -728,64 +728,64 @@ endef tlmr3220_cmdline=board=TL-MR3220 console=ttyS0,115200 define Image/Build/Profile/TLMR3220 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-mr3220-v1,$(tlmr3220_cmdline),TL-MR3220v1) + $(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/TLMR3420 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-mr3420-v1,$(tlmr3420_cmdline),TL-MR3420v1) + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-mr3420-v1,$(tlmr3420_cmdline),0x34200001,1,4M) endef 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),TL-WA901NDv1) - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wa901nd-v2,$(tlwa901v2_cmdline),TL-WA901NDv2) + $(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 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),TL-WR703Nv1) + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK-LZMA,tl-wr703n-v1,$(tlwr703_cmdline),0x07030101,1,4Mlzma) endef tlwr740_cmdline=board=TL-WR741ND console=ttyS0,115200 define Image/Build/Profile/TLWR740 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr740n-v1,$(tlwr740_cmdline),TL-WR740Nv1) - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr740n-v3,$(tlwr740_cmdline),TL-WR740Nv3) + $(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) endef 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),TL-WR741NDv1) - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK-LZMA,tl-wr741nd-v4,$(tlwr741v4_cmdline),TL-WR741NDv4) + $(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 define Image/Build/Profile/TLWR743 - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr743nd-v1,$(tlwr741_cmdline),TL-WR743NDv1) + $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr743nd-v1,$(tlwr741_cmdline),0x07430001,1,4M) endef 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),TL-WR841Nv1.5) - $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr841nd-v3,$(tlwr841v3_cmdline),TL-WR841NDv3) - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr841nd-v5,$(tlwr841v5_cmdline),TL-WR841NDv5) - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr841nd-v7,$(tlwr841v5_cmdline),TL-WR841NDv7) + $(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 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),TL-WR941NDv2) - $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr941nd-v3,$(tlwr941v2_cmdline),TL-WR941NDv2) - $(call Image/Build/Template/$(fs_64k)/$(1),TPLINK,tl-wr941nd-v4,$(tlwr941v4_cmdline),TL-WR941NDv4) + $(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 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),TL-WR1043NDv1) + $(call Image/Build/Template/$(fs_squash)/$(1),TPLINK,tl-wr1043nd-v1,$(tlwr1043_cmdline),0x10430001,1,8M) endef wndr3700_cmdline=board=WNDR3700 console=ttyS0,115200