From patchwork Fri May 27 14:37:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 1636285 X-Patchwork-Delegate: trini@ti.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; unprotected) header.d=baylibre-com.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.a=rsa-sha256 header.s=20210112 header.b=jJCh7zrV; dkim-atps=neutral Authentication-Results: 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=) 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 RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L8nTV2gpNz9sG0 for ; Sat, 28 May 2022 00:37:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C6A5483C7B; Fri, 27 May 2022 16:37:33 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20210112.gappssmtp.com header.i=@baylibre-com.20210112.gappssmtp.com header.b="jJCh7zrV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E81A083ED5; Fri, 27 May 2022 16:37:31 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [IPv6:2a00:1450:4864:20::435]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 2F09683C10 for ; Fri, 27 May 2022 16:37:29 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=narmstrong@baylibre.com Received: by mail-wr1-x435.google.com with SMTP id k16so1796963wrg.7 for ; Fri, 27 May 2022 07:37:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rCMd+gtnFn22x/yne7SdSYpxYTOmB9xXKYZK63xm9zA=; b=jJCh7zrVDy9nRDIsnNQT0VOa3uE7wZJrsbHte1IfGG/YZtXm5NVV/TS4+vRg30S5UC Mtxk+1+xphZlZW1t80czjPaAOU8X8j49hxQcmB4IfAxFS7fI5tAsBhXEJC6Hs9EnknC7 /jYLk6XPMqlfwxl4zB4Im0ALbMhPxK1rsf9Wx39cictpQWvqbKqdMScHRCqFixnwyRX9 Y2c/ZmgO6fdNlj3DH64Y1bgch5rzYBJ9Ctyi7U7y5kllgxEAjuoaH60uO5gSedPE66xh VNq8PtFQXnWCjj5RrUh1SCFX344PWlH2Pr8p4wRW3Gu3cB4fgHqmshR/vRKeqMEwszW3 TWmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=rCMd+gtnFn22x/yne7SdSYpxYTOmB9xXKYZK63xm9zA=; b=j6aA0P4u2XAS6M5JlNE6WLJJSkZn15zCKi+HrGG91znW5SVMdx+tVGk+oCFMiRxqH5 cKVwfcutwZcYHGZ9PcjgLcSn0xy14hyu5GmxmUoHCkeEjvd9ugdd5H5UxEW9GDgaznhp wUl6KWQoFnEZR0lpRxAISvZObPPSv5AeRqk+K8U0FmqzrHQZewr5pICrHGjwt20b1mJ/ yBJLXWuXT8K9LtnPRi84FWtNJmkeIomlPi+j2/f6YxO46LiI/YCt+0cEH7jCh7rcOd3o 94Gwnn066xyevVi3juV8V/b6uqSXBFy6c5Z091nmMWDvbKoAK0FwK4fX2cuw94jB6IBV HqtQ== X-Gm-Message-State: AOAM530nR+WQ09+XOlb3XVowR9lC1WrCL9a4juH3xoDJHLrEvNfRq5/t QlOMxBiTYWTQllPAx7Qq05WS/w== X-Google-Smtp-Source: ABdhPJzimmkSFmDirH98pK8enDWd1W2Ux6kt046csz31VlCHmQStHcaEj+4Pe5/GvLVoEhSQc4I3eA== X-Received: by 2002:a05:6000:1631:b0:20f:fcbf:83ae with SMTP id v17-20020a056000163100b0020ffcbf83aemr11283388wrb.441.1653662248638; Fri, 27 May 2022 07:37:28 -0700 (PDT) Received: from localhost.localdomain ([2001:861:44c0:66c0:f081:5ded:fc86:365d]) by smtp.gmail.com with ESMTPSA id y4-20020a5d6144000000b0020c5253d8f7sm1864404wrt.67.2022.05.27.07.37.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 May 2022 07:37:28 -0700 (PDT) From: Neil Armstrong To: peter.hoyes@arm.com, trini@konsulko.com Cc: u-boot@lists.denx.de, Neil Armstrong Subject: [PATCH] boot: pxe_utils: Do not use fdtcontroladdr for FIT Image format Date: Fri, 27 May 2022 16:37:25 +0200 Message-Id: <20220527143725.131742-1-narmstrong@baylibre.com> X-Mailer: git-send-email 2.25.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.5 at phobos.denx.de X-Virus-Status: Clean When patch [1] introduced "fdtcontroladdr" fallback in order to use built-in DT when no DT in provided in PXE config, it broke FIT image boot where the DT from the FIT configuration was used. This disables the "fdtcontroladdr" fallback when the provided image is from the FIT image type. [1] d5ba6188dfbf ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") Fixes: d5ba6188dfbf ("cmd: pxe_utils: Check fdtcontroladdr in label_boot") Cc: Tom Rini Cc: Peter Hoyes Signed-off-by: Neil Armstrong --- 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 b08aee9896..5eb328c86b 100644 --- a/boot/pxe_utils.c +++ b/boot/pxe_utils.c @@ -725,7 +725,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 (genimg_get_format(buf) != IMAGE_FORMAT_FIT && !bootm_argv[3]) bootm_argv[3] = env_get("fdtcontroladdr"); if (bootm_argv[3]) {