From patchwork Mon Jan 30 14:41:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734175 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.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=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.a=rsa-sha256 header.s=google header.b=dSuLj7nw; dkim-atps=neutral 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 ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P5Bm75Px8z23hg for ; Tue, 31 Jan 2023 02:23:51 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2AFD8857EE; Mon, 30 Jan 2023 16:20:28 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="dSuLj7nw"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 80B4B857C8; Mon, 30 Jan 2023 16:04:30 +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,DKIMWL_WL_HIGH, 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-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 302DD85518 for ; Mon, 30 Jan 2023 15:55:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=sjg@chromium.org Received: by mail-il1-x131.google.com with SMTP id l15so1366360ilj.5 for ; Mon, 30 Jan 2023 06:55:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; 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=QMLkdCYTxc0urqn5atQipR+CVY5K+EqNe2fLhI8lC8M=; b=dSuLj7nweKdX7Q+ka815tgkdY+sHB/wjz0gFtM1H1Hc24sUtjj9VpR69N60Pip0SeH 5k0FFEsUAQdjChX3XLNetk6dVLewjVurnmu/BD02XTsWwNmkmiRWTekHD+1F/wDa52ON ivnucIVGbtqeRW0vKPxyjdaNXNlZxr7hwcKPQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=QMLkdCYTxc0urqn5atQipR+CVY5K+EqNe2fLhI8lC8M=; b=03vRhUtp0Y7vYs4U3kz1UxVhYQo3MzYdcLPIGDYEi8V7NytDcS899E7U0c3PpIkbQ7 XYR+kBTPvcgv+FGfAwY4Bfh1yn8uwURc5VxqcllAwfVRNlGd7mn2JNDB8RIKQoCo282A bf//yVnjXi8TpRyOtHu/gmmgFuMupdk+y/HN8SY7zPHZ9KOlxb/m/AvZl2PtiIqm9X4D QtKfPYeRrpbRg1BNGM+OylBmj/s89/MWY7bp4Kc7nfz6c/XR8tRSn2IS4cJbD/AH8PYp zx6a8BNvaF9JTP0EhWN52XguOTap/VqC6JZGnj2LdKf1PiCKOEZez59LbvxS2B7tN0IF sKgw== X-Gm-Message-State: AO0yUKUyQmZzxtj0k7sqLQwwHKEXZUwl7d86REVOFcJFYEQTt8PM61f6 J87K92a7WEgggnV9yaZJH7wjDjvV8gHgqwec X-Google-Smtp-Source: AK7set/R8jzLB7N/24A7JCdu2SrfqmmTs/n1rK6yVntTnRGyqCaWq+fRdSQWsp3NOb73JsuJRLjH9w== X-Received: by 2002:a92:cda2:0:b0:310:ac47:82de with SMTP id g2-20020a92cda2000000b00310ac4782demr15200348ild.2.1675090524477; Mon, 30 Jan 2023 06:55:24 -0800 (PST) Received: from sjg1.lan (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id g18-20020a926b12000000b0030bfdb6ef60sm4008830ilc.58.2023.01.30.06.55.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:55:24 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Heinrich Schuchardt , Joel Stanley , Ramon Fried , Samuel Mendoza-Jonas , Viacheslav Mitrofanov , "Ying-Chun Liu (PaulLiu)" Subject: [PATCH 061/171] Correct SPL uses of CMD_TFTPPUT Date: Mon, 30 Jan 2023 07:41:34 -0700 Message-Id: <20230130144324.206208-62-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog In-Reply-To: <20230130144324.206208-1-sjg@chromium.org> References: <20230130144324.206208-1-sjg@chromium.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.6 at phobos.denx.de X-Virus-Status: Clean This converts 3 usages of this option to the non-SPL form, since there is no SPL_CMD_TFTPPUT defined in Kconfig Signed-off-by: Simon Glass --- cmd/net.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/net.c b/cmd/net.c index 4227321871c..d5e20843dda 100644 --- a/cmd/net.c +++ b/cmd/net.c @@ -280,7 +280,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[]) switch (argc) { case 1: - if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT) + if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) return 1; /* refresh bootfile name from env */ @@ -289,7 +289,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[]) break; case 2: - if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT) + if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) return 1; /* * Only one arg - accept two forms: @@ -311,7 +311,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[]) break; case 3: - if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT) { + if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) { if (parse_addr_size(argv)) return 1; } else {