treewide: omit IMAGE_SIZE argument from check-size

[openwrt/staging/ldir.git] / target / linux / ath79 / image / common-tp-link.mk

diff --git a/target/linux/ath79/image/common-tp-link.mk b/target/linux/ath79/image/common-tp-link.mk
index 1c7ff0e567297f20cacabfc9441f558e482b5b4b..328eaaed3056c13ad3a0a12ecaac12ba2d0c03a9 100644 (file)
--- a/target/linux/ath79/image/common-tp-link.mk
+++ b/target/linux/ath79/image/common-tp-link.mk
@@ -1,16 +1,5 @@
 DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION
-DEVICE_VARS += TPLINK_BOARD_NAME TPLINK_BOARD_ID
-
-# mktplinkfw-combined
-#
-# -c combined image
-define Build/mktplinkfw-combined
-       $(STAGING_DIR_HOST)/bin/mktplinkfw \
-               -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) \
-               -N OpenWrt -V $(REVISION) $(1) -m $(TPLINK_HEADER_VERSION) \
-               -k $@ -o $@.new -s -S -c
-       @mv $@.new $@
-endef
+DEVICE_VARS += TPLINK_BOARD_ID TPLINK_HWREVADD TPLINK_HVERSION
 
 define Build/uImageArcher
        mkimage -A $(LINUX_KARCH) \
@@ -20,8 +9,9 @@ define Build/uImageArcher
        @mv $@.new $@
 endef
 
-define Device/tplink
+define Device/tplink-v1
   DEVICE_VENDOR := TP-Link
+  TPLINK_HWID := 0x0
   TPLINK_HWREV := 0x1
   TPLINK_HEADER_VERSION := 1
   LOADER_TYPE := gz
@@ -32,8 +22,20 @@ define Device/tplink
   IMAGE/factory.bin := tplink-v1-image factory
 endef
 
+define Device/tplink-v2
+  DEVICE_VENDOR := TP-Link
+  TPLINK_HWID := 0x0
+  TPLINK_HWREV := 0x1
+  TPLINK_HWREVADD := 0x0
+  TPLINK_HVERSION := 3
+  KERNEL := kernel-bin | append-dtb | lzma
+  KERNEL_INITRAMFS := kernel-bin | append-dtb | lzma | tplink-v2-header
+  IMAGE/sysupgrade.bin := tplink-v2-image -s | append-metadata | \
+       check-size
+endef
+
 define Device/tplink-nolzma
-  $(Device/tplink)
+  $(Device/tplink-v1)
   LOADER_FLASH_OFFS := 0x22000
   COMPILE := loader-$(1).gz
   COMPILE/loader-$(1).gz := loader-okli-compile
@@ -49,7 +51,7 @@ define Device/tplink-4m
 endef
 
 define Device/tplink-4mlzma
-  $(Device/tplink)
+  $(Device/tplink-v1)
   TPLINK_FLASHLAYOUT := 4Mlzma
   IMAGE_SIZE := 3904k
 endef
@@ -61,22 +63,23 @@ define Device/tplink-8m
 endef
 
 define Device/tplink-8mlzma
-  $(Device/tplink)
+  $(Device/tplink-v1)
   TPLINK_FLASHLAYOUT := 8Mlzma
   IMAGE_SIZE := 8000k
 endef
 
 define Device/tplink-16mlzma
-  $(Device/tplink)
+  $(Device/tplink-v1)
   TPLINK_FLASHLAYOUT := 16Mlzma
   IMAGE_SIZE := 16192k
 endef
 
 define Device/tplink-safeloader
-  $(Device/tplink)
+  $(Device/tplink-v1)
+  TPLINK_HWREV := 0x0
   KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header -O
   IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
-    append-metadata | check-size $$$$(IMAGE_SIZE)
+       append-metadata | check-size
   IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
 endef
 
@@ -85,7 +88,7 @@ define Device/tplink-safeloader-uimage
   KERNEL := kernel-bin | append-dtb | lzma | uImageArcher lzma
 endef
 
-define Device/tplink-loader-okli
+define Device/tplink-safeloader-okli
   $(Device/tplink-safeloader)
   LOADER_TYPE := elf
   LOADER_FLASH_OFFS := 0x43000