From patchwork Tue Jan 19 18:53:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1428806 X-Patchwork-Delegate: freifunk@adrianschmutzler.de 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; 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=l7TuRGdG; 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 4DKyYF444wz9sBy for ; Wed, 20 Jan 2021 05:56:17 +1100 (AEDT) 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:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject: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=y6uDyrfwNCYG4QTeTsC6zEC2FSatbjyKrnRGGclmqj8=; b=l7TuRGdGfNIJkucD+Fw+wAB/Mo DPDdu1U9yFFwC72QnMEQN/6z2tNEviVSa/2QANvgK8P/acGnC8eVROutn7PxMX7oIIp+w8Q3jD7O+ eGNiHPIzDjUseFKwP7lGCNkSoKaRFHXpfyNVXDkzOItoyuv4eJPSX3j28b4vDLUZYJ7c4QJ+eUBCU JH1Ppd49Ph5crZUbwxRYkLfFeyy9TimfWOnrrD8fbQIBrOzuKx0pHXUlS1JUE3nLeail6icSuh+7m C9A6snVFrJvtgQ1WCC+tiH8H3+taSKiV85YQW/9Xt4XjbkJPqkbwUg3hbgHpeVfjhmDfH6wr2aJ8d 50+FkUog==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1w8i-0008CL-RD; Tue, 19 Jan 2021 18:54:04 +0000 Received: from mout.kundenserver.de ([212.227.126.133]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l1w8f-0008Bi-SB for openwrt-devel@lists.openwrt.org; Tue, 19 Jan 2021 18:54:02 +0000 Received: from buildfff.adridolf.com ([178.26.242.49]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Md76B-1laRfy1fBz-00aFjr; Tue, 19 Jan 2021 19:53:57 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] bcm4908: automatically set DEVICE_DTS from device name Date: Tue, 19 Jan 2021 19:53:07 +0100 Message-Id: <20210119185307.58048-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:O5CgO3UKyXWHcRKNIBwXD62L6Npo2IQxWy0Ak1nb7R4ayI6sCva 5r7dYm7r4t/WVd8D6H0iDqG8DzXIRK6uf7Ck4f+PW+1IFF6wA0e2dDyZVbThMafvr0GNNmq YjBUeOOaazjwvjIozPPWW1fkDfIu3ka403yYUzzuD+sjchb1G8x71MEkepjHl8VnPft9qvh 9j6amd6P3okp6Ufn7LrTA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:x4YzwIBT/xU=:Dl1IUYjuHRis1DQdTn5Bil hb7A87f3iPkO5VT9aXUrgGBaXz9mYgFulO2ZPUzZ7/kyACueL3EMDAEHNKTMm70y3+LXPB1m6 EtYAz7YJxC3BE516C61K40hFWyPl2pBLGP590Vn/Oc4HtFPQEc6TVFanD0J+Py2PTIQTU0TWe SD4z8Lfr1e15Y5YqwyNqBHSJb3Y0v6mdW/3iN0vrfd4OjKc/+C0hMyNYe0glwqekCzvS4N5DR MN65gm5WBTXSJIgmGXI6ECH3OEYfAzK6diNjkhgFa4iY43Md/Y2MIB+tRpnHwQiM6HLvkfYG2 fJLIQQMwjVKjzpf91XvzomVI384qvIz7NqzrarRpXWRhgJ/hq2MeEO5c/2QOmOyXzLTVmBoyy BvWyDsbrrfI9KbzhLKfHhvxoUnjhUrjuBB4wFZ483biufsTaveH8+29o761pXaOzaLjY1b13O qOWQMd0K5A== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210119_135402_130594_36DC4429 X-CRM114-Status: UNSURE ( 9.80 ) 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.133 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.133 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: , Cc: =?utf-8?b?UmFmYcWCIE1pxYJlY2tp?= Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This sets the DTS paths automatically based on their device definition name. Devices where this is not possible may still be served by simply overwriting DEVICE_DTS in their respective definition. Cc: Rafał Miłecki Signed-off-by: Adrian Schmutzler --- Of course, any paths which are not static may be moved from DTS_DIR to the DEVICE_DTS line. (Note that this will break anything that would depend on DTS_DIR _without_ DEVICE_DTS following it. (Didn't spot anything yet.)) --- target/linux/bcm4908/image/Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/target/linux/bcm4908/image/Makefile b/target/linux/bcm4908/image/Makefile index f5db38915d..bf30c5c867 100644 --- a/target/linux/bcm4908/image/Makefile +++ b/target/linux/bcm4908/image/Makefile @@ -13,6 +13,8 @@ define Build/bcm4908kernel mv $@.new $@ endef +DTS_DIR := $(DTS_DIR)/broadcom/bcm4908 + define Device/Default KERNEL := kernel-bin | bcm4908lzma | bcm4908kernel KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) @@ -20,23 +22,24 @@ define Device/Default KERNEL_INITRAMFS := kernel-bin | bcm4908lzma | bcm4908kernel FILESYSTEMS := squashfs KERNEL_NAME := Image + DEVICE_DTS = $$(SOC)-$(subst _,-,$(1)) IMAGE_NAME = $$(IMAGE_PREFIX)-$$(1).$$(2) BLOCKSIZE := 128k PAGESIZE := 2048 endef define Device/asus_gt-ac5300 + SOC := bcm4908 DEVICE_VENDOR := Asus DEVICE_MODEL := GT-AC5300 - DEVICE_DTS := broadcom/bcm4908/bcm4908-asus-gt-ac5300 IMAGES := bin endef TARGET_DEVICES += asus_gt-ac5300 define Device/netgear_r8000p + SOC := bcm4906 DEVICE_VENDOR := Netgear DEVICE_MODEL := R8000P - DEVICE_DTS := broadcom/bcm4908/bcm4906-netgear-r8000p IMAGES := bin endef TARGET_DEVICES += netgear_r8000p