From patchwork Sun Jun 28 16:26:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Bauer X-Patchwork-Id: 1318609 X-Patchwork-Delegate: mail@david-bauer.net 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=none (p=none dis=none) header.from=david-bauer.net 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=C3Aw8CaE; 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 49vx2s1SBdz9s6w for ; Mon, 29 Jun 2020 02:31:32 +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=9YP0nAoi+hVHYMUHMyBkIp4+cBPF1oHm9COxrospuFY=; b=C3Aw8CaEIGiXjCAXJ7pyTgN1BH ay8JePfEZ0Oo98peapLyN/Zkq9s8Ufe0SDDosxsF3p+Hvrxyar78+t8LI6/aCHQqBLf7ePWvdNL6c DJojexp8eL6uW//NRDxQu9ykyl5oV7sK3nLfKDPDsJlMYg9jfzyZAUs2lFzH3kyPNTjUQPioGvmA9 RhZRAo6vPyeogQLJGeNSEyr+m2WP8SGNVxuisQoEntiNd0fmC3cpbVlSOralVGH4cXHI3ieiAoLH2 FzeJwl4A03SKMPIg/PRJrHtxGgDyE+okANA0UuajXzmtSu9YUctXjQmdaO8gG1n1AUC1jEvBm6M6a CDEbeKpQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jpa91-0000hk-Pe; Sun, 28 Jun 2020 16:27:03 +0000 Received: from mars.blocktrron.ovh ([51.254.112.43] helo=mail.blocktrron.ovh) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jpa8z-0000hU-AF for openwrt-devel@lists.openwrt.org; Sun, 28 Jun 2020 16:27:01 +0000 Received: from dbauer-t470.home.david-bauer.net (p200300e53f3ed0007990fe3852b0fc0b.dip0.t-ipconnect.de [IPv6:2003:e5:3f3e:d000:7990:fe38:52b0:fc0b]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.blocktrron.ovh (Postfix) with ESMTPSA id 308411E0CA for ; Sun, 28 Jun 2020 18:26:46 +0200 (CEST) From: David Bauer To: openwrt-devel@lists.openwrt.org Subject: [PATCH] ath79: replace custom uImageArcher generation Date: Sun, 28 Jun 2020 18:26:29 +0200 Message-Id: <20200628162629.200982-1-mail@david-bauer.net> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 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 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 The replaces the custom uImageArcher build step with the generic uImage build step. The only different between these two is the difference in the generated name. Tested on: TP-Link Archer C59 v1 Signed-off-by: David Bauer Acked-by: Adrian Schmutzler --- target/linux/ath79/image/common-tp-link.mk | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/target/linux/ath79/image/common-tp-link.mk b/target/linux/ath79/image/common-tp-link.mk index 81a557df48..ab10920402 100644 --- a/target/linux/ath79/image/common-tp-link.mk +++ b/target/linux/ath79/image/common-tp-link.mk @@ -1,14 +1,6 @@ DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_HEADER_VERSION DEVICE_VARS += TPLINK_BOARD_ID TPLINK_HWREVADD TPLINK_HVERSION -define Build/uImageArcher - mkimage -A $(LINUX_KARCH) \ - -O linux -T kernel -C $(1) -a $(KERNEL_LOADADDR) \ - -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ - -n '$(call toupper,$(LINUX_KARCH)) OpenWrt Linux-$(LINUX_VERSION)' -d $@ $@.new - @mv $@.new $@ -endef - define Device/tplink-v1 DEVICE_VENDOR := TP-Link TPLINK_HWID := 0x0 @@ -86,7 +78,7 @@ endef define Device/tplink-safeloader-uimage $(Device/tplink-safeloader) - KERNEL := kernel-bin | append-dtb | lzma | uImageArcher lzma + KERNEL := kernel-bin | append-dtb | lzma | uImage lzma KERNEL_INITRAMFS := $$(KERNEL) endef