From patchwork Wed Nov 4 09:21:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sander Vanheule X-Patchwork-Id: 1393742 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=FLgu8Ow1; 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=kVGJrxQb; 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 4CR1Rm180lz9sVK for ; Wed, 4 Nov 2020 20:23:48 +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=qtyLL0rbGcUYxGtMw1ySwkv2G46zbhaPNZluzvQ60d0=; b=FLgu8Ow1T/8bbL6QKm9v/AxML IEeJAoht6BOCrY6l1nHMwSJ7vydsk53eiHjcmLAqgu1l/FuhLNeEirSd6S6MT1+rKc/TTFyJ6cwy/ 8CaNHK8ylcJftkLUgIKaMN0A+zjUhqfr2125VqCKwLnMf319XsvavxE3HtCp7zdJpiDH0gWHfhsdJ WGeO2QzLs80WFnxX0iVuzuR6yQTyzYgKL+GA+gZgHne8kllbIj/BXtgC4urZYpInDLh9zYRAkx92V 1NGIeC90ZE5dZlN6hfvpx/dNbUYB6PKJMcu+GPiewI+4KFXDjWerZOy68q9opzGSTQ26TNLhTQGEI JsPu96dtw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaEzC-0007jh-9E; Wed, 04 Nov 2020 09:21:46 +0000 Received: from polaris.svanheule.net ([2a00:c98:2060:a004:1::200]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kaEz7-0007hE-M3 for openwrt-devel@lists.openwrt.org; Wed, 04 Nov 2020 09:21:43 +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 6DBD619A1AE; Wed, 4 Nov 2020 10:21:40 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=svanheule.net; s=mail1707; t=1604481700; 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=I+lOlNdcQffS5mNlAcKVXJqrRCJPiF1j49RSWxH74p8=; b=kVGJrxQbZ4rALakMgK7zsXo71OEg1HqM+ZIBaRfOe9FJ+XsdRWoMGpy5vx6UWLTZ9gKjtP EV2lwu0JouCYf67CDVCOYVG/MEtjHsPLOMjUXiDQgkhWPv0paUAeTeXdZgIeuYyKd7YPbl A0aorOs37qNa2Y/RiHarhRMHlG58XnHJTIIX/LVrQDBgPlwm2JZ+bOuulihdpi5bU3UZE+ ZPbqAEdxL+kr37Zbtu7rSHU9GpgszgqHl2LGR0iHGXHWQXN9ftD8lpQ34gAQ1ZwEf8H8UQ 2/GzbuvDnsPl+gGX6Xm0mQ1Bau1UG5vSo/ZcXe6dV+aD+7kc8n+xIpXNEPUWvQ== From: Sander Vanheule To: openwrt-devel@lists.openwrt.org Subject: [PATCH 2/5] ramips: mt7621: drop custom uImage function Date: Wed, 4 Nov 2020 10:21:14 +0100 Message-Id: <20201104092117.86343-3-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_042141_965580_4DFE5990 X-CRM114-Status: GOOD ( 11.94 ) 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 [2a00:c98:2060:a004:1:0:0:200 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 Use the mkimage argument overrides provided by uImage to implement the customisations required for the initramfs, instead of the near-identical custom function. Signed-off-by: Sander Vanheule --- Build tested for iodata_wn1167gr2, where uImage lzma -M 0x434f4d42 -n '3.10(XBC.1)b10' ... results in the following call made to mkimage: mkimage -A mips -O linux -T kernel -C lzma -a 0x80001000 -e 0x80001000 -n 'MIPS OpenWrt Linux-5.4.74' -M 0x434f4d42 -n '3.10(XBC.1)b10' -d initramfs-kernel.bin initramfs-kernel.bin.new target/linux/ramips/image/mt7621.mk | 31 ++++++++++------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index bb7e5a0d48..9b6c7d2311 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -7,21 +7,7 @@ include ./common-tp-link.mk DEFAULT_SOC := mt7621 KERNEL_DTB += -d21 -DEVICE_VARS += UIMAGE_MAGIC ELECOM_HWNAME LINKSYS_HWNAME - -# The OEM webinterface expects an kernel with initramfs which has the uImage -# header field ih_name. -# We don't want to set the header name field for the kernel include in the -# sysupgrade image as well, as this image shouldn't be accepted by the OEM -# webinterface. It will soft-brick the board. -define Build/custom-initramfs-uimage - mkimage -A $(LINUX_KARCH) \ - -O linux -T kernel \ - -C lzma -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 += ELECOM_HWNAME LINKSYS_HWNAME define Build/elecom-wrc-gs-factory $(eval product=$(word 1,$(1))) @@ -531,32 +517,35 @@ define Device/iodata_nand IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef +# The OEM webinterface expects an kernel with initramfs which has the uImage +# header field ih_name. +# We don't want to set the header name field for the kernel include in the +# sysupgrade image as well, as this image shouldn't be accepted by the OEM +# webinterface. It will soft-brick the board. + define Device/iodata_wn-ax1167gr2 $(Device/iodata_nand) - UIMAGE_MAGIC := 0x434f4d42 DEVICE_MODEL := WN-AX1167GR2 KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \ - custom-initramfs-uimage 3.10(XBC.1)b10 | iodata-mstc-header + uImage lzma -M 0x434f4d42 -n '3.10(XBC.1)b10' | iodata-mstc-header DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware endef TARGET_DEVICES += iodata_wn-ax1167gr2 define Device/iodata_wn-ax2033gr $(Device/iodata_nand) - UIMAGE_MAGIC := 0x434f4d42 DEVICE_MODEL := WN-AX2033GR KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \ - custom-initramfs-uimage 3.10(VST.1)C10 | iodata-mstc-header + uImage lzma -M 0x434f4d42 -n '3.10(VST.1)C10' | iodata-mstc-header DEVICE_PACKAGES := kmod-mt7603 kmod-mt7615e kmod-mt7615-firmware endef TARGET_DEVICES += iodata_wn-ax2033gr define Device/iodata_wn-dx1167r $(Device/iodata_nand) - UIMAGE_MAGIC := 0x434f4d43 DEVICE_MODEL := WN-DX1167R KERNEL_INITRAMFS := $(KERNEL_DTB) | loader-kernel | lzma | \ - custom-initramfs-uimage 3.10(XIK.1)b10 | iodata-mstc-header + uImage lzma -M 0x434f4d43 -n '3.10(XIK.1)b10' | iodata-mstc-header DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware endef TARGET_DEVICES += iodata_wn-dx1167r