From patchwork Wed Jan 10 01:16:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AKASHI Takahiro X-Patchwork-Id: 761426 Delivered-To: patch@linaro.org Received: by 2002:a5d:6e02:0:b0:337:62d3:c6d5 with SMTP id h2csp1650887wrz; Tue, 9 Jan 2024 17:17:38 -0800 (PST) X-Google-Smtp-Source: AGHT+IEyOp+qam+jPVcEs7Hj4JCTXRkLxhnFe2qsNkitZbb/nFaYHk0PW5YVWEMek+CZC61SQpyH X-Received: by 2002:adf:dd87:0:b0:336:ca4e:973c with SMTP id x7-20020adfdd87000000b00336ca4e973cmr108466wrl.86.1704849457984; Tue, 09 Jan 2024 17:17:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704849457; cv=none; d=google.com; s=arc-20160816; b=rGtIa+BkFHo9yx0hZprXVWvwhPyiBuuyQKRKb4P5qHVuIYsryf3aYwIIKDuN8NuaLJ wnpHDnBVxsalpPB7Em40zjU22t9gJlTBXKH1tEKYoO6Zq/0COUmeBS+hmC6pWHoPDfyJ 0ldY8mVX5/oZsp1ugGBD5JfsArWkJa2NWbglc8kddmT3amFGyy3ldROTvV5O8WYnF9ww BlYlp1Qcivwq8+FbgbhDAI3HpgHTnbqA6VjweKnpGI7EfVlTfpmVuvFJGhB3yk2xCpDY HTYqUIzRXTO2PN/QUHlKryKH8qPbv8vf3vhcLIqk2zbbzDIrdFjnriHPMGqlWeYIOYwY oxPA== 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=3MpDZAKW0GtvfJUZzRZqB7/dnvoYqSper+30bo2fhw0=; fh=jAN7htBPgV4UUJtkXrb4SZb7EDzzdM8y5IGcm9mHsm8=; b=pzQJEDKuoPitgkz6y5+ZInnJR4k6FDdRREN2yHKzSn61PkHI677SmjGjxqu/9CUGr6 KgLGQ4bjMQKS1R3zZEXyr+YLio8bmcbz/tswyuu5psoXDawjqrpCzIFZyHGbNRGCKQCF pVe5K9vYHedyvWZS0g7CTqWz58npvz+utejLwBvfYdky+FRbapkuiMb81teEVjMt195G SLqtquVSqsu5kx0prnC8vzgq2SksdSRk9+T0HmUnSrFyhFdYSF1IRrhauFjE6ySMhdiE ZrH8LMlJcNXqdsdWcwU/hzVL1/zny7+0nxwI07ntxDRLLD239E1wH0LslK9mOxUIaScT 9oHw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=bIvCe0lk; 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 b1-20020adfe641000000b003368c8d1216si1495080wrn.770.2024.01.09.17.17.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 17:17:37 -0800 (PST) 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=bIvCe0lk; 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 0BC0A87A7B; Wed, 10 Jan 2024 02:17:10 +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="bIvCe0lk"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 67F7A87977; Wed, 10 Jan 2024 02:17:08 +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-ot1-x32e.google.com (mail-ot1-x32e.google.com [IPv6:2607:f8b0:4864:20::32e]) (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 87362878F5 for ; Wed, 10 Jan 2024 02:17:01 +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-ot1-x32e.google.com with SMTP id 46e09a7af769-6ddec302e68so118824a34.0 for ; Tue, 09 Jan 2024 17:17:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1704849420; x=1705454220; 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=3MpDZAKW0GtvfJUZzRZqB7/dnvoYqSper+30bo2fhw0=; b=bIvCe0lkpoL/ka8Cezd/sjEzCWD23+o20w0YQ0wf4hsOL816PG2JgRR9jZIXUDw5c4 HsOXzZnGEHR1JTSyZuzC4xrBGxQDrCBQc0zlUcl/SGv67eXLpTkPk5gjLqrAtO85l/h1 0i/FyxVU79twEvoGaBxJtbk3X66rVgXFbKWO0sGLyy0G5xqy+LTAdG3e5YJyE+U2odQJ cYgjBRxeHlDRY2F4xyAdphsYuU7SGWI9yObVngOWrluzbNyWEsbxOIvvR5ta2jI/NnQu BaDWafZ+0fBYIjvg3TBnX8gVGIfCwc9BjKnRbc4yQD6HcKz4N/OdNQZQUM7rSQINufgZ 5Svg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704849420; x=1705454220; 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=3MpDZAKW0GtvfJUZzRZqB7/dnvoYqSper+30bo2fhw0=; b=cSmgsU3mxgAL0uV82YOL9sAImiuhwkgj3q5L28Q4OHCmIVZjjSaWQtOTVJY36W/EUg wAYfM+IomLuKq/oGs6cZIxWDf7sUNriR0x37md3lIwPSMxTSVIpklsyPf6xFeF3faEZz xsVKIGsg6DRvkKrTWcs/F0lZOLVAV0o3lF587got1An/b8AQgAVKIGS6tsmEX0wWlDCd i7hr5LEU64TtKgzN6dlMgugPae8k7myTkF8PUx9TgODiOqPSidibcZ29LPsgrUX6fF/F vN2NWfRtBuPgn+JZu98DG9S4XipvS+LwqE8U6CSw7na4XFjHvWsosLScSG5o/XsJuIxP onIg== X-Gm-Message-State: AOJu0Yylr3qJQseAEfgRLYRusYmabgQUmOrCcATn1R4XEnX8PoZQXaWg 2FI44f4gz8kZLXe58dVaP4cJV1AExtI35w== X-Received: by 2002:a05:6830:448b:b0:6dc:12f0:cb38 with SMTP id r11-20020a056830448b00b006dc12f0cb38mr633717otv.0.1704849420161; Tue, 09 Jan 2024 17:17:00 -0800 (PST) Received: from octopus.. ([2400:4050:c3e1:100:e32c:1ab8:3100:c37f]) by smtp.gmail.com with ESMTPSA id a36-20020a634d24000000b005c2967852c5sm2166833pgb.30.2024.01.09.17.16.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 09 Jan 2024 17:16:59 -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 , Ramon Fried Subject: [PATCH v4 3/4] net: tftp: remove explicit efi configuration dependency Date: Wed, 10 Jan 2024 10:16:36 +0900 Message-Id: <20240110011637.174710-4-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240110011637.174710-1-takahiro.akashi@linaro.org> References: <20240110011637.174710-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 --- 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); }