aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMathias Kresin <dev@kresin.me>2018-07-05 22:34:14 +0200
committerMathias Kresin <dev@kresin.me>2018-07-07 21:07:40 +0200
commita28d686fb679e473cdae1366e7591a97d57ea8af (patch)
treefb1243913be03e424404949280014b54eb899942 /target
parentb908c82f49c5049274f36345cfedbd21c0e5c938 (diff)
downloadupstream-a28d686fb679e473cdae1366e7591a97d57ea8af.tar.gz
upstream-a28d686fb679e473cdae1366e7591a97d57ea8af.tar.bz2
upstream-a28d686fb679e473cdae1366e7591a97d57ea8af.zip
ar71xx: factor out safe loader image build code
Add a template for safeloader images and include it instead of overwriting variables defined in the common tp-link build commands. Split the existing tp-link templates to proper implement the safeloader template. Signed-off-by: Mathias Kresin <dev@kresin.me>
Diffstat (limited to 'target')
-rw-r--r--target/linux/ar71xx/image/common-tp-link.mk24
-rw-r--r--target/linux/ar71xx/image/generic-tp-link.mk60
-rw-r--r--target/linux/ar71xx/image/tiny-tp-link.mk20
3 files changed, 44 insertions, 60 deletions
diff --git a/target/linux/ar71xx/image/common-tp-link.mk b/target/linux/ar71xx/image/common-tp-link.mk
index 317d5bb2f4..99acd7e584 100644
--- a/target/linux/ar71xx/image/common-tp-link.mk
+++ b/target/linux/ar71xx/image/common-tp-link.mk
@@ -44,16 +44,20 @@ endef
define Device/tplink
TPLINK_HWREV := 0x1
TPLINK_HEADER_VERSION := 1
- LOADER_TYPE := gz
+ IMAGES := sysupgrade.bin factory.bin
+endef
+
+define Device/tplink-lzma
+ $(Device/tplink)
KERNEL := kernel-bin | patch-cmdline | lzma
KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | tplink-v1-header
- IMAGES := sysupgrade.bin factory.bin
IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade
IMAGE/factory.bin := append-rootfs | mktplinkfw factory
endef
define Device/tplink-nolzma
$(Device/tplink)
+ LOADER_TYPE := gz
LOADER_FLASH_OFFS := 0x22000
COMPILE := loader-$(1).gz
COMPILE/loader-$(1).gz := loader-okli-compile
@@ -61,6 +65,16 @@ define Device/tplink-nolzma
KERNEL := kernel-bin | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 7680
KERNEL_INITRAMFS_NAME := vmlinux-initramfs.bin.lzma
KERNEL_INITRAMFS := kernel-bin | loader-kernel-cmdline | tplink-v1-header
+ IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade
+ IMAGE/factory.bin := append-rootfs | mktplinkfw factory
+endef
+
+define Device/tplink-safeloader
+ $(Device/tplink)
+ KERNEL := kernel-bin | patch-cmdline | lzma | tplink-v1-header
+ IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
+ append-metadata | check-size $$$$(IMAGE_SIZE)
+ IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
endef
define Device/tplink-4m
@@ -76,19 +90,19 @@ define Device/tplink-8m
endef
define Device/tplink-4mlzma
- $(Device/tplink)
+ $(Device/tplink-lzma)
TPLINK_FLASHLAYOUT := 4Mlzma
IMAGE_SIZE := 3904k
endef
define Device/tplink-8mlzma
- $(Device/tplink)
+ $(Device/tplink-lzma)
TPLINK_FLASHLAYOUT := 8Mlzma
IMAGE_SIZE := 7936k
endef
define Device/tplink-16mlzma
- $(Device/tplink)
+ $(Device/tplink-lzma)
TPLINK_FLASHLAYOUT := 16Mlzma
IMAGE_SIZE := 15872k
endef
diff --git a/target/linux/ar71xx/image/generic-tp-link.mk b/target/linux/ar71xx/image/generic-tp-link.mk
index 2788253c75..89983779e7 100644
--- a/target/linux/ar71xx/image/generic-tp-link.mk
+++ b/target/linux/ar71xx/image/generic-tp-link.mk
@@ -2,11 +2,8 @@ include ./common-tp-link.mk
define Device/archer-cxx
+ $(Device/tplink-safeloader)
KERNEL := kernel-bin | patch-cmdline | lzma | uImageArcher lzma
- IMAGES := sysupgrade.bin factory.bin
- IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
- append-metadata | check-size $$$$(IMAGE_SIZE)
- IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
endef
define Device/archer-c25-v1
@@ -150,18 +147,7 @@ define Device/archer-c7-v5
endef
TARGET_DEVICES += archer-c7-v5
-define Device/cpexxx
- DEVICE_PACKAGES := rssileds
- MTDPARTS := spi0.0:128k(u-boot)ro,64k(partition-table)ro,64k(product-info)ro,1792k(kernel),5888k(rootfs),192k(config)ro,64k(ART)ro,7680k@0x40000(firmware)
- IMAGE_SIZE := 7680k
- DEVICE_PROFILE := CPE510
- IMAGES := sysupgrade.bin factory.bin
- IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
- IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
-endef
-
define Device/cpe510-520-v1
- $(Device/cpexxx)
DEVICE_TITLE := TP-LINK CPE510/520 v1
BOARDNAME := CPE510
TPLINK_BOARD_ID := CPE510
@@ -170,6 +156,12 @@ define Device/cpe510-520-v1
COMPILE := loader-$(1).elf
COMPILE/loader-$(1).elf := loader-okli-compile
KERNEL := kernel-bin | lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1) 12288
+ IMAGES += factory.bin
+ IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
+ IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
+ DEVICE_PACKAGES := rssileds
+ MTDPARTS := spi0.0:128k(u-boot)ro,64k(partition-table)ro,64k(product-info)ro,1792k(kernel),5888k(rootfs),192k(config)ro,64k(ART)ro,7680k@0x40000(firmware)
+ IMAGE_SIZE := 7680k
endef
TARGET_DEVICES += cpe510-520-v1
@@ -182,14 +174,15 @@ endef
TARGET_DEVICES += cpe210-220-v1
define Device/cpe210-v2
- $(Device/cpexxx)
+ $(Device/tplink-safeloader)
DEVICE_TITLE := TP-LINK CPE210 v2
BOARDNAME := CPE210V2
TPLINK_BOARD_ID := CPE210V2
- KERNEL := kernel-bin | patch-cmdline | lzma | tplink-v1-header
TPLINK_HWID := 0x0
TPLINK_HWREV := 0
- TPLINK_HEADER_VERSION := 1
+ MTDPARTS := spi0.0:128k(u-boot)ro,64k(partition-table)ro,64k(product-info)ro,1792k(kernel),5888k(rootfs),192k(config)ro,64k(ART)ro,7680k@0x40000(firmware)
+ IMAGE_SIZE := 7680k
+ DEVICE_PACKAGES := rssileds
endef
TARGET_DEVICES += cpe210-v2
@@ -225,6 +218,7 @@ endef
TARGET_DEVICES += eap120-v1
define Device/re355-v1
+ $(Device/tplink-safeloader)
DEVICE_TITLE := TP-LINK RE355 v1
DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x
MTDPARTS := spi0.0:128k(u-boot)ro,6016k(firmware),64k(partition-table)ro,64k(product-info)ro,1856k(config)ro,64k(art)ro
@@ -234,15 +228,11 @@ define Device/re355-v1
DEVICE_PROFILE := RE355
TPLINK_HWID := 0x0
TPLINK_HWREV := 0
- TPLINK_HEADER_VERSION := 1
- KERNEL := kernel-bin | patch-cmdline | lzma | tplink-v1-header
- IMAGES := sysupgrade.bin factory.bin
- IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
- IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
endef
TARGET_DEVICES += re355-v1
define Device/re450-v1
+ $(Device/tplink-safeloader)
DEVICE_TITLE := TP-LINK RE450 v1
DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x
MTDPARTS := spi0.0:128k(u-boot)ro,6016k(firmware),64k(partition-table)ro,64k(product-info)ro,1856k(config)ro,64k(art)ro
@@ -252,11 +242,6 @@ define Device/re450-v1
DEVICE_PROFILE := RE450
TPLINK_HWID := 0x0
TPLINK_HWREV := 0
- TPLINK_HEADER_VERSION := 1
- KERNEL := kernel-bin | patch-cmdline | lzma | tplink-v1-header
- IMAGES := sysupgrade.bin factory.bin
- IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
- IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
endef
TARGET_DEVICES += re450-v1
@@ -391,7 +376,7 @@ endef
TARGET_DEVICES += tl-wr1043nd-v3
define Device/tl-wr1043nd-v4
- $(Device/tplink)
+ $(Device/tplink-safeloader)
DEVICE_TITLE := TP-LINK TL-WR1043N/ND v4
DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
BOARDNAME := TL-WR1043ND-v4
@@ -401,9 +386,7 @@ define Device/tl-wr1043nd-v4
IMAGE_SIZE := 15552k
TPLINK_BOARD_ID := TLWR1043NDV4
KERNEL := kernel-bin | patch-cmdline | lzma | tplink-v1-header -O
- IMAGES := sysupgrade.bin factory.bin
- IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
- IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
+ KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | tplink-v1-header
endef
TARGET_DEVICES += tl-wr1043nd-v4
@@ -489,6 +472,7 @@ endef
TARGET_DEVICES += tl-wr842n-v3
define Device/tl-wr902ac-v1
+ $(Device/tplink-safeloader)
DEVICE_TITLE := TP-LINK TL-WR902AC v1
DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport \
kmod-ath10k ath10k-firmware-qca9887 -swconfig -uboot-envtools
@@ -497,30 +481,20 @@ define Device/tl-wr902ac-v1
TPLINK_BOARD_ID := TL-WR902AC-V1
TPLINK_HWID := 0x0
TPLINK_HWREV := 0
- TPLINK_HEADER_VERSION := 1
SUPPORTED_DEVICES := tl-wr902ac-v1
IMAGE_SIZE := 7360k
- KERNEL := kernel-bin | patch-cmdline | lzma | tplink-v1-header
- IMAGES += factory.bin
- IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
- IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
- append-metadata | check-size $$$$(IMAGE_SIZE)
MTDPARTS := spi0.0:128k(u-boot)ro,7360k(firmware),640k(tplink)ro,64k(art)ro
endef
TARGET_DEVICES += tl-wr902ac-v1
define Device/tl-wr942n-v1
+ $(Device/archer-cxx)
DEVICE_TITLE := TP-LINK TL-WR942N v1
DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport
BOARDNAME := TL-WR942N-V1
TPLINK_BOARD_ID := TLWR942NV1
DEVICE_PROFILE := TLWR942
IMAGE_SIZE := 14464k
- KERNEL := kernel-bin | patch-cmdline | lzma | uImageArcher lzma
- IMAGES := sysupgrade.bin factory.bin
- IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | \
- append-metadata | check-size $$$$(IMAGE_SIZE)
- IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
MTDPARTS := spi0.0:128k(u-boot)ro,14464k(firmware),64k(product-info)ro,64k(partition-table)ro,256k(oem-config)ro,1344k(oem-vars)ro,64k(ART)ro
SUPPORTED_DEVICES := tl-wr942n-v1
endef
diff --git a/target/linux/ar71xx/image/tiny-tp-link.mk b/target/linux/ar71xx/image/tiny-tp-link.mk
index 2891b9654f..9d3059d127 100644
--- a/target/linux/ar71xx/image/tiny-tp-link.mk
+++ b/target/linux/ar71xx/image/tiny-tp-link.mk
@@ -231,37 +231,33 @@ define Device/tl-wa850re-v1
endef
TARGET_DEVICES += tl-wa850re-v1
-define Device/tl-wa85xre
- $(Device/tplink)
- TPLINK_HWREV := 0
- KERNEL := kernel-bin | patch-cmdline | lzma | tplink-v1-header
- IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
- IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
- MTDPARTS := spi0.0:128k(u-boot)ro,1344k(kernel),2304k(rootfs),256k(config)ro,64k(art)ro,3648k@0x20000(firmware)
-endef
-
define Device/tl-wa850re-v2
- $(Device/tl-wa85xre)
+ $(Device/tplink-safeloader)
DEVICE_TITLE := TP-LINK TL-WA850RE v2
DEVICE_PACKAGES := rssileds
BOARDNAME := TL-WA850RE-V2
DEVICE_PROFILE := TLWA850
TPLINK_BOARD_ID := TLWA850REV2
TPLINK_HWID := 0x08500002
+ TPLINK_HWREV := 0
+ IMAGE_SIZE := 3648k
+ MTDPARTS := spi0.0:128k(u-boot)ro,1344k(kernel),2304k(rootfs),256k(config)ro,64k(art)ro,3648k@0x20000(firmware)
endef
TARGET_DEVICES += tl-wa850re-v2
define Device/tl-wa855re-v1
- $(Device/tl-wa85xre)
+ $(Device/tplink-safeloader)
DEVICE_TITLE := TP-LINK TL-WA855RE v1
BOARDNAME := TL-WA855RE-v1
DEVICE_PROFILE := TLWA855RE
TPLINK_HWID := 0x08550001
TPLINK_BOARD_ID := TLWA855REV1
+ TPLINK_HWREV := 0
+ IMAGE_SIZE := 3648k
+ MTDPARTS := spi0.0:128k(u-boot)ro,1344k(kernel),2304k(rootfs),256k(config)ro,64k(art)ro,3648k@0x20000(firmware)
endef
TARGET_DEVICES += tl-wa855re-v1
-
define Device/tl-wa860re-v1
$(Device/tplink-4mlzma)
DEVICE_TITLE := TP-LINK TL-WA860RE v1