From patchwork Thu Oct 26 05:30:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 738327 Delivered-To: patch@linaro.org Received: by 2002:adf:f842:0:b0:32d:baff:b0ca with SMTP id d2csp638895wrq; Wed, 25 Oct 2023 22:33:25 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHv//zmVoG92omYcyizoadm//bbKg4moXDJRvblviyBeiK9bZaU+ZbdHejW08KNSQYfNTAY X-Received: by 2002:adf:e852:0:b0:31f:fdd8:7d56 with SMTP id d18-20020adfe852000000b0031ffdd87d56mr11552139wrn.12.1698298405160; Wed, 25 Oct 2023 22:33:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698298405; cv=none; d=google.com; s=arc-20160816; b=DOKrKbnIxhL/PXQSQPhe0Hr/KtdGh6STZnQ3Q0+b4IO9CtiX5ZikmH39E1Y7iv8JKP vX+JC5u1+Btb+/F3LXO9bVDu+Rw4iJXnU6aHEHUXPWYWYc1+gaslfylfX+xCVe14DdCA j6QRzAbklvmkK45UJHiFry0J+0bW11onwwsyzfsq+9vVmvzvpgVigAOqwTJsA9Z94UGv A03zXO/aH9P4AdWrqyk5F6Hx6HBr1cnsqX+qD8lBTtISOB7qgK8a8bPvf30SGlvs15YF 0X8ayA8680higGealeuq+O3K50iITFlq16EuKFN4giBNSqLjQXv65WZNmwsBV/9imGvX Rwfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=f1xnsDhYxoGq8Q7UUWBB8Cvz7zbisEXPmyyhu/S5S0E=; fh=RsKNQde3hXRhkFNkXZDJxhxJUE2DI5qQDMHikPj4pmY=; b=0hrfVbv2mt1E6p2NRYYpJMuRjMIQVXGmoivwPB/YdXS1izF0NyY7uevygDat0LoySB kaV72lrq6Nb3k7ImSokjWAI3YARnpGkv6A9isUzqDsHVTIg4byDQwpaSG/jeB+Yb0z4+ G260j45pyEe57/ehZeTBVh9TUV9d6ozNzBNI8aIUz8QFI5xdbNBcBEvfgjoBXtqEpQUL qZjLmQ3ZFB/CZXuEpd2d/+awzgHqHJqfPY8Lvk3+PFzXbm1fCSYSAbxB8o7cBiomv6PJ XI0QPV1z+u+sRnA/AJgvXNZ6XulcRmD9rh0bVPlTMYuyzghUG3eMgB0htU2Pr5azQ45u XbIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xm2zPg85; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id v5-20020a5d4a45000000b0032da2b8abcesi8380859wrs.491.2023.10.25.22.33.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 22:33:25 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Xm2zPg85; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C245D87B2A; Thu, 26 Oct 2023 07:31:50 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org 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=linaro.org header.i=@linaro.org header.b="Xm2zPg85"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6A65F87B24; Thu, 26 Oct 2023 07:31:48 +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=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pf1-x42d.google.com (mail-pf1-x42d.google.com [IPv6:2607:f8b0:4864:20::42d]) (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 DE68187B24 for ; Thu, 26 Oct 2023 07:31:43 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=takahiro.akashi@linaro.org Received: by mail-pf1-x42d.google.com with SMTP id d2e1a72fcca58-6bcbfecf314so118441b3a.1 for ; Wed, 25 Oct 2023 22:31:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1698298302; x=1698903102; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=f1xnsDhYxoGq8Q7UUWBB8Cvz7zbisEXPmyyhu/S5S0E=; b=Xm2zPg85WSbfHiYc68b/h4SqPGdnWUrMnJEXybgpTf/xxaObOzH1yF1KvQzwV5PWo8 QcKSNqJRSEBkpnSDngfZw+r7oGJ85vBEucBsvSE4kFOr0oSZlNbty7YSqYGlDCdljmxv hW9FKiMye2ypWvCiDcGZ5k2lL2P0zrO4azXplTXw9QfY1noD5kisLD4NjLt0uFEVBMZO T6eCL46JI2wMvoMbcDHIVblyTS+AqA6ur/Zo4fM3qE+lZIDQrEgLHofxleYOjWuXPw4F jzys78/BmTbWq/tG3gR3DBsIaU8STvsOfCSpK9e/9ZBijUIj7NT3rMLrxn4SXSQxh+CG v0dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698298302; x=1698903102; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=f1xnsDhYxoGq8Q7UUWBB8Cvz7zbisEXPmyyhu/S5S0E=; b=lv+baN1Rm0cHC57lwMzZjDNSU0MR3HuWdEEWN7bN2qYorMs3Hxwxsls59eaUM6AwLh /x2QanDamW4IHjWD7vDgGgWtSpzyeUEnmgozemN+uV+qYg9s7CdMYGPRV/za+sKWb65b SQeeABEOvbR/2w3P5QzaQnjVTnmY0/bZHWLAbJLjO2fGCotz2bUT2yrdA2WlTh0XpYoA Ltx33gC4HsHxterTdHs+RiQW2pBCj1zMgE1xaeQlK/jPO4XSmbfdwjOS+Z7cA+1HO+/V zMGeJ2PcSQWBfPnbGFwcZFiHlaDLfTnhetMDg0BN4MeVq22hfzzR2F/RGB3hQBUW3GGq 8+NA== X-Gm-Message-State: AOJu0Ywuj/Exx5WgNC4a/SORXrAeiaC1h+v9CuZooECin7xSx6Z5I8w0 Lk9/duK/IEurWEK6hD7G0oF75g== X-Received: by 2002:a05:6a20:a10c:b0:15d:f804:6907 with SMTP id q12-20020a056a20a10c00b0015df8046907mr21131824pzk.0.1698298302260; Wed, 25 Oct 2023 22:31:42 -0700 (PDT) Received: from octopus.. ([2400:4050:c3e1:100:bca9:3af7:89e9:80b7]) by smtp.gmail.com with ESMTPSA id fa13-20020a056a002d0d00b006c06804cd39sm440715pfb.153.2023.10.25.22.31.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 22:31:41 -0700 (PDT) From: AKASHI Takahiro To: trini@konsulko.com, sjg@chromium.org, xypron.glpk@gmx.de, ilias.apalodimas@linaro.org Cc: jbx6244@gmail.com, u-boot@lists.denx.de, AKASHI Takahiro Subject: [RFC 10/13] net: tftp: remove explicit efi configuration dependency Date: Thu, 26 Oct 2023 14:30:49 +0900 Message-Id: <20231026053052.622453-11-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231026053052.622453-1-takahiro.akashi@linaro.org> References: <20231026053052.622453-1-takahiro.akashi@linaro.org> 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.8 at phobos.denx.de X-Virus-Status: Clean Now it is clear that the feature actually depends on efi interfaces, not "bootefi" command. efi_set_bootdev() will automatically be nullified if necessary efi component is disabled. Signed-off-by: AKASHI Takahiro --- net/tftp.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/net/tftp.c b/net/tftp.c index 88e71e67de35..2e335413492b 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -302,12 +302,10 @@ static void tftp_complete(void) time_start * 1000, "/s"); } puts("\ndone\n"); - if (IS_ENABLED(CONFIG_CMD_BOOTEFI)) { - if (!tftp_put_active) - efi_set_bootdev("Net", "", tftp_filename, - map_sysmem(tftp_load_addr, 0), - net_boot_file_size); - } + if (!tftp_put_active) + efi_set_bootdev("Net", "", tftp_filename, + map_sysmem(tftp_load_addr, 0), + net_boot_file_size); net_set_state(NETLOOP_SUCCESS); }