Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ar71xx/image: refactor tplink-chn-v2 devices

Browse source 
* 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
This commit is contained in:
John Crispin 2015-10-11 16:23:53 +00:00
parent 5816fa9a98
commit 16517293ac
1 changed files with 5 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
target/linux/ar71xx/image/Makefile
View file

@ -56,17 +56,6 @@ define Build/mktplinkfw
$(if $(findstring sysupgrade,$1),-s) && mv $@.new $@ || rm -f $@ $(if $(findstring sysupgrade,$1),-s) && mv $@.new $@ || rm -f $@
endef 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> # mktplinkfw-initramfs <optional extra arguments to mktplinkfw binary>
# #
# -c combined image # -c combined image
@ -80,16 +69,6 @@ define Build/mktplinkfw-initramfs
@mv $@.new $@ @mv $@.new $@
endef 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 define Build/loader-common
rm -rf $@.src rm -rf $@.src
$(MAKE) -C lzma-loader \ $(MAKE) -C lzma-loader \
@ -278,12 +257,9 @@ define Device/tplink
endef endef
define Device/tplink-chn-v2 define Device/tplink-chn-v2
TPLINK_HWREV := 0x1 $(Device/tplink)
KERNEL := kernel-bin | patch-cmdline | lzma IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade "-m 2"
KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | mktplinkfw-initramfs-chn-v2 IMAGE/factory.bin := append-rootfs | mktplinkfw factory "-m 2"
IMAGES := sysupgrade.bin factory.bin
IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw-chn-v2 sysupgrade
IMAGE/factory.bin := append-rootfs | mktplinkfw-chn-v2 factory
endef endef
define Device/tplink-nolzma define Device/tplink-nolzma
@ -363,6 +339,7 @@ define Device/mw4530r-v1
$(Device/tl-wdr4300-v1) $(Device/tl-wdr4300-v1)
TPLINK_HWID := 0x45300001 TPLINK_HWID := 0x45300001
endef 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 define Device/tl-wdr3320-v2
$(Device/tplink-chn-v2-4mlzma) $(Device/tplink-chn-v2-4mlzma)
@ -370,8 +347,7 @@ $(Device/tplink-chn-v2-4mlzma)
DEVICE_PROFILE = TLWDR3320V2 DEVICE_PROFILE = TLWDR3320V2
TPLINK_HWID := 0x33200002 TPLINK_HWID := 0x33200002
endef endef
TARGET_DEVICES += tl-wdr3320-v2
TARGET_DEVICES += tl-wdr3500-v1 tl-wdr3600-v1 tl-wdr4300-v1 tl-wdr4300-v1-il tl-wdr4310-v1 mw4530r-v1 tl-wdr3320-v2
define Device/archer-c5 define Device/archer-c5
$(Device/tplink-16mlzma) $(Device/tplink-16mlzma)