Skip to content

Commit

Permalink
ath79: move TPLINK_HWID/_HWREV to parent for tplink-safeloader
Browse files Browse the repository at this point in the history
Several devices with tplink-safeloader contain default values (0x0)
for TPLINK_HWID and TPLINK_HWREV in their device definitions.
Move those to common tplink-safeloader definition so they do not
have to be repeated each time.

While at it, set default value for tplink-v1 and tplink-v2 as well.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
  • Loading branch information
adschm committed Feb 19, 2020
1 parent 69a9a08 commit 98fbf2e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
5 changes: 4 additions & 1 deletion target/linux/ath79/image/common-tp-link.mk
Expand Up @@ -11,6 +11,7 @@ endef

define Device/tplink-v1
DEVICE_VENDOR := TP-Link
TPLINK_HWID := 0x0
TPLINK_HWREV := 0x1
TPLINK_HEADER_VERSION := 1
LOADER_TYPE := gz
Expand All @@ -23,6 +24,7 @@ endef

define Device/tplink-v2
DEVICE_VENDOR := TP-Link
TPLINK_HWID := 0x0
TPLINK_HWREV := 0x1
TPLINK_HWREVADD := 0x0
TPLINK_HVERSION := 3
Expand Down Expand Up @@ -74,9 +76,10 @@ endef

define Device/tplink-safeloader
$(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_SIZE)
IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
endef

Expand Down
8 changes: 0 additions & 8 deletions target/linux/ath79/image/generic-tp-link.mk
Expand Up @@ -320,8 +320,6 @@ define Device/tplink_re350k-v1
DEVICE_VARIANT := v1
DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct
TPLINK_BOARD_ID := RE350K-V1
TPLINK_HWID := 0x0
TPLINK_HWREV := 0
endef
TARGET_DEVICES += tplink_re350k-v1

Expand All @@ -330,8 +328,6 @@ define Device/tplink_rex5x-v1
SOC := qca9558
IMAGE_SIZE := 6016k
DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct
TPLINK_HWID := 0x0
TPLINK_HWREV := 0
endef

define Device/tplink_re355-v1
Expand Down Expand Up @@ -359,8 +355,6 @@ define Device/tplink_re450-v2
DEVICE_MODEL := RE450
DEVICE_VARIANT := v2
DEVICE_PACKAGES := kmod-ath10k-ct-smallbuffers ath10k-firmware-qca988x-ct
TPLINK_HWID := 0x0
TPLINK_HWREV := 0
TPLINK_BOARD_ID := RE450-V2
LOADER_TYPE := elf
endef
Expand Down Expand Up @@ -585,8 +579,6 @@ define Device/tplink_tl-wr902ac-v1
-swconfig -uboot-envtools
TPLINK_BOARD_ID := TL-WR902AC-V1
IMAGE_SIZE := 7360k
TPLINK_HWID := 0x0
TPLINK_HWREV := 0
SUPPORTED_DEVICES += tl-wr902ac-v1
endef
TARGET_DEVICES += tplink_tl-wr902ac-v1
Expand Down
1 change: 0 additions & 1 deletion target/linux/ath79/image/tiny-tp-link.mk
Expand Up @@ -95,7 +95,6 @@ define Device/tplink_tl-wa850re-v2
DEVICE_VARIANT := v2
TPLINK_BOARD_ID := TLWA850REV2
TPLINK_HWID := 0x08500002
TPLINK_HWREV := 0x0
DEVICE_PACKAGES := rssileds
SUPPORTED_DEVICES += tl-wa850re-v2
endef
Expand Down

0 comments on commit 98fbf2e

Please sign in to comment.