From patchwork Wed Jun 24 17:55:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1316492 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=YkJpCfxQ; 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 49sWMm4wBcz9sPF for ; Thu, 25 Jun 2020 04:07:48 +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=/0Wvth4hX2tohF0/qY6MNyDwWQPiDZviu7+gKtWC8tE=; b=YkJpCfxQji0lmyJWQK1m3ig13F UK1yvb660MjqGUVmnzVdltvaxqgBB/S5LCd9UG9EwHN5sThh5uNXNyDrsntUHMq1WzX31l+9Fk5Tn W0wEi6mmmd7tMxUrhF6x7/zUfxbZlZTHUyjQr3wj8FlW9JHdDa0Icta+ljR6XYB181kpYvWbN2Yce 8nDiZr9EUK78/eZXRVaRmhr5eyo4YU9YEzbqInRSMhRml6wi37D4Rc5b694Hrbuqp7KyIgNNsclUh 0iT2mnNZRfPGA8V9Krgjq9Oh/9LlRBBudQetXPV0vBuyS/ZLd9e0gddHJavJuUz4m4Gx00TP7KMr5 XvrLTvkQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jo9lS-0002aY-On; Wed, 24 Jun 2020 18:04:51 +0000 Received: from mout.kundenserver.de ([212.227.17.10]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jo9cx-0005cP-Dq for openwrt-devel@lists.openwrt.org; Wed, 24 Jun 2020 17:56:04 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MQ5jC-1jSCvJ1cRs-00M2dg for ; Wed, 24 Jun 2020 19:56:01 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] ipq806x: set IMAGES in Device/Default definition Date: Wed, 24 Jun 2020 19:55:18 +0200 Message-Id: <20200624175518.13995-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:xX7PwChIdXlA4nC5FfoqaflzJGFHtrmuF1+/XenDnzF1N/9vFG7 HdAqC0UYYz2zXDDIAi/ixFQ10rEf2Ik2Xrow/BCgvJOH4dGPmg6kq262fN21ecxPIb0arHP DjO+fJVLz9xtKpKIzFe1410kkJ9Dc3mXCXBgX1A21HwXWcC7I7YFg0k/TuujNkohbKf3mkU 4B3jMXnGBzaBib2Xhtw3w== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:1mtVrx602w4=:5mznu0NCPoceB5VEjvjS5T pNGV+NVpgAXbCLZBEQUluo99HEO6BhwYJkpRTt0sMsxMK2aWvvJMubhO45Dv139U3K2qqCUUp ujRxBPIgIXrXKr1k/Hd4OPiW3YsftjIBTGzwiKOasJmma8XxV+e+mDrg2RpJAkYb/UC0QICqy AHGIHS1LEKToTZiJdK0AFLydTHuQW7iNB5y1ZjTp4pyx6ZWrDg9I/0pUliXF769c8e7QlCTsU QETXUUxSfPS4k/eDen3kNAIGhPcstQzowNbr6zfgEMIn8dB6acpmQ+3kgQ/K4cBasAsOQkP3w ay/Ff5vGqmv9l41JFvVaGNegM5tWKETudQVrJRxpsrGif6vaIwLlV+UwD/GQMGWwRKGLc4yGb ToLgDHT3Q8QYHkY6fbAkKMh2IBdSTlA9yXOL1M5RU7qRahdA4K+8OroUgyhlHhpUxarNgC3bj XSmp6zDoW5KeTuoQmm0W55FtPmNqSP3+QgoIQtfTbZSL3FPBuHoC3uqZNd66vCMEoey8rUvRC Zc6IcsoKNPECApTUpz7dEdS7O+OUEgnz+rL1MWfXxmQ4hUf9WkizkPYdguphVA5RmlncdK8D4 BD2EOPfy1Cc1j4FfKy2kPT4PSHcbRrn9hXvxewQ8jjMN3SHJ4qMDoTu1JCg7EepR/wH2CUosh pnlcgAkRttaUYqQLjsilcGCNnBl6YtdHReOkJnx31SqbL5CiWolat/ytWEuI3LhgT84c121th hjdx/vzzBQHP8uAIqNw5zvEqTN31S0TZh6/2NmmJHlwADE18ljcnCkgLus8l4JQZyfSqAiNw6 UK4Radsuowp+d+SGFa8BoHewlWoh9VpKp0lT6dX/UEeg+198XVXh2n3kgnapRb0cU9wJCpK 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_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [212.227.17.10 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.17.10 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: 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 sets a default IMAGE/sysupgrade.bin, but does not enable it by setting IMAGES. This is not consistent, and has led to IMAGES being defined at various other places in the file. Thus, this patch consolidates the default value for IMAGES by putting it in Device/Default. Since it's still overwritten where necessary, this patch is cosmetic. Signed-off-by: Adrian Schmutzler --- target/linux/ipq806x/image/Makefile | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index 6ea66d064d..578303e9e0 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -21,6 +21,7 @@ define Device/Default KERNEL_LOADADDR = 0x42208000 DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) + IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin = sysupgrade-tar | append-metadata IMAGE/sysupgrade.bin/squashfs := endef @@ -57,7 +58,7 @@ define Device/DniImage NETGEAR_BOARD_ID := NETGEAR_HW_ID := UBINIZE_OPTS := -E 5 - IMAGES := factory.img sysupgrade.bin + IMAGES += factory.img IMAGE/factory.img := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakehdr filesystem | pad-to $$$$(KERNEL_SIZE) | append-ubi | netgear-dni IMAGE/sysupgrade.bin := append-kernel | pad-offset $$$$(BLOCKSIZE) 64 | append-uImage-fakehdr filesystem | sysupgrade-tar kernel=$$$$@ | append-metadata endef @@ -67,7 +68,7 @@ define Device/TpSafeImage KERNEL = kernel-bin | append-dtb | uImage none KERNEL_NAME := zImage TPLINK_BOARD_ID := - IMAGES := factory.bin sysupgrade.bin + IMAGES += factory.bin IMAGE/factory.bin := append-rootfs | tplink-safeloader factory IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata endef @@ -76,7 +77,7 @@ define Device/ZyXELImage KERNEL_SUFFIX := -uImage KERNEL = kernel-bin | append-dtb | uImage none | pad-to $$(KERNEL_SIZE) KERNEL_NAME := zImage - IMAGES := factory.bin sysupgrade.bin + IMAGES += factory.bin IMAGE/factory.bin := append-rootfs | pad-rootfs | pad-to $$$$(BLOCKSIZE) | zyxel-ras-image separate-kernel IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-to $$$$(BLOCKSIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata endef @@ -90,7 +91,6 @@ define Device/buffalo_wxr-2533dhp PAGESIZE := 2048 IMAGE_SIZE := 65536k KERNEL_IN_UBI := 1 - IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-rootfs | buffalo-rootfs-cksum | \ sysupgrade-tar rootfs=$$$$@ | append-metadata DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct @@ -121,7 +121,7 @@ define Device/linksys_ea8500 BOARD_NAME := ea8500 SUPPORTED_DEVICES += ea8500 UBINIZE_OPTS := -E 5 - IMAGES := factory.bin sysupgrade.bin + IMAGES += factory.bin IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct endef @@ -134,7 +134,6 @@ define Device/nec_wg2600hp SOC := qcom-ipq8064 BLOCKSIZE := 64k BOARD_NAME := wg2600hp - IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct endef @@ -295,7 +294,6 @@ define Device/tplink_vr2600v BOARD_NAME := vr2600v SUPPORTED_DEVICES += vr2600v DEVICE_PACKAGES := ath10k-firmware-qca99x0-ct - IMAGES := sysupgrade.bin IMAGE/sysupgrade.bin := pad-extra 512 | append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | append-metadata endef TARGET_DEVICES += tplink_vr2600v