From patchwork Mon Nov 9 14:23:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xavier Roumegue X-Patchwork-Id: 1396820 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=c7TrGba2; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CVCsr1jbvz9sVf for ; Tue, 10 Nov 2020 01:24:00 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 1CB8420520; Mon, 9 Nov 2020 14:23:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jyiMdNkKCoaT; Mon, 9 Nov 2020 14:23:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5BDAB20762; Mon, 9 Nov 2020 14:23:52 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id CC5E31BF973 for ; Mon, 9 Nov 2020 14:23:43 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C6A9E85E40 for ; Mon, 9 Nov 2020 14:23:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id SmNSfkPR31CM for ; Mon, 9 Nov 2020 14:23:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 7290B85F8A for ; Mon, 9 Nov 2020 14:23:39 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id b8so8884689wrn.0 for ; Mon, 09 Nov 2020 06:23:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LKyazKqfKZcAAOit1KrTi53MhcAQnu/ZHEzLiFiF07g=; b=c7TrGba2wNlxE/WQqT6S36vRCCPLTdjNnh/MND0s0C6M8A3TtOaGkYcTCr7yz+nXdj 2nkA6QvXSis0QyO8cNgKsUe+DeiCMaZk2M7LbONnJnf02WS4NsQBZnaV+WNjPowCIghp a2ZX4X/x02EWjkrc0gFuv1d39Fw/mYq+59t9HLOjduKeysUSZrBiOyCYzf7OY/JOaIUx rf99M7zoAhDjei2kF9i1WoucuA0DTMyLSSC2GCaScweRcWXrJsFFK4g4oecaoyewDqCv ZBsNj/gedu8RbUDjavbEi0lnapWTeXsConLjDvs4q3ddW7rhtbrMsC4kmX3cpZe9Mrdz EmQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LKyazKqfKZcAAOit1KrTi53MhcAQnu/ZHEzLiFiF07g=; b=SdssbdJWoQkmVMquRjPUK0F8GX7pDzf9J4Kn2TC+Fl5l5G+0Jy7PTL7jxqfyp6+AXj wDmm1tw/bnghRPpUQEm4qPrppYcUJNI8/hIAdrucsqqL2Mdq77G6hMgx8poWxDkEpd+7 Q3V7ZmkVZejQ3uJp1HfRKJo4to1vvJNqE0OkYC1jLZQIx5l6z8RIrNPb5JcsQ7f1+CUV UNfNQY9p8zMoXAs5Tz6gqTRlM9t1FbBPk9qv0UMoMDiUIZSVISiH1PbUlXkeIrJPMtM4 4CwUZ4JkfL3/aDdUNapxlDCr4JHNq/uAm/3Ysyaz4rKnTjhR5vXnYVV8jMGVEhe29c3h wKng== X-Gm-Message-State: AOAM532Ee/JJQaaYJ7JNwFWOwLnqHLAWjqabGbuSiojMkfMsexBvfN3m RHM15j0y+nPnz3o2VxfYXqMND1UreeZRYWXN X-Google-Smtp-Source: ABdhPJxakFqzMoWRWmxpEGk5k/ose6z7FjG7P55zpfqf/KqxbJSmm8hf8eLQ7DU8kzuCxz0np5bjeg== X-Received: by 2002:a5d:4f92:: with SMTP id d18mr19240991wru.118.1604931817859; Mon, 09 Nov 2020 06:23:37 -0800 (PST) Received: from frodon.home ([2a01:cb1d:3f5:3900:2e4d:54ff:fe9c:6f7a]) by smtp.gmail.com with ESMTPSA id q7sm13107067wrg.95.2020.11.09.06.23.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 06:23:37 -0800 (PST) From: Xavier Roumegue To: buildroot@buildroot.org, Thomas Petazzoni Date: Mon, 9 Nov 2020 15:23:07 +0100 Message-Id: <20201109142309.1135596-7-xroumegue@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201107135909.1265116-1-xroumegue@gmail.com> References: <20201107135909.1265116-1-xroumegue@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v3 6/8] board/freescale/common/imx8: Use post build generated uboot image if present X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Xavier Roumegue , Fabio Estevam , Gilles Talis , Refik Tuzakli , Julien Olivain Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Stick the uboot image filename to "imx8-boot-sd.bin" in case the final uboot image, embedding fw files, is generated thanks to a post build script. This takes precedence over all uboot images generating during uboot build. This should help to remove the dedicated imx8 config template file Signed-off-by: Xavier Roumegue --- board/freescale/common/imx/post-image.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/board/freescale/common/imx/post-image.sh b/board/freescale/common/imx/post-image.sh index 1cca1849be..7916b8dae6 100755 --- a/board/freescale/common/imx/post-image.sh +++ b/board/freescale/common/imx/post-image.sh @@ -66,7 +66,9 @@ imx_offset() uboot_image() { - if grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" ${BR2_CONFIG}; then + if [ -e "${BINARIES_DIR}"/imx8-boot-sd.bin ]; then + echo "imx8-boot-sd.bin" + elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_DTB_IMX=y$" ${BR2_CONFIG}; then echo "u-boot-dtb.imx" elif grep -Eq "^BR2_TARGET_UBOOT_FORMAT_IMX=y$" ${BR2_CONFIG}; then echo "u-boot.imx"