From patchwork Fri Apr 1 13:11:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Piotr Dymacz X-Patchwork-Id: 1612204 X-Patchwork-Delegate: pepe2k@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=ZGqPlJix; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20210112 header.b=m3q3gkkc; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (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 bilbo.ozlabs.org (Postfix) with ESMTPS id 4KVLHk6SpJz9sXM for ; Sat, 2 Apr 2022 00:14:58 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: 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: List-Owner; bh=G6ILOQYzRKGJtbC+US1rZkLalfFIqWAScbQDiFhkUqw=; b=ZGqPlJixXQXxJY EvoDHWlUDGRBZvufqHSKTmB7J7oqBQdX+weseIlhy2qwVNmMb1LdWPaT1pkdMpdm5O51+hMd4JaP2 da24z+fyQYZ3GrQ2Z4uu9U3py6Jemf59IFffGBdrX4FLrP+ohD+a784jmEF7QthMlhhp14cm3a62V bO0yBwx3z/OopyemZy2/hnX/b5g2eU4rOAgNUZIJWiHXUN4Gbit6NxZJDIbbIm6nISISIVc+fnFOF Woex2bBdGrmPxXrF7b1Zc2A5a4rh4BcWxm7JQ5TMMa/7kmrcoZ5kPNAKaSfq538XDCF/uRsMzZd9q z7+Dx44rsmOqpzK1Z5xA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1naH56-005jtK-OY; Fri, 01 Apr 2022 13:12:49 +0000 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1naH4f-005jlv-LZ for openwrt-devel@lists.openwrt.org; Fri, 01 Apr 2022 13:12:23 +0000 Received: by mail-lj1-x22a.google.com with SMTP id bx37so122515ljb.4 for ; Fri, 01 Apr 2022 06:12:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=4+u4cKncYbw02SZqndcsGdZj92sG4NEN5wR3OCjApsg=; b=m3q3gkkcksa3k87csq+5KDbpIZsWG+b7/PtCYSMRTcpw3C7yp24HwzNNFmf4fw7kMF 9L00XRdRlpSQtss+A4TToIV+nRlNF9EaIlBL95JDNf7oomtOfUMSHLZo3zMIYfpgRRCV 9qd933ZS7gmNw8kRGDnvORKodAExoulSbcL8opgK1dO4o2VQ3bi5tZ7ukYTwCF7H37hB nVFoFVTncKKvlrNwmULf5PCgqioQ7zmcLySSYDwtstAYjVSiT3N+NTEFZvtBWZhFE1uM Cw9OGG/qZqEP/yAXt8VXGBlPkwF95ybmFmf1vlEZHH5Zzbqcqj53icGb40zdILadX8rR jX/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4+u4cKncYbw02SZqndcsGdZj92sG4NEN5wR3OCjApsg=; b=k2lPRDmTVm9F55fPrzyjsI2yQ+BwljgD9LuOCCexvaa45jSYekQm3qSTadJC0E95ju LQntBy+6Rn4YEQi8MQkZdguPU64SXb4d89YIW8A1OMF8AvmeqofUvf75SbheAJW5h/aZ 07MBODchKNlN1M2dThyvIg1eZ8zKtiPEtIV9jaCaWEwJ/B2EcaSH0tshPFbWIZ+XVPke 8riqEQkohAb7zoOunXSFqZMls5jllYh41L59R4K3WNu8uo3sgvnBFDsj16CxFsTsxzIx KDudQpC4LizFZaEWZf2lrM6i9zEztpXuvZgQ9C26vq81A09HtIeHlismuUExI0JGEBPX 0QZA== X-Gm-Message-State: AOAM5323Sn+eXNC4df5/8jNomoRJhK2vZ90L9C++sYkgeCnLvhSiiDJi MXYOE6pMtzyIM38EhbV3M2QnzgOBQas= X-Google-Smtp-Source: ABdhPJx5wHu8sxKcblxFpXygbeCKw6hrOMAwsjTsPBlcBno9WLnQfU+TheZCsOP+0V5z6jYEfzsgHA== X-Received: by 2002:a2e:b5d9:0:b0:244:cbbe:89d5 with SMTP id g25-20020a2eb5d9000000b00244cbbe89d5mr13292228ljn.124.1648818737513; Fri, 01 Apr 2022 06:12:17 -0700 (PDT) Received: from desktop-mint.lan ([45.142.163.102]) by smtp.gmail.com with ESMTPSA id i25-20020a0565123e1900b0044a2908b040sm238402lfv.115.2022.04.01.06.12.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 01 Apr 2022 06:12:17 -0700 (PDT) From: Piotr Dymacz To: openwrt-devel@lists.openwrt.org Subject: [PATCH 3/4] imx: image: use 'u-boot-dtb.img' filename for SPL payload Date: Fri, 1 Apr 2022 15:11:36 +0200 Message-Id: <20220401131137.697545-3-pepe2k@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220401131137.697545-1-pepe2k@gmail.com> References: <20220401131137.697545-1-pepe2k@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220401_061221_736468_877E9CC8 X-CRM114-Status: UNSURE ( 9.31 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: For targets in U-Boot which were migrated to DM, the correct binary image filename will be 'u-boot-dtb.img'. For backward compatibility, keep support for both files and use the one which was generated [...] Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:22a listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [pepe2k[at]gmail.com] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 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 For targets in U-Boot which were migrated to DM, the correct binary image filename will be 'u-boot-dtb.img'. For backward compatibility, keep support for both files and use the one which was generated with our 'uboot-imx' package. See also 'CONFIG_SPL_FS_LOAD_PAYLOAD_NAME' and 'CONFIG_OF_CONTROL' in mainline U-Boot sources. Signed-off-by: Piotr Dymacz --- target/linux/imx/image/cortexa9.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/target/linux/imx/image/cortexa9.mk b/target/linux/imx/image/cortexa9.mk index 75e19dc694..17a507b8da 100644 --- a/target/linux/imx/image/cortexa9.mk +++ b/target/linux/imx/image/cortexa9.mk @@ -80,7 +80,16 @@ endef define Build/imx6-sdcard $(Build/imx6-combined-image-prepare) - $(CP) $(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.img $@.boot/u-boot.img + if [ -f $(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.img ]; then \ + $(CP) $(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot.img \ + $@.boot/u-boot.img; \ + fi + + if [ -f $(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot-dtb.img ]; then \ + $(CP) $(STAGING_DIR_IMAGE)/$(UBOOT)-u-boot-dtb.img \ + $@.boot/u-boot-dtb.img; \ + fi + $(Build/imx6-combined-image) dd if=$(STAGING_DIR_IMAGE)/$(UBOOT)-SPL of=$@ bs=1024 seek=1 conv=notrunc