From patchwork Tue Sep 29 16:20:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sander Vanheule X-Patchwork-Id: 1373510 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=svanheule.net 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=FSRoptXy; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=svanheule.net header.i=@svanheule.net header.a=rsa-sha256 header.s=mail1707 header.b=6oIJO72u; 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 4C14Rf2Pkzz9sSJ for ; Wed, 30 Sep 2020 02:22:35 +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: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=CrFOFpORa35sjwkEtGMrLZChS6vemmlTmcDHOs2yrQ8=; b=FSRoptXyjFIV+ZRmdb/lTfCNtR 2Plr/VTGsPE1KxUiNwVsi+ii2VckEN5HGlkyjj68Fn3kgskIGo6gsEAxnGnBXKIDQEpsjKjy7bfjB VtD9MRVstzihpFjHoaRNSm1q9rPFau6HnyhfnyGV8Yyp0PFobYa2PLugY3LZs36HpX9fwyzxGbpY8 napFyotMw2ThdkfZlB8n4+1yBpFHBiUVCcs5npLqn1ODkFhnsp4xGbrTvTf7j9VpNPLP4gWYKlTIk AAlr1aLSMp8g9+gsevs/3l3Kmr5hmwWAmF3AP9ZKuEGk3vwePoCY+0iJvb3umD+sZ/3fQb3kOsuL8 xsZkQkaQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNIMf-0000iI-8P; Tue, 29 Sep 2020 16:20:29 +0000 Received: from polaris.svanheule.net ([84.16.241.116]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNIMc-0000hw-Ay for openwrt-devel@lists.openwrt.org; Tue, 29 Sep 2020 16:20:27 +0000 Received: from terra.local.svanheule.net (unknown [IPv6:2a02:a03f:eafe:ac01:707f:74bc:4a06:d77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: sander@svanheule.net) by polaris.svanheule.net (Postfix) with ESMTPSA id 2482918741F; Tue, 29 Sep 2020 18:20:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=svanheule.net; s=mail1707; t=1601396420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=9Dlk/6BLYJNAbIj6rJdgDtqW8TeeW1h1MaAIG11HJ4Y=; b=6oIJO72u/LI10QZbpoLG/FXjxua82LWikVvwKK3V2IZWtOZNvpq39I7JlEg0HhyW8dhq1u epF1FN/67w1yJdTN7r8AKtG+FyNL8WzOtoqt8DJRdVk2y0AB0oiL0TXNs1lkhzv6Kidwey TOE+9Lx9nj9QvkX2lFThiqIlmVGOzOA98FGeTvevms+bAU1jbnZvY0hsfoirNd5vmolLmO VgPtq4O5Vhdp5I3kxiXMib1QxeS5H25vQyrGtZVAVABD9V02ETmXrx0RiAEjf7tq9d581s 1uiwWJ5qJxxIX3zRN8iQhx9KFDfLfibhdggclAluNyjR1oaVq1lQjCabekzGmg== From: Sander Vanheule To: openwrt-devel@lists.openwrt.org Subject: [PATCH] rtl838x: clean up build instructions Date: Tue, 29 Sep 2020 18:20:06 +0200 Message-Id: <20200929162006.236206-1-sander@svanheule.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200929_122026_523943_3840F21B X-CRM114-Status: GOOD ( 10.50 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [84.16.241.116 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 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: Sander Vanheule Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The Device/Default recipe was defined, but never used. Move definitions that are not device-specific to Device/Default, and use it for allnet_all-sg8208m. This should make it more straightforward to add new devices. The modified uImage recipe can also be simplified, similar to how ath79/common-netgear.mk does it. Signed-off-by: Sander Vanheule --- target/linux/rtl838x/image/Makefile | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/target/linux/rtl838x/image/Makefile b/target/linux/rtl838x/image/Makefile index eef1fe0a33..0174e47449 100644 --- a/target/linux/rtl838x/image/Makefile +++ b/target/linux/rtl838x/image/Makefile @@ -7,36 +7,32 @@ include $(INCLUDE_DIR)/image.mk KERNEL_LOADADDR = 0x80000000 KERNEL_ENTRY = 0x80000400 -define Build/custom-uimage - mkimage -A $(LINUX_KARCH) \ - -O linux -T kernel \ - -C gzip -a $(KERNEL_LOADADDR) $(if $(UIMAGE_MAGIC),-M $(UIMAGE_MAGIC),) \ - -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ - -n '$(1)' -d $@ $@.new - mv $@.new $@ -endef +DEVICE_VARS += UIMAGE_MAGIC +define Build/realtek-uImage + $(call Build/uImage,$(1) $(if $(UIMAGE_MAGIC),-M $(UIMAGE_MAGIC),)) +endef define Device/Default PROFILES = Default - KERNEL := kernel-bin | append-dtb | gzip | uImage gzip - KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | uImage gzip + KERNEL := kernel-bin | append-dtb | gzip | realtek-uImage gzip + KERNEL_INITRAMFS := $$(KERNEL) DEVICE_DTS_DIR := ../dts DEVICE_DTS = $$(SOC)_$(1) SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) IMAGES := sysupgrade.bin - IMAGE/sysupgrade.bin := append-kernel | pad-to 64k | append-rootfs | pad-rootfs | \ - append-metadata | check-size + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | \ + append-metadata | check-size endef define Device/allnet_all-sg8208m + $(Device/Default) SOC := rtl8382 IMAGE_SIZE := 7168k DEVICE_VENDOR := ALLNET DEVICE_MODEL := ALL-SG8208M UIMAGE_MAGIC := 0x00000006 - KERNEL := kernel-bin | append-dtb | gzip | custom-uimage 2.2.2.0 - KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | custom-uimage 2.2.2.0 + UIMAGE_NAME := 2.2.2.0 DEVICE_PACKAGES := ip-full ip-bridge kmod-gpio-button-hotplug tc endef TARGET_DEVICES += allnet_all-sg8208m From patchwork Wed Nov 4 09:21:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sander Vanheule X-Patchwork-Id: 1393740 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=svanheule.net 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=XAjrp6sQ; dkim=fail reason="signature verification failed" (2048-bit key; secure) header.d=svanheule.net header.i=@svanheule.net header.a=rsa-sha256 header.s=mail1707 header.b=dji0bx+A; 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 4CR1Rl4GPLz9sT6 for ; Wed, 4 Nov 2020 20:23:46 +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=xTT3h3nZwMz4I6JD24MvDxBNHrxzFPzsmBskmYQzHF0=; b=XAjrp6sQKz6SOpbV2yrXwpZSs jN0IKtvcuHJTHMYWbMXUh2WECed3egfqMNZ3vM7eVT1unPxR8mh/scZUyO5x39oSBqUngoSNgjKem kMMT69PnoXBxm//kUSahnQpqVpE/QrIZo35g9pTg38ZBdldC/M4kuycgtdoDLHXjvkcPA4voy8RTI zUBTYRtnP+QoyPpqp7hYaOhut4YOIzm77j1d+QvSgKgBEnMOj/ndXrqRrdBAurCr/d4AjadQjNNgK Kq1ZQqz4uLi4X30cunRonH+Nx0KJvr8AmHcbrKD6yJzeQmYqjWYeWl4HQ1gIfcITILa+mCO6G7pOl tpryVKONw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaEzI-0007la-Sf; Wed, 04 Nov 2020 09:21:53 +0000 Received: from polaris.svanheule.net ([84.16.241.116]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaEz8-0007hs-SN for openwrt-devel@lists.openwrt.org; Wed, 04 Nov 2020 09:21:44 +0000 Received: from terra.local.svanheule.net (unknown [IPv6:2a02:a03f:eafe:ac01:8e4a:2947:44a5:39cc]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: sander@svanheule.net) by polaris.svanheule.net (Postfix) with ESMTPSA id 36EE919A1B2; Wed, 4 Nov 2020 10:21:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=svanheule.net; s=mail1707; t=1604481701; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xgaOCKqvucBxiYdjoq8ZPVqvooNroadlpE1lU3q7Yok=; b=dji0bx+AJKnzRGaAs4x8zDaUins7lQz3mBKomhxc+IalncTUZy+OTiLs1zeHkieqGhGNO9 eNZ8sIxtoRP53CI2RvSVt4KefeDBMgCHYEDXYOwvBz/H2Ij7jHcDjSe8LyQz1JqTe6oXPM vM3bVcrscsB62E2s6ozL2BcfoIKok4QBZtIke77bR7WB7lXMy+HoQ0X7Fsu7uSs1pxVegL 5etrBrZgxbHswMklO0vv4Ts2Rq/ufpd6DS6HEZBj4QTNn6N+efChNPA0wpUfyzA3TjnlJg 13QfO96dgNZSy3C7qsTuPqUP2ts0+gfHR3UbsjU7DVmVUAWAj2x1Zh9OtJhODg== From: Sander Vanheule To: openwrt-devel@lists.openwrt.org Subject: [PATCH 5/5] rtl83xx: drop custom mkimage build function Date: Wed, 4 Nov 2020 10:21:17 +0100 Message-Id: <20201104092117.86343-6-sander@svanheule.net> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201104092117.86343-1-sander@svanheule.net> References: <20200929162006.236206-1-sander@svanheule.net> <20201104092117.86343-1-sander@svanheule.net> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201104_042143_546176_25C1B071 X-CRM114-Status: GOOD ( 11.01 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [84.16.241.116 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 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: Sander Vanheule Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org UIMAGE_MAGIC is now supported by Build/uImage, in addition to UIMAGE_NAME. This removes the need for a custom mkimage call, so let's remove it. Signed-off-by: Sander Vanheule --- target/linux/rtl838x/image/Makefile | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/target/linux/rtl838x/image/Makefile b/target/linux/rtl838x/image/Makefile index f490fa7ffe..6ec80218cf 100644 --- a/target/linux/rtl838x/image/Makefile +++ b/target/linux/rtl838x/image/Makefile @@ -7,16 +7,6 @@ include $(INCLUDE_DIR)/image.mk KERNEL_LOADADDR = 0x80000000 KERNEL_ENTRY = 0x80000400 -define Build/custom-uimage - mkimage -A $(LINUX_KARCH) \ - -O linux -T kernel \ - -C gzip -a $(KERNEL_LOADADDR) $(if $(UIMAGE_MAGIC),-M $(UIMAGE_MAGIC),) \ - -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ - -n '$(1)' -d $@ $@.new - mv $@.new $@ -endef - - define Device/Default PROFILES = Default KERNEL := kernel-bin | append-dtb | gzip | uImage gzip @@ -35,8 +25,7 @@ define Device/allnet_all-sg8208m DEVICE_VENDOR := ALLNET DEVICE_MODEL := ALL-SG8208M UIMAGE_MAGIC := 0x00000006 - KERNEL := kernel-bin | append-dtb | gzip | custom-uimage 2.2.2.0 - KERNEL_INITRAMFS := kernel-bin | append-dtb | gzip | custom-uimage 2.2.2.0 + UIMAGE_NAME := 2.2.2.0 DEVICE_PACKAGES := ip-full ip-bridge kmod-gpio-button-hotplug tc endef TARGET_DEVICES += allnet_all-sg8208m