aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2015-10-11 16:23:53 +0000
committerJohn Crispin <john@openwrt.org>2015-10-11 16:23:53 +0000
commit16517293ac380e5ec1e1803d18e8e33604365850 (patch)
treeaa72322f2e8406c57e3c17b49c08e63d7f97c2be
parent5816fa9a981615dbb967722b2ae3999d6aab30a3 (diff)
downloadupstream-16517293ac380e5ec1e1803d18e8e33604365850.tar.gz
upstream-16517293ac380e5ec1e1803d18e8e33604365850.tar.bz2
upstream-16517293ac380e5ec1e1803d18e8e33604365850.zip
ar71xx/image: refactor tplink-chn-v2 devices
* use build step mktplinkfw with extra arguments * remove now unused mktplinkfw-chn-v2 * use Device/tplink Signed-off-by: Alexander Couzens <lynxis@fe80.eu> SVN-Revision: 47175
-rw-r--r--target/linux/ar71xx/image/Makefile34
1 files changed, 5 insertions, 29 deletions
diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index 2dd7798f21..1fece37379 100644
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -56,17 +56,6 @@ define Build/mktplinkfw
$(if $(findstring sysupgrade,$1),-s) && mv $@.new $@ || rm -f $@
endef
-define Build/mktplinkfw-chn-v2
- -$(STAGING_DIR_HOST)/bin/mktplinkfw \
- -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) -m 2 \
- -k $(word 1,$^) \
- -r $@ \
- -o $@.new \
- -j -X 0x40000 \
- -a $(call rootfs_align,$(FILESYSTEM)) \
- $(if $(findstring sysupgrade,$1),-s) && mv $@.new $@ || rm -f $@
-endef
-
# mktplinkfw-initramfs <optional extra arguments to mktplinkfw binary>
#
# -c combined image
@@ -80,16 +69,6 @@ define Build/mktplinkfw-initramfs
@mv $@.new $@
endef
-define Build/mktplinkfw-initramfs-chn-v2
- $(STAGING_DIR_HOST)/bin/mktplinkfw \
- -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) -m 2 \
- -k $@ \
- -o $@.new \
- -s -S \
- -c
- @mv $@.new $@
-endef
-
define Build/loader-common
rm -rf $@.src
$(MAKE) -C lzma-loader \
@@ -278,12 +257,9 @@ define Device/tplink
endef
define Device/tplink-chn-v2
- TPLINK_HWREV := 0x1
- KERNEL := kernel-bin | patch-cmdline | lzma
- KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | mktplinkfw-initramfs-chn-v2
- IMAGES := sysupgrade.bin factory.bin
- IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw-chn-v2 sysupgrade
- IMAGE/factory.bin := append-rootfs | mktplinkfw-chn-v2 factory
+$(Device/tplink)
+ IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade "-m 2"
+ IMAGE/factory.bin := append-rootfs | mktplinkfw factory "-m 2"
endef
define Device/tplink-nolzma
@@ -363,6 +339,7 @@ define Device/mw4530r-v1
$(Device/tl-wdr4300-v1)
TPLINK_HWID := 0x45300001
endef
+TARGET_DEVICES += tl-wdr3500-v1 tl-wdr3600-v1 tl-wdr4300-v1 tl-wdr4300-v1-il tl-wdr4310-v1 mw4530r-v1
define Device/tl-wdr3320-v2
$(Device/tplink-chn-v2-4mlzma)
@@ -370,8 +347,7 @@ $(Device/tplink-chn-v2-4mlzma)
DEVICE_PROFILE = TLWDR3320V2
TPLINK_HWID := 0x33200002
endef
-
-TARGET_DEVICES += tl-wdr3500-v1 tl-wdr3600-v1 tl-wdr4300-v1 tl-wdr4300-v1-il tl-wdr4310-v1 mw4530r-v1 tl-wdr3320-v2
+TARGET_DEVICES += tl-wdr3320-v2
define Device/archer-c5
$(Device/tplink-16mlzma)