From patchwork Sat Jan 23 12:24:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1430707 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=vB0W/RFc; 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 4DNFkP1dWnz9sCq for ; Sat, 23 Jan 2021 23:27:09 +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=1zZujgrqkWR70qqhEzZSnUSTb+4a+3T7e8Ux4TIk5Zo=; b=vB0W/RFcVs/XBWmCkApv4J9Bsh ++srvBM1M/gQxeCyzm7jtK21u4iqkahm98wwd/5elEefdWZyxxZuShJA8C1cX2npze+4pzV8e4V0V 6Qh5m1/X4bbGvqO2SEYkQzwWI5yLgm9Ef8huMUPXE4x+xjO/XptgSKX9Jn8gRUIlq+7Wbj9fCfoFp rNjEZyPzbNWtgmxHmJJ2ZxU9s2tGSoaFhF38+sQ+vc3kcIn997HL1vPEnvasFLR/YsaGGDbY6eYvm CYIWHImp3znTgbJRuDANJRLxkspcxGeGbopzajRoMeafTfD7S76O5hU9vdjerDH6k2yPhqYx/AynD EDIKpgRw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l3Hyl-00006F-Qn; Sat, 23 Jan 2021 12:25:23 +0000 Received: from mout.kundenserver.de ([217.72.192.74]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l3Hyi-00005O-PP for openwrt-devel@lists.openwrt.org; Sat, 23 Jan 2021 12:25:22 +0000 Received: from buildfff.adridolf.com ([178.26.242.49]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M2fDl-1l0ort0rwl-0049fz; Sat, 23 Jan 2021 13:25:14 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 1/2] bcm4908: sort and wrap build recipes Date: Sat, 23 Jan 2021 13:24:28 +0100 Message-Id: <20210123122429.52929-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:KQQGiOiqcqeuDtsqejJl7BTh/WoScUNUVcYiATeorT/f1PTvYaA nfUGgUPH0JqHCxRTd2EwvKRkjT3ZR8KE5cDOXOO35s1+pIBB2clO2ZJUnsrWm+wIlNSVaeO ZPfXEFWi2OGVXT0UMLnCrPaGCGaNAaOyDLLhu4gsmETeDFFN1Yn+Qgqd7CT1Oui7iNXg4jD PuP9PGs4voHN6GS4eFyMg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:jeUgWBXvHIE=:Sr6Yrrxdmr0Eh8jSXV+sge 1AExW0rpYYaX6Ft+nz10uSIfKuu84y23rgo6R//0yUKddyVz8EBjfw18qSJ10ul/LBLFbb7tT v9cvwaLPyu4luDEF9UwSrvOLbIAjqTjBes+NKducW87/U5+WROwMaSFw4lltkRUWHBnkVja6Q 8N7yFj5oYtS2pMkaUKz9OPGf/7jmiKv8IlhrZOztdpCRNA3KyjbZXEHge1wxcHJT4oFBDK8Pa 43f6lBDFQ+/0u+916yHy3g8JHYRS4LvmppgsDyJOuGnT1dcYDGBcqWJwLQO+LSHWUi1COxr+C puLk3Au+JOOU1N/KCa35dsyCgcRzTB5QSe1ja8XJnVnJ6sayY82/W0eJbB2ibJgxSe6Rn5QYE dBjOzjRkStRv0g1GWtKFVm2nw/r9PSRp6Smwe2l2k6X3R/5hfgfZL5jQdavcpYCK8pqX0u2kD IOKQUkNh5w== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210123_072521_057668_F45CD66E X-CRM114-Status: UNSURE ( 8.36 ) 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 [217.72.192.74 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.74 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 sorts the Build recipes alphabetically, wraps some long lines and moves the DEVICE_VARS to the top like common on several other targets. Cc: Rafał Miłecki Signed-off-by: Adrian Schmutzler --- Changes in v2: - new patch --- target/linux/bcm4908/image/Makefile | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/target/linux/bcm4908/image/Makefile b/target/linux/bcm4908/image/Makefile index b744839e5b..8a40a1e6a9 100644 --- a/target/linux/bcm4908/image/Makefile +++ b/target/linux/bcm4908/image/Makefile @@ -3,14 +3,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk -define Build/bcm4908lzma - $(STAGING_DIR_HOST)/bin/lzma e -lc1 -lp2 -pb2 -d22 $@ $@.new - mv $@.new $@ -endef +DEVICE_VARS += ASUS_PRODUCTID ASUS_BUILD_NO ASUS_FW_REV ASUS_EXT_NO -define Build/bcm4908kernel - $(STAGING_DIR_HOST)/bin/bcm4908kernel -i $@ -o $@.new - mv $@.new $@ +define Build/bcm4908asus + $(STAGING_DIR_HOST)/bin/bcm4908asus create -i $@ \ + -p $(ASUS_PRODUCTID) -b $(ASUS_BUILD_NO) -f $(ASUS_FW_REV) \ + -e $(ASUS_EXT_NO) endef define Build/bcm4908img @@ -22,16 +20,22 @@ define Build/bcm4908img cp $(KDIR)/bcm63xx-cfe/$(subst _,$(comma),$(DEVICE_NAME))/cferam.000 $@-bootfs/ cp $(IMAGE_KERNEL) $@-bootfs/vmlinux.lz - $(STAGING_DIR_HOST)/bin/mkfs.jffs2 --pad --little-endian --squash-uids -v -e 128KiB -o $@-bootfs.jffs2 -d $@-bootfs -m none -n - $(STAGING_DIR_HOST)/bin/bcm4908img create $@.new -f $@-bootfs.jffs2 -a 0x20000 -f $@ + $(STAGING_DIR_HOST)/bin/mkfs.jffs2 --pad --little-endian --squash-uids \ + -v -e 128KiB -o $@-bootfs.jffs2 -d $@-bootfs -m none -n + $(STAGING_DIR_HOST)/bin/bcm4908img create $@.new -f $@-bootfs.jffs2 \ + -a 0x20000 -f $@ mv $@.new $@ endef -define Build/bcm4908asus - $(STAGING_DIR_HOST)/bin/bcm4908asus create -i $@ -p $(ASUS_PRODUCTID) -b $(ASUS_BUILD_NO) -f $(ASUS_FW_REV) -e $(ASUS_EXT_NO) +define Build/bcm4908kernel + $(STAGING_DIR_HOST)/bin/bcm4908kernel -i $@ -o $@.new + mv $@.new $@ endef -DEVICE_VARS += ASUS_PRODUCTID ASUS_BUILD_NO ASUS_FW_REV ASUS_EXT_NO +define Build/bcm4908lzma + $(STAGING_DIR_HOST)/bin/lzma e -lc1 -lp2 -pb2 -d22 $@ $@.new + mv $@.new $@ +endef define Device/Default KERNEL := kernel-bin | bcm4908lzma | bcm4908kernel From patchwork Sat Jan 23 12:24:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1430708 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=KSl0BjtR; 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 4DNFkP5nvcz9sT6 for ; Sat, 23 Jan 2021 23:27:09 +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:References:In-Reply-To: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:List-Owner; bh=Lgrd0z+ivq3ATev7oJw2MDEzxpnOoeNc4YMGHBqfOV0=; b=KSl0BjtRmI8RSGQd9iLQ9EXnW FmXKqHv2mnhw1xgD+rasO5zV7q0wvj8hmGIjvWLa1WW1h5oykR0WFk0Qgxe5i3QQBy/QfAjYLnU53 7x2Akvu/I2wN5paGrouRVNdWhR1kis9CZttnSWnGmgvgF+wH5k6sgGml3ouTH5WFIFqf1URF2We+w nKuUvdtzwzJaw+7++sOGcXdSmBRLPeFPDt9MqJlg5KA21Mw2vDuBr2hBRfbh4FEYyds+Nuq4GfDUB E2WhO1hMvWwp9n5PMv4ycBcNEKUKAyW0J5bGPKZHdAFHHNle/SYSg1G6VJq267AeutikcMdH1d2My 0ZsHU2K1g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l3Hyn-00006T-2D; Sat, 23 Jan 2021 12:25:25 +0000 Received: from mout.kundenserver.de ([217.72.192.73]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l3Hyj-00005P-KJ for openwrt-devel@lists.openwrt.org; Sat, 23 Jan 2021 12:25:22 +0000 Received: from buildfff.adridolf.com ([178.26.242.49]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MfYHW-1leoaY1TD6-00fwfg; Sat, 23 Jan 2021 13:25:14 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 2/2] bcm4908: automatically set DEVICE_DTS from device name Date: Sat, 23 Jan 2021 13:24:29 +0100 Message-Id: <20210123122429.52929-2-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210123122429.52929-1-freifunk@adrianschmutzler.de> References: <20210123122429.52929-1-freifunk@adrianschmutzler.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:3sq9McyPUa2R6q24NsjjnQ6UjTvNXYimrAF96cmP+GwPlST7b42 cQiPBybw4PEQY+72h9CvhU24nI8f2KMGoc4EdA3i2wkeH1HwRWdMaM/+1739AutrwUs68L2 KNfjsfTo2P7iEEXErMVsFSGoy/t0b1qKFulZKAyJE90WfMS5+8k8wZjMb5GdwR15HV7Evuk +VEuUFzH3roiPk7v5XzxA== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:iZTKo0CI4+c=:SmywvKNDY8w2RobfAurjZD 720gbtKf0h9EZnR1aHmDwGJlqPIzpv80LiobzGZC3WNnLWZ0udfzkP4kfSKBqr5gPMWTn9y2u fPK9n5YLsRuhqWUOO+AFKVwh14LW2+0oISUZFsQDL+XTB5K+GiwcrbAMtBb3BhXD5B3Qm6GI1 BvdXZwn/eEXoIcgmose/4pmX3LHhr0gIVFwfvdQyZHqNbtkufsMA2DWHXAaguGDZ7rFujMlD2 FhkoBxB440udRqhZttZOd+00Nd1xD4AhlPIBob3Nte/8vaznX6PvWgEjJM1HG6A9t8jEJtFDb PiuWwBH1mR1fKhqTyoToLKUAWuCuIwwR7aQK+gvxl16KCmZrUvjx3oSXY1JPx9eVy/+0txCsh /27d75jKYapVkELa2jKdnh8jOpEDWguFFcgPPhPooIfOzeEmSWTHuTMEflBfuH+Mr1/WvdEte Lug0zL5wHg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210123_072521_866306_CC07FE1B X-CRM114-Status: UNSURE ( 9.54 ) 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 [217.72.192.73 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [217.72.192.73 listed in wl.mailspike.net] 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 --- Changes in v2: - rebase --- 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 8a40a1e6a9..559f60faf1 100644 --- a/target/linux/bcm4908/image/Makefile +++ b/target/linux/bcm4908/image/Makefile @@ -37,6 +37,8 @@ define Build/bcm4908lzma 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) @@ -44,15 +46,16 @@ 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 IMAGE/bin := append-ubi | bcm4908img | bcm4908asus ASUS_PRODUCTID := GT-AC5300 @@ -63,9 +66,9 @@ 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 IMAGE/bin := append-ubi | bcm4908img endef