From patchwork Sun Aug 19 13:47:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuanhong Guo X-Patchwork-Id: 959321 X-Patchwork-Delegate: openwrt@kresin.me 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=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="u9k3hFec"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="uWwQ9h5F"; 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 41tdYZ4Y9Bz9s4Z for ; Sun, 19 Aug 2018 23:48:02 +1000 (AEST) 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:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:Message-Id: Date:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=7dOBzUfx8+zg68VKMckSLLfV9+RWJDBV/9RGB51zOIw=; b=u9k3hFecQp0P08 Y2vcgJnK5L8lmGKoLGg6oJRvkAd8tuHAqR2wkCXbOtmTYSwBh5xCZELCegTh8VsL7PXMucwWRG9lN 5ksORJQbmnzwfNd8hFoT3p0z5Q0+MgJy1w21VSh4FrRfdk0jqX52XkAGkie7cDlQiw273A7RiZGq8 BuX8pknkzbbTHL70Rgysy369n9Nx8NtKF6Yw+72Sq6GrhuEd41ZDqCNk30SWkPgqcdsUppMdVBqem /pr7Buq4LeIEiStr7NINqPYUBdYQhkkX5SwXfvF8D9JOkTIh4veGbsWwAGFTRilDMVVU7MEF1ECgB 6KdvAZJUDG+O9usxplYQ==; 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 1frO3P-00043G-3F; Sun, 19 Aug 2018 13:47:39 +0000 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1frO3L-00042Z-SM for openwrt-devel@lists.openwrt.org; Sun, 19 Aug 2018 13:47:37 +0000 Received: by mail-pg1-x531.google.com with SMTP id f14-v6so5521696pgv.13 for ; Sun, 19 Aug 2018 06:47:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=K6yXB1A2RWdgL/BIxjEwMBng3jE2RK3OHyu5qePBz/Y=; b=uWwQ9h5F/47jIeTw0pf3fy7LwwrX8b4vrKXD9xXqCTVBsNd0seruOfdk3rVaZLLFWE auUaXPyyXg+U+pbiZglp4SKmM6nrwMIVQUJVvVgIpZxn5yaYE7oLwylJh2wFrn5C/Z9p FHGU2Q9yIguQBPhhsF3/gssB94nIyrRigAu7QH8vXa37ANaTR1dMOWChKDmcqlN1T9Nl UQ1dMMhmb+hi3h4/d5+C898vGH6iSYfx4XD+Rx3knJo5ZVUHLhDMF++4OeD7xWgO73Pt iNMx3vCoLeApBywJM4cVTYtPpwN+1bSrD2FKIa2NppJl8llwCPMZAm0UN97JNXSO0FOd LBug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=K6yXB1A2RWdgL/BIxjEwMBng3jE2RK3OHyu5qePBz/Y=; b=uNnHg2cP+inYKdLn9TvGw0EFh9flD7osAXfEsSp8H8xwZFxON7EdYNAgofm09Dakvm TTrwG63GA1jYL9KGNfbV+6kysiw7th4q/topngElSSEojeGCa9ayBPXc1wCI41DQLMJM jW+CV1YQ5GeDRs5lFmpHhpgQxql/rh6cpxZQELOgYurl8akRcVCa+qjJ7lG2VI+CL7In U6WhgI4flPbrt1H0r3PmEDDUvTepxw4SusRkQLn0x8pQAImI8mIHZAe/DInJsb/pBmiJ YVl8wwyG0yoLRazy2ji1RLnCcp7FwAI2c12/eMpI9ZcGZftOK7NoD4VWiGHKZ1NainrS ykag== X-Gm-Message-State: AOUpUlEkEn9sNHZgCkyj6t2NlAxNNPiMjhqO7NMPVyvG3NJiG08qlEPo DtLsd5uePOr2nDIlskknJfrS4izAcFg= X-Google-Smtp-Source: AA+uWPwV2mTBDx2xvxPCYb1/3cRlkEMZHvRWrgOTD4j6yLjear51V2cJqGYWGg8D8tQUztepg1x9XQ== X-Received: by 2002:a65:62cd:: with SMTP id m13-v6mr39643961pgv.280.1534686444682; Sun, 19 Aug 2018 06:47:24 -0700 (PDT) Received: from GuoGuo-OMEN.lan ([107.151.139.128]) by smtp.gmail.com with ESMTPSA id s16-v6sm8571827pfm.114.2018.08.19.06.47.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 19 Aug 2018 06:47:24 -0700 (PDT) From: Chuanhong Guo To: openwrt-devel@lists.openwrt.org Date: Sun, 19 Aug 2018 21:47:06 +0800 Message-Id: <20180819134706.21788-1-gch981213@gmail.com> X-Mailer: git-send-email 2.17.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180819_064735_942099_5024EED1 X-CRM114-Status: UNSURE ( 9.95 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:531 listed in] [list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (gch981213[at]gmail.com) 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (gch981213[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCH] ath79: drop SUPPORTED_DEVICES for all TP-LINK routers 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: , Cc: Chuanhong Guo MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org These lines are coming from ar71xx to allow using sysupgrade to switch from ar71xx to ath79. But a sysupgrade with config preserved won't work since some of the config files are incompatible. This commit removed all SUPPORTED_DEVICES for TP-LINK routers. For those who want to use sysupgrade to switch target on TP-LINK router you could use the generated factory firmware instead. This works because: 1. ar71xx doesn't require a image metadata so using a firmware without OpenWrt metadata will skip fwtool checking. 2. The differences between factory and sysupgrade image is the metadata and the tail padding. 3. Using factory firmware for TP-LINK devices here automatically disallows preserving config files because sysupgrade.tar won't be appended after 0xdeadc0de jffs2 mark. 4. ar71xx still check the device model in TP-LINK firmware header so an invalid image won't pass sysupgrade checking. PISEN WMM003N is never supported by ar71xx, this commit also removed SUPPORTED_DEVICES for it because it's completely useless. Signed-off-by: Chuanhong Guo --- I personally don't like these SUPPORTED_DEVICES because it's used to create compatibility with a target that will finally be obsolete. These lines will be useless when ar71xx is replaced by ath79. They are also somehow misleading as we've seen many contributors adding a SUPPORTED_DEVICES line with a string that never exists in ar71xx. (I used "somehow" here because it's not misleading to me but I just saw these mistakes made by others.) Use factory firmware to do the sysupgrade from ar71xx to ath79 for TP-LINK routers will pass firmware checking in ar71xx and automatically gain the ability to prohibit config preserving so I think at least removing them for TP-LINK routers is reasonable. target/linux/ath79/image/generic-tp-link.mk | 7 ------- target/linux/ath79/image/generic.mk | 1 - target/linux/ath79/image/tiny-tp-link.mk | 9 --------- 3 files changed, 17 deletions(-) diff --git a/target/linux/ath79/image/generic-tp-link.mk b/target/linux/ath79/image/generic-tp-link.mk index 4c85099a1a..dceb2130f2 100644 --- a/target/linux/ath79/image/generic-tp-link.mk +++ b/target/linux/ath79/image/generic-tp-link.mk @@ -35,7 +35,6 @@ define Device/tplink_tl-wdr3600 DEVICE_TITLE := TP-LINK TL-WDR3600 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x36000001 - SUPPORTED_DEVICES += tl-wdr3600 endef TARGET_DEVICES += tplink_tl-wdr3600 @@ -45,7 +44,6 @@ define Device/tplink_tl-wdr4300 DEVICE_TITLE := TP-LINK TL-WDR4300 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x43000001 - SUPPORTED_DEVICES += tl-wdr4300 endef TARGET_DEVICES += tplink_tl-wdr4300 @@ -64,7 +62,6 @@ define Device/tplink_tl-wr1043nd-v1 DEVICE_TITLE := TP-LINK TL-WR1043N/ND v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x10430001 - SUPPORTED_DEVICES += tl-wr1043nd endef TARGET_DEVICES += tplink_tl-wr1043nd-v1 @@ -74,7 +71,6 @@ define Device/tplink_tl-wr1043nd-v2 DEVICE_TITLE := TP-LINK TL-WR1043N/ND v2 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x10430002 - SUPPORTED_DEVICES += tl-wr1043nd-v2 endef TARGET_DEVICES += tplink_tl-wr1043nd-v2 @@ -84,7 +80,6 @@ define Device/tplink_tl-wr1043nd-v3 DEVICE_TITLE := TP-LINK TL-WR1043N/ND v3 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x10430003 - SUPPORTED_DEVICES += tl-wr1043nd-v3 endef TARGET_DEVICES += tplink_tl-wr1043nd-v3 @@ -100,7 +95,6 @@ define Device/tplink_tl-wr1043nd-v4 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 @@ -113,6 +107,5 @@ define Device/tplink_tl-wr2543-v1 IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade -v 3.13.99 | \ append-metadata | check-size $$$$(IMAGE_SIZE) IMAGE/factory.bin := append-rootfs | mktplinkfw factory -v 3.13.99 - SUPPORTED_DEVICES += tl-wr2543-v1 endef TARGET_DEVICES += tplink_tl-wr2543-v1 diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index b3eaee48b7..f211db981a 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -185,7 +185,6 @@ define Device/pisen_wmm003n DEVICE_TITLE := Pisen WMM003N (Cloud Easy Power) DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-chipidea2 TPLINK_HWID := 0x07030101 - SUPPORTED_DEVICES += wmm003n IMAGES := sysupgrade.bin endef TARGET_DEVICES += pisen_wmm003n diff --git a/target/linux/ath79/image/tiny-tp-link.mk b/target/linux/ath79/image/tiny-tp-link.mk index 6ccc9d7dba..baa0005f9c 100644 --- a/target/linux/ath79/image/tiny-tp-link.mk +++ b/target/linux/ath79/image/tiny-tp-link.mk @@ -7,7 +7,6 @@ define Device/tplink_tl-mr10u DEVICE_TITLE := TP-Link TL-MR10U DEVICE_PACKAGES := kmod-usb-chipidea2 TPLINK_HWID := 0x00100101 - SUPPORTED_DEVICES += tl-mr10u endef TARGET_DEVICES += tplink_tl-mr10u @@ -17,7 +16,6 @@ define Device/tplink_tl-mr3020-v1 DEVICE_TITLE := TP-LINK TL-MR3020 v1 DEVICE_PACKAGES := kmod-usb-core kmod-usb-chipidea2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x30200001 - SUPPORTED_DEVICES += tl-mr3020-v1 endef TARGET_DEVICES += tplink_tl-mr3020-v1 @@ -27,7 +25,6 @@ define Device/tplink_tl-mr3040-v2 DEVICE_TITLE := TP-LINK TL-MR3040 v2 DEVICE_PACKAGES := kmod-usb-core kmod-usb-chipidea2 kmod-usb-ledtrig-usbport TPLINK_HWID := 0x30400002 - SUPPORTED_DEVICES += tl-mr3040-v2 endef TARGET_DEVICES += tplink_tl-mr3040-v2 @@ -37,7 +34,6 @@ define Device/tplink_tl-mr3220-v1 DEVICE_TITLE := TP-Link TL-MR3220 v1 TPLINK_HWID := 0x32200001 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport - SUPPORTED_DEVICES += tl-mr3220-v1 endef TARGET_DEVICES += tplink_tl-mr3220-v1 @@ -47,7 +43,6 @@ define Device/tplink_tl-mr3420-v1 DEVICE_TITLE := TP-Link TL-MR3420 v1 TPLINK_HWID := 0x34200001 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-usb-ledtrig-usbport - SUPPORTED_DEVICES += tl-mr3420-v1 endef TARGET_DEVICES += tplink_tl-mr3420-v1 @@ -57,7 +52,6 @@ define Device/tplink_tl-wr703n DEVICE_TITLE := TP-Link TL-WR703N DEVICE_PACKAGES := kmod-usb-chipidea2 TPLINK_HWID := 0x07030101 - SUPPORTED_DEVICES += tl-wr703n endef TARGET_DEVICES += tplink_tl-wr703n @@ -82,7 +76,6 @@ define Device/tplink_tl-wr740nd-v4 ATH_SOC := ar9331 DEVICE_TITLE := TP-LINK TL-WR740N/ND v4 TPLINK_HWID := 0x07400004 - SUPPORTED_DEVICES += tl-wr740n-v4 endef TARGET_DEVICES += tplink_tl-wr740nd-v4 @@ -99,7 +92,6 @@ define Device/tplink_tl-wr741nd-v4 ATH_SOC := ar9331 DEVICE_TITLE := TP-LINK TL-WR741N/ND v4 TPLINK_HWID := 0x07410004 - SUPPORTED_DEVICES += tl-wr741n-v4 endef TARGET_DEVICES += tplink_tl-wr741nd-v4 @@ -124,7 +116,6 @@ define Device/tplink_tl-wr841-v7 ATH_SOC := ar7241 DEVICE_TITLE := TP-LINK TL-WR841N/ND v7 TPLINK_HWID := 0x08410007 - SUPPORTED_DEVICES += tl-wr841-v7 endef TARGET_DEVICES += tplink_tl-wr841-v7