From patchwork Tue Nov 21 01:29: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: 745679 Delivered-To: patch@linaro.org Received: by 2002:a5d:5052:0:b0:32d:baff:b0ca with SMTP id h18csp1628901wrt; Mon, 20 Nov 2023 17:34:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IERCpAfm03cBWyEmtWSVUt02bZf3/c//czYdDpy8JjhoilENtvXDpc7S/S8yfSX/kp0EIqb X-Received: by 2002:a05:6402:1612:b0:541:2476:d23e with SMTP id f18-20020a056402161200b005412476d23emr798998edv.28.1700530499000; Mon, 20 Nov 2023 17:34:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700530498; cv=none; d=google.com; s=arc-20160816; b=ZpN5ADzHf5UjrHBKI1sq5yjkdSb0u88zZd49SIuRwTFNUiYnw/Sd8h1koOlgRd9DXt 2CZ+lx46bi+4KPHluO/4pPcR6f2KBONycOiyQTeCJzME0wKHQ3s7rOV/opIh15LCTe83 b0evvDCYbdZMwUZ1iGaVXf6DvlEqSzrU7Kpc4HSlH7KAQtILjXVql2klz7mXocGuq5xM qMV/VZo25Jr8z51CpIXHy1S/N6ViLq7gIeoD5nAZuIu4wLL4cnIBzsOjIZWPne9Ye2sh b+dbEnEQCaT5MRGOzVxZWYc5ABxMRsKYhlJRXZ7XM9RfgNtcZ4ynxYzpr8CxPFwDFVDe XwzQ== 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=qweuUfL32vz5fXOBhnzQXyogJBSTZZwLNkHwYWWwNCP5bA6A0uqs8lZI6g38U8AbnM 7++bmH6cSXBoe/WQ2tN72j8n3P0XzRMgbVLK5alnqDsb0Lgew+mpkgGZyQd6fr/MUvwW zRkT84DzTpprSh0UuAz6YDK+pY5LaK9/fWOo4w4P2b9k1/WReWDTanEtYgb3dR9ri+xY qmt/0CI/bqnFvf8cHQ9B1LbWWT/0saYLUS7/xB9g06ilcRfqYrbeLJQ+MXXsj3GA8Qpq tpKgFCmWTpi56gFkJYHIuaIvOk2UDn812BMiZQPa2lKeacTEszIaC898pQUuEeMJDxJT SOKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=oNAkHz+V; 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 y15-20020a056402270f00b00548c748de9esi1368238edd.278.2023.11.20.17.34.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 17:34:58 -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=oNAkHz+V; 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 C4281875D6; Tue, 21 Nov 2023 02:32: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=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="oNAkHz+V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 52379875A4; Tue, 21 Nov 2023 02:31:39 +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-pj1-x102a.google.com (mail-pj1-x102a.google.com [IPv6:2607:f8b0:4864:20::102a]) (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 3ECDC87596 for ; Tue, 21 Nov 2023 02:31:21 +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-pj1-x102a.google.com with SMTP id 98e67ed59e1d1-28399608b7aso837568a91.0 for ; Mon, 20 Nov 2023 17:31:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700530255; x=1701135055; 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=oNAkHz+VXft4CccPHHhAlmOkmi5SXPPg5tL+CekyRQEiV7QvAp85UQjUdMzDKSyb2B aqwB/eh70FLgQtbMA/kdlcJFyBuGlqqImHyagU7ANw8YmBESLZh8qtW9MjwVOcqlLV4z woK2IAlBpxVGt/npWlbgQmygKYiQVmbcYczE9ayFl+qgPUDz+z3knxHFQSW6h5ODe3+9 Q6Ou8DefuAloGkFbzoxep9P7AYo6Cx7BCtEEaaoZnRBs01d+dR4kPoL6g2r3SKLuJnHh 0ibnN/N9A3EKQOUIHugcwj3UAj9+LX8kUH2rcmOmsTKTjV2PlN9LjFcfS0ahSL/XomRa uGsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700530255; x=1701135055; 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=truX3/WEcgsqYz/03LuLUpdi68LYmRwz7jEER46ssQoG0JX03ras5dLsdJXsj7tLtX 97kumDH3iQw0JBqbQepSv3GDhDDg31xYLvbqtcLk8elgwbqUX5990lfp2IJ3HNbPfJmG vCNAt512Io0cMVpi7wIZEkQsIm16q5i9MM+nT+l2i1arhl/q/tiNxAk9g0PzY1CAwcZE xgtdHe26rYM8b/5izGlOsbbO3z1UKoRBzbGIKMsKM3EuiJH3pyAJ5mQEZXA6Oc1YE3xJ y0+MYmmbcKT3YGCHf9ZfIUw26TgtxNkMEOVDQ+64QbIbZe/zhoBmo9V8OYy/+VzAqvSP hQZg== X-Gm-Message-State: AOJu0YyMzf822tkDoN60uMFkIqwt4NV79CUTuO9O8JcIpTG5Sp/EkyFL q7CcCMwbdGybQBErlxu8tXHnKw== X-Received: by 2002:a17:90b:370b:b0:283:27b6:f33f with SMTP id mg11-20020a17090b370b00b0028327b6f33fmr9339851pjb.4.1700530255623; Mon, 20 Nov 2023 17:30:55 -0800 (PST) Received: from octopus.. ([2400:4050:c3e1:100:f6af:a59c:7ca:897f]) by smtp.gmail.com with ESMTPSA id e9-20020a170902d38900b001c8a0879805sm3612508pld.206.2023.11.20.17.30.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 17:30:55 -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 v2 11/12] net: tftp: remove explicit efi configuration dependency Date: Tue, 21 Nov 2023 10:29:49 +0900 Message-Id: <20231121012950.156539-12-takahiro.akashi@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231121012950.156539-1-takahiro.akashi@linaro.org> References: <20231121012950.156539-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); }