From patchwork Tue Apr 2 10:21:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1074192 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="SilQ9lf7"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44YQJ85kJnz9sNM for ; Tue, 2 Apr 2019 21:22:31 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id:Date:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=np5pbJa5z/8ghRiSPtgq6U6uNs7k7drJSN/rj62XDXc=; b=SilQ9lf7hijM70 gHXlR4JTsjHOn6KezTv02LljFHA+lL54qTazQx42EoGYei8BlPCRqQdXH2WtuGBqBbPtSsXwNs6Da ZutimyrncSolJqpAAfeCG0WE5Rx+qGpS4+k6MrYzCc3FR/NheYuTWM6oF84UBBh4/a2J2Vu5/OUPH MtSxODyt3LVAJ6y5vTbQc9dZczGQ++lsWbkB/XyGDej1K6GkmvMb3K6wR5WrC4kxy6xpm4550LKkT pI5zCwu3LdaZBZc9ZakqCL6Zm86KDskkoZWciVv7MIUS0qgZI9AzUDinuGzJSUTAK5wr44hLTqcVl rdRo1IVh5a8oxl1lHScw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hBGYR-0005ph-4L; Tue, 02 Apr 2019 10:22:07 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hBGYM-0005ok-Tu for openwrt-devel@lists.openwrt.org; Tue, 02 Apr 2019 10:22:04 +0000 Received: from localhost.localdomain ([188.193.187.204]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MKKlN-1hVPR32XOB-00LlSh for ; Tue, 02 Apr 2019 12:21:58 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Date: Tue, 2 Apr 2019 12:21:54 +0200 Message-Id: <20190402102154.41415-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.11.0 X-Provags-ID: V03:K1:AB/bMWrDF6w3eT8hVj2rmHqeKnu7fzqpMWi6kkhNxcLU0CsRsTV w/adz4EuiJxOFmMYs1Vcqn5uS+GJTUUWoSmoTBQ6ymxGKq0AxvGYJgbDreDCMQ1LZpLDQrz 4RqVVAgbXPN9+GMR8oVLib+LgeB1vqliBR8Ua9eWadbKrSrU6fTkcvINxmRSPNxVYmhzOa1 N155tBcxm1gDRzl973dOg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:xetTrdmWHNg=:0+ywqUqRaxtINE0S6qmW/V FJZ4RhsKHehwR5c6c6ZloySmMo7+lXVs8K4rJQFTWog4OGbrwaXoBipUoZpCKS1yxmTprjuiJ ++apY3zac5Zjxia6JAqUoynm1/fLyTB+OIXJ/EYJDjeTRbziEtq4SK6t7bPc0QKacUoeNMLQd R/vFFX6VhZJLoEy9qf1zuqgUwPSkxz0UYTFSyoc/18FOlm01VKESZosdDqeEBV/89LnYNb0PK 9QsZL5MpODJdJAY31CvKGzCKPyvS0Z51XCMkWHo2iJtYUPJoguO0pgHsfsXHzu3AgyfBuoKJc 4ANTMVVlItWCm9ErkAi5RZxxntKnFtd3+skXXvGDXV7EqCciYhzGj8E1wYrvuenUyv9FbGfwR 481UfhjOhxFgOshCvwIvyEnlWes4ZAJMHB0rBGwgCXbVfNGwEY5oI4SHk58zmIpzB52j66dkI OSu4qAsB0Yz8pwY7rpKZHyhE0yGKb9u6t1sgG35VPcgT3hhYqv/LjW+471k4if07+2mGt04bE fy/AY1FUzB1Q1rJfs3Hzl8zEuYH5RH0fmqxr09EPQ3o3MoT7YXUT2Ri5LreI/UrvC5LZkyuHB eEbbRyHzJ+z4fkUNCB2hCu93cICVBtibGIcvPgvoi7rRB2lqJgXu50HjnkZBdN5K2FJEgZee/ QjQ+WsZiNrAj3Qh/Ij3lnPUMDUivJzJXROHI0O5FhoJ40xVBQh06m+tIw7wiue+N3i1Q/FLQb gthKld/GeKPrKPJ+TmxXNn3SPPWMI2Y5TcehhzmrQyE5wUtJx3sziAsygAE= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190402_032203_301824_500B6035 X-CRM114-Status: GOOD ( 10.55 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [217.72.192.75 listed in list.dnswl.org] Subject: [OpenWrt-Devel] [PATCH v2] ath79: Utilize tplink-safeloader definition X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Currently, tplink-safeloader definition is only used as base for another common definition, while multiple devices just repeat the same relevant parameters in their definitions. This patch adjusts tplink-safeloader so it can be actually used for some targets in generic-tp-link.mk. The only functional (i.e. non-cosmetic) change introduced with this patch is the consistent use of "check-size $$$$(IMAGE_SIZE)". Run-tested on TP-Link CPE210 v2. Tested-by: Adrian Schmutzler Signed-off-by: Adrian Schmutzler --- Changes in v2: - Include CPE210 v2/v3 - Rebased - Improved commit description/justification --- target/linux/ath79/image/common-tp-link.mk | 6 ++++-- target/linux/ath79/image/generic-tp-link.mk | 20 +++----------------- 2 files changed, 7 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..9054284114 100644 --- a/target/linux/ath79/image/common-tp-link.mk +++ b/target/linux/ath79/image/common-tp-link.mk @@ -99,12 +99,14 @@ 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 define Device/tplink-safeloader-uimage $(Device/tplink-safeloader) KERNEL := kernel-bin | append-dtb | lzma | uImageArcher lzma + IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata 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