From patchwork Mon Feb 22 15:28:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1443170 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=R8EBD8bZ; 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 4DkmPW5J7Dz9sBy for ; Tue, 23 Feb 2021 02:31:42 +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: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=5TXiGPMM4PLxrhajcyRMHL3M1RWEdcodNhRJ5XuwAtk=; b=R8EBD8bZMaCpsBA73hHP0G0TXK HUpo+cATj+R4+ekDnbjWnUK3BnbHm+fyQEu0DjvyS+14Swz9mL8QwdxPUBV6t4GYtVFXLkwXZUbby SWT+GNsMAkjLJ/DQjGonZ0IGVjwxhREPwGEZIS3v6yVRSK1fc2Cv8wF30SurgcUVS5mNwJo7YrG8A ny2oxT0/WeyC9B/HCsU8pC1XKL2aXJqgls5eQHaKdms0GdfBpZYuNfQHO9HnCpAhlkDs/PNieueCf 2lquofSDhkCmKFPuBT3uksi8Jxc22TTFCJ9Lo+vZWbHL2R8ezuBA9dr8bIMVOFaxmCM7mrsh+/b8g 8kPsB2JQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lED9s-0003Jr-9v; Mon, 22 Feb 2021 15:30:00 +0000 Received: from mout.kundenserver.de ([212.227.126.130]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lED9m-0003I9-Af for openwrt-devel@lists.openwrt.org; Mon, 22 Feb 2021 15:29:55 +0000 Received: from buildfff.adridolf.com ([178.26.242.49]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MUl4z-1lMhRq3pyb-00QjKH; Mon, 22 Feb 2021 16:29:47 +0100 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH 1/3] treewide: remove redundant KERNEL_PREFIX definitions Date: Mon, 22 Feb 2021 16:28:54 +0100 Message-Id: <20210222152856.3464-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:T+BsuVnVvhDhdUpdzLQVryOw2WsXVfcoHO1ggw3RFy2OeS8Cu0y CRSng3XolVuuTukzFZ6ztdi/Euwl1MaRh1LUs/8B4oLx6iGQ9j6loZiB6rz8mR++U9FQC0F UbmEpSPakUwOVMxxW+QyFDJSt9PK5Ypt2e8U3yUqhsOT5Bb0YRit/yK8JGLQHqVWIHrq4ud qvfTUGZGU3Z2WxHnTnmLg== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:0+0JmbFzmBE=:G4pQtcX+EkmxKbOztDQZ5U aGpSSblhGmcx8uQQCbXzQDlxoBvIP8tkBciin9r5BfLoZ4sG3K5GrSTHeD38xjTNMyb4d3/SJ Ij+y6Iy15i9Kh5e678L1ZaIWmJzoBNkwboqY0goFtGswHguxNrTVm49agwp8z30/kBWsIpsRI Fchxxc+6h7tkQJ9VkWWC8hcWWESbg6PyCA0mkv7d6VaNDdultJN81a9Q8kpYJlHfhVoPn93zM FwycedWlLmBQJsjfEkWaJ1FU01/SkYYaTf754rlGixJ71saruMOYVT2LEcoOu0/p5ehVtBuAH uZ9sHSPMCPz+qTSZd2KGUE4TTOOE6XuyECwxm7Z817UyQa1i96MquHoetTOosRW3Zx9BXUBEh OfVbzKJT7pG6hSuyxGi3WXCoKmuW8yJ0dpyVxa7ZojNqygqV+l+0KCybqe0R60u80/Sz5X2jU 8cB7LNN6oA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210222_102954_651066_3F4308F4 X-CRM114-Status: GOOD ( 10.24 ) 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.126.130 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.126.130 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an 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: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org From: Paul Spooren The variables KERNEL_INITRAMFS_PREFIX and KERNEL_PREFIX are already defined in include/image.mk and don't have to be redefined in the target Makefiles. Signed-off-by: Paul Spooren [also cover imx6] Signed-off-by: Adrian Schmutzler --- target/linux/imx6/image/Makefile | 1 - target/linux/ipq40xx/image/Makefile | 2 -- target/linux/ipq806x/image/Makefile | 2 -- target/linux/zynq/image/Makefile | 2 -- 4 files changed, 7 deletions(-) diff --git a/target/linux/imx6/image/Makefile b/target/linux/imx6/image/Makefile index f6dc461f7d..b520c1f778 100644 --- a/target/linux/imx6/image/Makefile +++ b/target/linux/imx6/image/Makefile @@ -123,7 +123,6 @@ define Device/Default KERNEL_INSTALL := 1 KERNEL_SUFFIX := -uImage KERNEL_NAME := zImage - KERNEL_PREFIX := $$(IMAGE_PREFIX) KERNEL := kernel-bin | uImage none IMAGES := endef diff --git a/target/linux/ipq40xx/image/Makefile b/target/linux/ipq40xx/image/Makefile index 2be262936f..a7710cfe05 100644 --- a/target/linux/ipq40xx/image/Makefile +++ b/target/linux/ipq40xx/image/Makefile @@ -4,8 +4,6 @@ include $(INCLUDE_DIR)/image.mk define Device/Default PROFILES := Default KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) - KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs - KERNEL_PREFIX := $$(IMAGE_PREFIX) KERNEL_LOADADDR := 0x80208000 DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) IMAGES := sysupgrade.bin diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index bab1da0090..cb4058f4a1 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -26,8 +26,6 @@ endef define Device/Default PROFILES := Default KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) - KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs - KERNEL_PREFIX := $$(IMAGE_PREFIX) KERNEL_LOADADDR = 0x42208000 DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1))) IMAGES := sysupgrade.bin diff --git a/target/linux/zynq/image/Makefile b/target/linux/zynq/image/Makefile index 3eb508d7c7..0931871624 100644 --- a/target/linux/zynq/image/Makefile +++ b/target/linux/zynq/image/Makefile @@ -31,8 +31,6 @@ define Device/Default PROFILES := Default DEVICE_DTS := $(lastword $(subst _, ,$(1))) KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) - KERNEL_INITRAMFS_PREFIX := $$(IMG_PREFIX)-$(1)-initramfs - KERNEL_PREFIX := $$(IMAGE_PREFIX) KERNEL_LOADADDR := 0x8000 IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := zynq-sdcard | gzip