From patchwork Mon Dec 18 02:38:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 755456 Delivered-To: patch@linaro.org Received: by 2002:adf:b181:0:b0:336:6142:bf13 with SMTP id q1csp675297wra; Sun, 17 Dec 2023 18:39:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IHrQ57dPL0JPvnB2I0yqhSgxQsLk/X5c6JjUv3Cip4Vdnfhd98FtOEzy3JkhhnwzQUD1OGv X-Received: by 2002:a05:6000:1285:b0:336:6834:625f with SMTP id f5-20020a056000128500b003366834625fmr353609wrx.73.1702867177419; Sun, 17 Dec 2023 18:39:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702867177; cv=none; d=google.com; s=arc-20160816; b=ZIMVwZc6hE6vCZfkFk/LBjhzhEhqEySUaCfArQ4TRLeZBMFResMtmkDFwC+fwQw1VX lbH+HT+lPmLJZUY3oSJPFENhbNDPTf0u+elqJ+zb9i4vKGe9AVytRGqA2xjAG5ZAUMjO +6p+vnuRu2cKftY3aLygXscaJpaqOg8YkhAbMFYihc97sDSTdEQH0ea1tjf0Gv+32Q0a fb4UnZaYEiMWyp9KcYLCWHxT1NQZxAaBDv5rZPhMmQ5WxXCQ/ZOP0WLBiONc9yZzRI/X G/DEMnvMN0a5FiHZJkOO1zyQ6DB+0RqHVEm1JIDqA2LxiwZSoxsAo0HZaEKN/4/jX0Qd Sa8g== 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=p8OTi/tJSbfUA0ykVxDxRCnpqUhQqJazFYHXT9edm5U=; b=YK52Pn7T5TN5N8UZWmBqzIdmfcVVy4XZRX3euuQKwc/WilQ2paFUrbbBzfe0w14FEC dd3KFZrOEzIwdQ3KrUCfL2vCXm8vy5aMcNyMdOWrvTHxwgK8+DYA97KZ7BUYo5moEnsa QNZj6CftHhtvrh61sro3GFKlWEjm21qh6ourNhl+n3aT4rItvypejix6xhlTTY6N7pEM 2qzXkcjXoNtnzvaHCwyYTHTdUaRroIOUeqD4fsc5iaiC1MmaqzcUjNiGaX9jmYbAZ2oI tnO0UXXU5BNl2K20v/lQv7edjrwlOOn+hB/e5qjHkAh4HHZl4zggYbvHuf8eYSVBHNkK kBMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wFAIZSjM; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 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. [2a01:238:438b:c500:173d:9f52:ddab:ee01]) by mx.google.com with ESMTPS id s9-20020a5d6a89000000b00336535dd5bfsi2800724wru.525.2023.12.17.18.39.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 18:39:37 -0800 (PST) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 as permitted sender) client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=wFAIZSjM; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 2a01:238:438b:c500:173d:9f52:ddab:ee01 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 727EE87DCD; Mon, 18 Dec 2023 03:39:15 +0100 (CET) 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="wFAIZSjM"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A253987DB2; Mon, 18 Dec 2023 03:39:14 +0100 (CET) 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, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) (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 6E21F87DB2 for ; Mon, 18 Dec 2023 03:39:12 +0100 (CET) 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-pl1-x636.google.com with SMTP id d9443c01a7336-1d2eea4af93so6580295ad.1 for ; Sun, 17 Dec 2023 18:39:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1702867151; x=1703471951; 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=wFAIZSjMCOZ/dwX8o0+ioKX1Slx3gu2UYUMW4NO+syIDLBINFJJ8S+563pkLltdhaA dbQj/GdprEH6k/hX6XDDdBQ+ALogj7bWt6kAqKEsS1hEFToAHZcZ2gJrf8UOmxE0UFPL /oZVh0j/kdUBbnzAlKTpFwki4B6K7hZuY6Af1H42lNMpDVVbprXlhMbjgcAe9Rp3nB+G NuQpcFIaPaiN/97bCTjQKv30MspiAFYYEYcJLkbyJL2seFwLhcFVxSONJcRgBGmoT+9i 9QugaRlIBGKKx3QZ+zmXEiiaAugPUAQ7WWvOr5Z5hNIZwy1AbahwxRuKC6vDOTIlqLVr u9Ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702867151; x=1703471951; 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=bu2lKoSXNWl4N8SJFVlH0iFLN0ELsvfa/VnkQkUIKwGwfY5EgIuVCnhLpAMDSzVE7L YUpim/6aDCyIq+IlgHLjpBP2/k3jNiXgV/YLXgIlLRjTpno9IZwy4v7MpmS0TMRoWPsF WDCT/28Adhi3uoBmtMmyCgNNA4+9DqpcZngNvCB+GT1V8oAi/sdHvc+T4M4P3PbmKd9H 0QweJSgLBS6FJDjZlQxJDFWfQ6SA4QBwSYN71LwNxFCxE0YwofYGeqUnWq7stWG1jH5s RwLdP6cK/xlCUm8h2x0JkMaXkLsXjBCn8AxJngTEjeVYaQJMAQB7VWeljc8TQJvCaGBj grRg== X-Gm-Message-State: AOJu0YzrMb3LRSIRTNKry57Rm1Fb65jDbHRGTmecmNixaxaQqwgbMCvK nPHBr1tR5xsOv0N8/kWLYKJbYg== X-Received: by 2002:a17:902:b201:b0:1d3:6420:4361 with SMTP id t1-20020a170902b20100b001d364204361mr15032444plr.0.1702867150783; Sun, 17 Dec 2023 18:39:10 -0800 (PST) Received: from octopus.. ([2400:4050:c3e1:100:a448:a260:721d:a9f0]) by smtp.gmail.com with ESMTPSA id w24-20020a1709029a9800b001d316770044sm13754305plp.56.2023.12.17.18.39.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 Dec 2023 18:39:10 -0800 (PST) From: AKASHI Takahiro To: trini@konsulko.com, sjg@chromium.org, xypron.glpk@gmx.de, ilias.apalodimas@linaro.org Cc: u-boot@lists.denx.de, AKASHI Takahiro Subject: [PATCH v3 3/4] net: tftp: remove explicit efi configuration dependency Date: Mon, 18 Dec 2023 11:38:41 +0900 Message-Id: <20231218023842.281336-4-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231218023842.281336-1-takahiro.akashi@linaro.org> References: <20231218023842.281336-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 Reviewed-by: Ramon Fried Reviewed-by: Tom Rini Reviewed-by: Simon Glass --- 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); }