From patchwork Fri Jul 10 12:16:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adrian Schmutzler X-Patchwork-Id: 1326734 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; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=LvGATjxg; 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 4B3Bt548Ddz9sDX for ; Fri, 10 Jul 2020 22:19:09 +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=7+5cwVpSsDqjGpAcTrEekxm7H3gRK1YYMFK6XviGC1I=; b=LvGATjxgAzbGdBqLnnpODBT3UF PEgtyIsm6DT1lY7zzTRnXu36EQ3MrJDDFIYVcxV5PyWumfAfHZt37KIWFkDPWPlOpSjnuNjxWza6E wXIfcT6PLH6UR33bzK8VV1kT8AcGKzTcdMRz2gAi8qfj0H8C2ww3U2d155VEmq+R/1AHT3EdOtOow CkuX5zp3bE7yFdWBuTsp5Gy3G2+25ej07BXpIjoi/6plIqf1Nc3W9WSkchtQJTWLnltKY77bpYWfb TYW6ILc9zi30BEULMWwn2+tpaWrnkli491muH3y9hQ5F5hKwf32dx2Xaovti2fjNJsHq2SEo0UQUk E+a2yfCA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtryQ-0000gD-JF; Fri, 10 Jul 2020 12:17:50 +0000 Received: from mout.kundenserver.de ([212.227.17.13]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jtryN-0000fN-II for openwrt-devel@lists.openwrt.org; Fri, 10 Jul 2020 12:17:48 +0000 Received: from buildfff.adridolf.com ([188.192.134.246]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M27ix-1jrwAI2i5p-002XAw for ; Fri, 10 Jul 2020 14:17:43 +0200 From: Adrian Schmutzler To: openwrt-devel@lists.openwrt.org Subject: [PATCH] ramips: consolidate recipes with uimage_padhdr Date: Fri, 10 Jul 2020 14:16:23 +0200 Message-Id: <20200710121623.1923-1-freifunk@adrianschmutzler.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Provags-ID: V03:K1:4FOmrRzJ+AEhLJ5YkPmIMx+6rbU4nCHRs3GwpLKuAIW/OOR4CTZ 8+Wotqzf5EGZThI68XwpJFGc5bEZ1OxProtXj1Xug/uH8xB0ymuPHHAr6rxmseLmGUube7w dyEIqXdf8UYImLDcdnofSoRVy0a3BYCEokFWgpXpq+eANqaMqqQMopYhkkiWhvMgXLhlPmS NPXISERO6/lv5SNxnV5Fw== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1;V03:K0:+iCZWihp7WM=:rV5995mpZiA1zsdTiPw2GP uGnXXwUYKUjPvjNViw/UlwVsc3t9z+2NlKDJVtaD8nQP3ouTNgVDIp7ERpRpV+/RGNLlGZPPD NfqGgoQJXlqWkylocnViP8ZeJkV//8KkJQ1YCF02rujbtRC1TTRPPLfLjHe6FaDecvrXFd+70 RXONzQP6dxieRnoIu6dgTxkdoZ+juYBoGARg7Kpy/UMHY8XcaLnP0S+YS7OnE7jd1ml9/BIJd M73w4oaN4eDJeFGJ/Ru6q5od+csmQnbj6pT8rqPFc6Pwoyk6nNWGPGfxMdGKoJMTvjdMtrVnU /8kE9ne+2kM/rjhXECwyqZwj84bZtUfUOS9qdGVt/8EWuZvA96VM4jZXQBj+1psAXLA/KV/1D S4/1T6aQ7uKk55y4PiKGPBVQRngsRH4I+yZb+Rh4SC3sEBgFX2MDs7MeQ4YtsaoTrfeFe+6ca /R1G0+q9YSOt2AU4gN+ylAuc8SYCc4YxnxDsKsXhjUgrjcNGcS4fSeZBGDNb0JYL706Y9W1gj sGqq0lrvnRdV2gzb2GYtJYoCRoapTSxrHUg9uOtQhy6j6UPsMtDb03xkf4qwok+/SPaYKWVFv DiwV2dJU0j1KyIQpPPMTsbfA4d9qNMB8nn1NaQvFFnyaYRf9Vc3p13u5IaACqxx7WqhBzd3qE EKZ3dvKZxhq36H2xIrX99n0Om9nhMADDMvYZzLKp0YN7aTAc4Ut7Ygq7PdK5szxjgMMPF86xW GWz/yxpF3j3eKFMKCgG7LYTgFwAhPlcaGYtGpp7JfbM347HRqqpjS1eorSq3dSJgiw9P3gKU4 hQfDwsIlsU4z9v19FZYjM98SGWFEp2r/FhkAZ/k1en/+83DYUYQBOhPOloJbZLd9w0bwul00c b2rhA95DpNJYTZxJWPYw== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200710_081747_822911_0BF91E36 X-CRM114-Status: UNSURE ( 8.06 ) X-CRM114-Notice: Please train this message. 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.13 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [212.227.17.13 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: 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 There are already two very similar recipes using uimage_padhdr in ramips target, and a third one is about to be added. Make the recipe more generic, so redefinitions are not necessary anymore. Signed-off-by: Adrian Schmutzler Tested-by: Bjørn Mork --- target/linux/ramips/image/Makefile | 10 +++++----- target/linux/ramips/image/mt7620.mk | 4 ++-- target/linux/ramips/image/mt7621.mk | 7 +------ 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index a1d9cfbf8b..d72d937ab8 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -51,11 +51,6 @@ define Build/elx-header rm -rf $(KDIR)/tmp/$(DEVICE_NAME).header endef -define Build/fonfxcimage - uimage_padhdr -i $@ -o $@.new - mv $@.new $@ -endef - define Build/jcg-header $(STAGING_DIR_HOST)/bin/jcgimage -v $(1) \ $(if $(JCG_MAXSIZE), -m $$(($(subst k, * 1024,$(JCG_MAXSIZE)))),) \ @@ -151,6 +146,11 @@ define Build/trx -a 4 -f $(IMAGE_ROOTFS) endef +define Build/uimage-padhdr + uimage_padhdr $(if $(1),-l $(1)) -i $@ -o $@.new + mv $@.new $@ +endef + define Build/umedia-header fix-u-media-header -T 0x46 -B $(1) -i $@ -o $@.new && mv $@.new $@ endef diff --git a/target/linux/ramips/image/mt7620.mk b/target/linux/ramips/image/mt7620.mk index df3f050048..34e2e42c33 100644 --- a/target/linux/ramips/image/mt7620.mk +++ b/target/linux/ramips/image/mt7620.mk @@ -400,8 +400,8 @@ define Device/fon_fon2601 DEVICE_VENDOR := Fon DEVICE_MODEL := FON2601 DEVICE_PACKAGES := kmod-mt76x2 kmod-usb2 kmod-usb-ohci - KERNEL_INITRAMFS := $$(KERNEL) | fonfxcimage - IMAGE/sysupgrade.bin := append-kernel | append-rootfs | fonfxcimage | \ + KERNEL_INITRAMFS := $$(KERNEL) | uimage-padhdr + IMAGE/sysupgrade.bin := append-kernel | append-rootfs | uimage-padhdr | \ pad-rootfs | append-metadata | check-size endef TARGET_DEVICES += fon_fon2601 diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index d03bb3aace..9e5bd811b0 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -81,11 +81,6 @@ define Build/iodata-mstc-header ) endef -define Build/mitrastarimage - uimage_padhdr -l 160 -i $@ -o $@.new - mv $@.new $@ -endef - define Build/ubnt-erx-factory-image if [ -e $(KDIR)/tmp/$(KERNEL_INITRAMFS_IMAGE) -a "$$(stat -c%s $@)" -lt "$(KERNEL_SIZE)" ]; then \ echo '21001:7' > $(1).compat; \ @@ -1146,7 +1141,7 @@ define Device/zyxel_wap6805 DEVICE_VENDOR := ZyXEL DEVICE_MODEL := WAP6805 DEVICE_PACKAGES := kmod-mt7603 wpad-basic kmod-mt7621-qtn-rgmii - KERNEL := $(KERNEL_DTB) | uImage lzma | mitrastarimage + KERNEL := $(KERNEL_DTB) | uImage lzma | uimage-padhdr 160 IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata endef TARGET_DEVICES += zyxel_wap6805