From patchwork Wed Jun 24 18:03:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1316494 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; dmarc=fail (p=none dis=none) header.from=adrianschmutzler.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=P6dtufRF; 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 49sWR36X4Qz9sPF for ; Thu, 25 Jun 2020 04:10:39 +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=rH0iyTjTEVDhNBsIc895dGlPYZL8lezMVYS7/NtUMi0=; b=P6dtufRFGm0DIMCigLtIYsEdMg hvNnnihk+J5FDq/sBNbmRBqIHdAjag4bl+WUXF+jSD9ZEAhXeKYEGLtib1DOhnko+aO4zHgvzgn18 6BiD+RxG1UpswwMDgu3i5zfoNi4D8T0U1c8NASQxfxdoU9ScOvFT/IN/fGXSV6G5u9UqE3kRj85ZS 3uixZ9q1H6abWAanR/jzQ+czTMCAsLHvB7XSaW837g90ASHV45QnzpOlqPCCO/VW4jZBgV+n8TByR G5XCfgidJFQG5G0U8StalrqFoYi9qXTXzUDmVY/PAExEO+rntcperp0LMtBc/Zqeys/7qsUydIKv+ hSETpvDg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jo9oe-0004KI-Au; Wed, 24 Jun 2020 18:08:08 +0000 Received: from mout.kundenserver.de ([212.227.126.134]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jo9lM-0002aB-U2 for openwrt-devel@lists.openwrt.org; Wed, 24 Jun 2020 18:04:48 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MwwqB-1iuG5B07qd-00ySqW for ; Wed, 24 Jun 2020 20:04:42 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] mvebu: move definition of factory.img out of Device/Default Date: Wed, 24 Jun 2020 20:03:13 +0200 Message-Id: <20200624180313.14251-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:KHHjzRI43ZqtLBy7ZQviRtPhDRuVGPi7vap5HUn6qpxtUZn+hbA t0+WfwNvmKFOAwKIe0uQaB9XvO4RCkfurSAaLhWCQ3B0LYJYLTuYIxfUVeyksLwJt3fVjzk GuSR42ToZPhpoznYfiMMn9TsKZmGUJVrbiejHB1BTKQZv3Gib6QeuBMC5duUA3O6EIrDl2a YbsnDRHepo6f/mGeQ3P1w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:Oxy3JUhp+VE=:nJmOVNMOJwb/2UKQH9wn5M JWAQ6VjcSDlEHKRBd6lL0NT5BsTQMAxGTcgGL5AiHfiEZtUORzsBc/R8Z2lrSUh7BUW+KAC2L b8Ax+W+8NXubU22zcr50A4nKG3kgONQxjXXYVOZYniVKORMnMouHW+ufQ8fF3ckTm+9jjDPoO xPK1YPbkqNqURsGOMsHFPfzSoNTlRsUvVKm4s7iPWPnpasl4RvjvFfPvfaVKCGPTuclmuseRs hpmHvmaQqdCiWYFKEaXYQXz+GH/5EGE3ugN5Zdb99tiCRgJ186gsJJDM3f+e37IWc4XbQm3zP GNt9+V3vB4F41cU3ulQ4SDYJJk3+XTYJvgygvIY/AM+384N1099Cwoqt1tKIlY9VxGKs0vznK UOFFlbnREiZxYc4SJbmfh0uF+RJYqkCQXR8eDhyG088cPkPzEIvACQ2fGLkvAK1gyLLMdt2U6 FXWpaWCz6nz2vI7PP+4ps4tFOCNswIbL7tnyITEg2ka+7p9PQU0S1Jr9pr/De4ofQtRKbJxw8 GGugRH8ITrMAy89GUCFveqVUYNEcxjwZg77KJ6Q02GPoFPCTCjbTmUXGugVesrcdOKVBDNO8m 9imZVrq+madLjTLvMmqf9hIa+Z3hksYUKoAKK0JOF6wTQvJFnpCJBh1kb9YBP5YBxkm0hafXd qHHO9NJQl1WY7iSxfECLi+gyPmbfoBb39+1Z+LgWSkHCinuiMstwhq0tvlPSVrgI7//i2ej7G 96HA/sw88jxT1+++m9DlcIwaTY6MunkNUYD5d2IozJNdgdzwvlHhLiD8CnyFCWbl5sjCEY4JG 0CZWFDFrPkNLp4Zgcrep/ZJ8mBtbXhbQYu6uTwutR3ouYwLj5oqgunKvqaAWiV9aEkiA3E9 X-Spam-Note: CRM114 invocation failed 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_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.134 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.126.134 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 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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/Default definition in mvebu defines an IMAGE/factory.img which is not included in IMAGES, and only used twice in the individual definitions. Move it out of the default definition to keep it closer to the reassignment of IMAGES and make it more consistent with respect to other values of IMAGE/factory.img Signed-off-by: Adrian Schmutzler --- target/linux/mvebu/image/Makefile | 1 - target/linux/mvebu/image/cortexa9.mk | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index cbf34c1bc8..502e081ec3 100644 --- a/target/linux/mvebu/image/Makefile +++ b/target/linux/mvebu/image/Makefile @@ -104,7 +104,6 @@ define Device/Default KERNEL_NAME := zImage KERNEL := kernel-bin | append-dtb | uImage none IMAGES := sysupgrade.bin - IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | pad-to $$$$(PAGESIZE) IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata SUPPORTED_DEVICES = $(subst _,$(comma),$(1)) UBINIZE_OPTS := -E 5 diff --git a/target/linux/mvebu/image/cortexa9.mk b/target/linux/mvebu/image/cortexa9.mk index bb09d2b6f7..f01a76a9d3 100644 --- a/target/linux/mvebu/image/cortexa9.mk +++ b/target/linux/mvebu/image/cortexa9.mk @@ -55,6 +55,8 @@ define Device/linksys DEVICE_VENDOR := Linksys DEVICE_PACKAGES := kmod-mwlwifi wpad-basic IMAGES += factory.img + IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | \ + append-ubi | pad-to $$$$(PAGESIZE) KERNEL_SIZE := 6144k endef @@ -151,6 +153,8 @@ define Device/marvell_a385-db-ap DEVICE_MODEL := Armada 385 Development Board AP (DB-88F6820-AP) DEVICE_DTS := armada-385-db-ap IMAGES += factory.img + IMAGE/factory.img := append-kernel | pad-to $$$$(KERNEL_SIZE) | \ + append-ubi | pad-to $$$$(PAGESIZE) KERNEL_SIZE := 8192k SUPPORTED_DEVICES += armada-385-db-ap endef