From patchwork Sat Jul 18 11:17:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1331537 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.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=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=Q1gn0t2D; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4B859b1wx4z9sRN for ; Sat, 18 Jul 2020 21:19:31 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Message-Id:Date:Subject: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=RGe7KcVcAjy72bU5ft4wNwV6D1k9zN1Vs9bVqT5MeW4=; b=Q1gn0t2Dtb4Q4a89hDit3nyiEk 8RL1/KYIecLxmUiqipckKbXl6vHE4XQrElCMzvH0TmGDSTzvC9d6esdSGwKNp0xmd9YJ6QAKKViHR lapYkY6riH9vp6DFmJiaFQ3YCg/BkkMI9rszJbfISUtWy+tWEYWF7WsCPo6adICTGG1QjLfY/g0Pp l2YhkMRbEovr3hQlAlytGyjS3FSR4tY7lmx+Izo79VYv81xGVGjBdYmk3gp1DYmDJZxBfCGSoFbDx PD/WziXq958gna9j4lKKVd9zkslwPc2PG/5TvY7ryRREuapYd/cwA4IZ+K7VaK7Plkj1S+LKPszXA KPFRge6w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwkr7-0006JM-7U; Sat, 18 Jul 2020 11:18:13 +0000 Received: from mout.kundenserver.de ([212.227.126.135]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwkr3-0006IU-I4 for openwrt-devel@lists.openwrt.org; Sat, 18 Jul 2020 11:18:10 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mzz6s-1kjTrS3wT0-00x5Rc for ; Sat, 18 Jul 2020 13:18:00 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] apm821xx: derive DEVICE_DTS from device name Date: Sat, 18 Jul 2020 13:17:15 +0200 Message-Id: <20200718111715.1373-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:8Xynsosw0kj/EmxQnpDWBGulct9Vvl7iVs4zne0ZMoUPvZp4EoS 7CNsvn6XcVsY1WTWLNdNZ9i6A0m6jgIzQM3pQOUQlcNnTVD2DIQTL+nsobkL4JE9pQwfoR/ i9izgZoYekLq5ibvQ+maOeh/CJ/Ua51Qgu1Tf7njyeYeqG0+mH8BnTUJh5DIpTddpZXzyvo EpnvCazXWNZ9I9SYwhlag== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:MAl8CxQkMsg=:J71hIVGdP2gwARpNVUSzCH YDjsTlj7roiCDm0V75A1jYlfbvxLVzh8YMlY1JGOC1SO0kunCKmxbxwR8JIS4nGYDNLH7GaF6 FkmrqNXZaAg0ocEm3vAbrJilMGyW5zme/pTtn8IycGNtd0uhltF/ossOCMp35NiWPh0ioVIjU /KUyuMAvpKYyE6TWq+Lx+TbqHs5tPBSRAWC/Rj1+pZ9Bv6a6SE5WZ6dMNPmDCc57hUGpK68kD RKpg7nk67TD1wpqLmqLkIy1nm/Vf5leXrGhpa5p+4LV0qfeADcpOQhYFpAJ5N9JPu5Dury1T+ b5+TA8hgBYFd6EdcQ7LfLXBD3xdSfwnK5jGg/j6uJHPNDa4W8wV03I+XUHm47siD5tBIGPTGl GBNpttrwqtGeZPP3vB93icev27ONQ5EKYxSoN8FF8IDSfTULgz+//I/pwd62bqBqcT8XfV8as 9DQvEcd+uOeTAhI6S6sbPXQ2G7MoQnyOMMkl1GBZglOzyGejsej4eKCZjhOKPTvxFpCUqmms4 ClOYUsAdbiueYFp/eErLpywADs0olOuopV43e2wYszmM5U3/3dhKfTyFHswQs8mi5BlbzeUs4 ONBhem8Tp3miHMeIDFo1omocm7lI/94hS4ISSUei9SNBVbe88zIV9iYtvnhkmWmxyxX5hmES1 Gtan3qhd0/B8lIojh9RxxkoGVbpeFTGnXwuzAzKhiO8tlOH2x77wJqfUiCA8m7fo2WE+uQMbS k+T5neHqaaRB2lroaPwYM6+yW3OaPRYRgSE5vuknRlR7mguzT1ttSW9xfI8GlMUCZHQzKnO0M kqf6uI+2L5K2xXOfbRDxPk3LWRGPSMtiDhnhe+K7t11fgMGxzy9e1n9XHYHghpgs51q8lnBOB Lu9h51S5ESHgHByXU7KQ== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200718_071809_827758_F76B4385 X-CRM114-Status: UNSURE ( 7.08 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.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 [212.227.126.135 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.135 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The DEVICE_DTS variable always matches the device definition name, just with "_" replaced by "-". Thus, create a DEVICE_DTS definition in Device/Default and drop all the individual statements. If necessary in the future, local DEVICE_DTS will still overwrite that default. Signed-off-by: Adrian Schmutzler --- target/linux/apm821xx/image/Makefile | 1 + target/linux/apm821xx/image/nand.mk | 5 ----- target/linux/apm821xx/image/sata.mk | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index 1b7c466a44..2331947e33 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -87,6 +87,7 @@ define Device/Default KERNEL_ENTRY := 0x00000000 KERNEL_LOADADDR := 0x00000000 DEVICE_DTS_DIR := ../dts + DEVICE_DTS = $(subst _,-,$(1)) SUPPORTED_DEVICES = $(subst _,$(comma),$(1)) endef diff --git a/target/linux/apm821xx/image/nand.mk b/target/linux/apm821xx/image/nand.mk index a7338e79a0..29a4be0189 100644 --- a/target/linux/apm821xx/image/nand.mk +++ b/target/linux/apm821xx/image/nand.mk @@ -29,7 +29,6 @@ define Device/meraki_mr24 DEVICE_MODEL := MR24 DEVICE_PACKAGES := kmod-spi-gpio -swconfig BOARD_NAME := mr24 - DEVICE_DTS := meraki-mr24 IMAGES := sysupgrade.bin DTB_SIZE := 64512 IMAGE_SIZE := 8191k @@ -47,7 +46,6 @@ define Device/meraki_mx60 DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-ledtrig-usbport kmod-usb-dwc2 \ kmod-usb-storage block-mount BOARD_NAME := mx60 - DEVICE_DTS := meraki-mx60 BLOCKSIZE := 63k IMAGES := sysupgrade.bin DTB_SIZE := 64512 @@ -80,14 +78,12 @@ endef define Device/netgear_wndap620 $(Device/netgear_wndap6x0) DEVICE_MODEL := WNDAP620 (Premium Wireless-N) - DEVICE_DTS := netgear-wndap620 endef TARGET_DEVICES += netgear_wndap620 define Device/netgear_wndap660 $(Device/netgear_wndap6x0) DEVICE_MODEL := WNDAP660 (Dual Radio Dual Band Wireless-N) - DEVICE_DTS := netgear-wndap660 endef TARGET_DEVICES += netgear_wndap660 @@ -100,7 +96,6 @@ define Device/netgear_wndr4700 kmod-nls-utf8 kmod-usb3 kmod-usb-dwc2 kmod-usb-storage \ partx-utils BOARD_NAME := wndr4700 - DEVICE_DTS := netgear-wndr4700 PAGESIZE := 2048 SUBPAGESIZE := 512 BLOCKSIZE := 128k diff --git a/target/linux/apm821xx/image/sata.mk b/target/linux/apm821xx/image/sata.mk index 444b2441f0..6fe8324b93 100644 --- a/target/linux/apm821xx/image/sata.mk +++ b/target/linux/apm821xx/image/sata.mk @@ -7,7 +7,6 @@ define Device/wd_mybooklive DEVICE_VENDOR := Western Digital DEVICE_MODEL := My Book Live Series (Single + Duo) DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-basic - DEVICE_DTS := wd-mybooklive SUPPORTED_DEVICES += mbl wd,mybooklive-duo BLOCKSIZE := 1k DTB_SIZE := 16384