From patchwork Tue Dec 13 20:46:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Vasut X-Patchwork-Id: 1715470 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=uvSEunks; dkim=pass (2048-bit key) header.d=denx.de header.i=@denx.de header.a=rsa-sha256 header.s=phobos-20191101 header.b=lriXWB2m; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4NWrBt2GX7z23yy for ; Wed, 14 Dec 2022 07:46:43 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5AC4C85089; Tue, 13 Dec 2022 21:46:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1670964397; bh=4sMvV599mMhkT51kahutODgYT5aF7lzxYzqpona9bTQ=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=uvSEunksqzAgh/DbdMBz50OKvKtwqlXTaZ7xG2A/0IKG/TaoppcgfrCENhLesJ1tr rXz6MF8cf8xAaL1pGpmrcMfQjVKrK0OENy8HP9TwndfkJXV6HEnnn3i4tozwi3FUQv Gw15coDv71oJkM6vMHMM06DTRQzGGavzE3t3tC7vYmNFDlLOdRZ+GDYqMmOH6mUKuz XZhinAarK95oPa+3K2AqM+sUVD+vobsP+LBOWvfCBNF7tXpQvicLsdQI8n2MiSkNTK dZmQnUpWK+AerzNb0wHsiOw9mSs3GXxY23RaqsEqfItnmoTuVWYSXHQk3FeTo2NAwZ X8bVE3d+ivEJw== Received: from tr.lan (ip-86-49-120-218.bb.vodafone.cz [86.49.120.218]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: marex@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 6898D83D10; Tue, 13 Dec 2022 21:46:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1670964395; bh=4sMvV599mMhkT51kahutODgYT5aF7lzxYzqpona9bTQ=; h=From:To:Cc:Subject:Date:From; b=lriXWB2mKRTEmXjNPD4t5pF+vvwSv64ye8j8y84RACjcKb0SVoxlWdXvEV2FtdLXr b+j0eu65XWRk1V7z4AlhZoDUPbOsR4LshJfumfb0a/BXV79dd32w34U+y/GA4rkt7L 9KroKLNulnxkh7vIlmfsYTGU0pYsoWD/ZuacNJ1V8ALF6idU4Yae5BZhFXpgmOmYrz qMns2ER1fD/wWUpv5JyvB4BNqNX6Cvql8Ri56tGQXtaJR5lCRx30iQw+pYNhG7zW2Y IBiDGptPXX127sZeXnsdwiOZ5omQmj1hTY8c0G/2wcEMFPaXGDzklNQwL6ItggauUE tuPnjAnTGa7QQ== From: Marek Vasut To: u-boot@lists.denx.de Cc: Marek Vasut , Peter Hoyes , Ramon Fried , Simon Glass Subject: [PATCH] [RFC] cmd: pxe_utils: Limit fdtcontroladdr usage to non-fitImage Date: Tue, 13 Dec 2022 21:46:31 +0100 Message-Id: <20221213204631.175285-1-marex@denx.de> X-Mailer: git-send-email 2.35.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Commit d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") forces '$fdtcontroladdr' DT address as a third parameter of bootm command even if the PXE transfer pulls in a fitImage which contains configuration node with its own DT that is preferrable to be passed to Linux. Limit the $fdtcontroladdr fallback utilization to non-fitImages, since it is highly likely a fitImage would come with its own DT, while single-file images do need a separate DT. Fixes: d5ba6188dfb ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") Signed-off-by: Marek Vasut Reviewed-by: Simon Glass --- Cc: Peter Hoyes Cc: Ramon Fried Cc: Simon Glass --- boot/pxe_utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/pxe_utils.c b/boot/pxe_utils.c index 8133006875f..a25f0c22888 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -724,7 +724,7 @@ static int label_boot(struct pxe_context *ctx, struct pxe_label *label) if (!bootm_argv[3]) bootm_argv[3] = env_get("fdt_addr"); - if (!bootm_argv[3]) + if (!bootm_argv[3] && genimg_get_format(buf) != IMAGE_FORMAT_FIT) bootm_argv[3] = env_get("fdtcontroladdr"); if (bootm_argv[3]) {