diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2019-03-27 19:14:34 +0100 |
|---|---|---|
| committer | Christian Lamparter <chunkeey@gmail.com> | 2019-04-06 19:14:06 +0200 |
| commit | 0eef05fb362469cb4adcf051d11b325adc8c2381 (patch) | |
| tree | 587353ff2c60e16358848eaabdfb99e1f3bf5d69 | |
| parent | 2a8175a7ac79f37444eed1dc72054e170c71491e (diff) | |
| download | upstream-0eef05fb362469cb4adcf051d11b325adc8c2381.tar.gz upstream-0eef05fb362469cb4adcf051d11b325adc8c2381.tar.bz2 upstream-0eef05fb362469cb4adcf051d11b325adc8c2381.zip | |
ath79: Utilize tplink-safeloader definition
Currently, tplink-safeloader definition is only used a base for
another common definition.
This patch adjusts tplink-safeloader so it can be actually used
for some targets in generic-tp-link.mk.
This patch is cosmetic except for the order of
"check-size $$$$(IMAGE_SIZE)" and "append-metadata" exchanged
for the tplink_re350k-v1 .
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Signed-off-by: Christian Lamparter <chunkeey@gmail.com> [dealed with
tplink_cpe210-v2 and tplink_cpe210-v3, removed tplink-safeloader-uimage's
extra IMAGE/sysupgrade.bin rule]
| -rw-r--r-- | target/linux/ath79/image/common-tp-link.mk | 5 | ||||
| -rw-r--r-- | target/linux/ath79/image/generic-tp-link.mk | 20 |
2 files changed, 6 insertions, 19 deletions
diff --git a/target/linux/ath79/image/common-tp-link.mk b/target/linux/ath79/image/common-tp-link.mk index f22da2f801..6efff6322e 100644 --- a/target/linux/ath79/image/common-tp-link.mk +++ b/target/linux/ath79/image/common-tp-link.mk @@ -99,8 +99,9 @@ endef define Device/tplink-safeloader $(Device/tplink) - KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header - IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata + KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header -O + IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \ + append-metadata | check-size $$$$(IMAGE_SIZE) IMAGE/factory.bin := append-rootfs | tplink-safeloader factory endef diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index e3a0abeb5f..ecc34b88e0 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -117,7 +117,6 @@ define Device/tplink_cpe210-v2 TPLINK_BOARD_ID := CPE210V2 DEVICE_PACKAGES := rssileds LOADER_TYPE := elf - KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header -O SUPPORTED_DEVICES += cpe210-v2 endef TARGET_DEVICES += tplink_cpe210-v2 @@ -130,13 +129,12 @@ define Device/tplink_cpe210-v3 DEVICE_PACKAGES := rssileds TPLINK_BOARD_ID := CPE210V3 LOADER_TYPE := elf - KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header -O SUPPORTED_DEVICES += cpe210-v3 endef TARGET_DEVICES += tplink_cpe210-v3 define Device/tplink_re350k-v1 - $(Device/tplink) + $(Device/tplink-safeloader) ATH_SOC := qca9558 IMAGE_SIZE := 13760k DEVICE_TITLE := TP-Link RE350K v1 @@ -144,15 +142,11 @@ define Device/tplink_re350k-v1 TPLINK_BOARD_ID := RE350K-V1 TPLINK_HWID := 0x0 TPLINK_HWREV := 0 - KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header -O - IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \ - check-size $$$$(IMAGE_SIZE) | append-metadata - IMAGE/factory.bin := append-rootfs | tplink-safeloader factory endef TARGET_DEVICES += tplink_re350k-v1 define Device/tplink_re450-v2 - $(Device/tplink) + $(Device/tplink-safeloader) ATH_SOC := qca9563 IMAGE_SIZE := 6016k DEVICE_TITLE := TP-Link RE450 v2 @@ -161,10 +155,6 @@ define Device/tplink_re450-v2 TPLINK_HWREV := 0 TPLINK_BOARD_ID := RE450-V2 LOADER_TYPE := elf - KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header -O - IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \ - append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := append-rootfs | tplink-safeloader factory endef TARGET_DEVICES += tplink_re450-v2 @@ -274,17 +264,13 @@ endef TARGET_DEVICES += tplink_tl-wr1043nd-v3 define Device/tplink_tl-wr1043nd-v4 - $(Device/tplink) + $(Device/tplink-safeloader) ATH_SOC := qca9563 IMAGE_SIZE := 15552k DEVICE_TITLE := TP-Link TL-WR1043N/ND v4 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x10430004 TPLINK_BOARD_ID := TLWR1043NDV4 - KERNEL := kernel-bin | append-dtb | lzma | tplink-v1-header -O - IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \ - append-metadata | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := append-rootfs | tplink-safeloader factory SUPPORTED_DEVICES += tl-wr1043nd-v4 endef TARGET_DEVICES += tplink_tl-wr1043nd-v4 |