From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A4F38C636CD for ; Sun, 5 Feb 2023 22:50:00 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id AC0FD85A4D; Sun, 5 Feb 2023 23:41:52 +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="fQhMx7aj"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id A92FB85A0B; Sun, 5 Feb 2023 23:40:24 +0100 (CET) Received: from mail-io1-xd2f.google.com (mail-io1-xd2f.google.com [IPv6:2607:f8b0:4864:20::d2f]) (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 B77DE859E0 for ; Sun, 5 Feb 2023 23:39:46 +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-io1-xd2f.google.com with SMTP id y2so3887827iot.4 for ; Sun, 05 Feb 2023 14:39:46 -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=hTjQquWv0DxYCK/VB8Zc7uty8n+vjRKbq+TP67SouoU=; b=fQhMx7ajml6X7lZSzpS/6l92Tq5x2GW7lvXZtpy0yx/axBGDfB/oAEqgWcLu57UNGL gOaGhua80sWx6wC7qc0LeDHZSF+MtCf/dh5RCRgF6FV0NgqcM1+8hDjrRUalNIWkMHlx WX2nLExftDJ692Hcuno8DOIQpQWrGTr7OpGq0= 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=hTjQquWv0DxYCK/VB8Zc7uty8n+vjRKbq+TP67SouoU=; b=VrDXFjqhNM+S3wgSxj1epViQEfjY6NC8W6hVyRKqL/nswOafHS7lrZMOSyBeFZhulI M/P0ECjB0TFnnw/rIA1+P9OV+ZIyI9Pbk9eXt0xgiHOsEuitHN3gmpoCUKZzMnm0d/vB ELU9XMxXCr94DvYIVndYEEs6VPnCieyArwJ0QC3xwbM2bC/JUcgsRD9vz9kBZrw4iGs1 wsHTJTUVu4JodrTfeBelaPG3p4BqRmKpHP231ZdvR4RLqvKO+rs8e2uVIW10Yrt52MpV 79kD8u6+Uw9fXOotLkdtNOeI/uvNzbOIJV18RF7L9wyEPFTtvn3tP5buKGl1SEXL30db dU1A== X-Gm-Message-State: AO0yUKXDogoc21suz/O94CcfcdfSTNvGciUOraYlvm9Dh/WzNHMfGUsB /u+zECtAV3txuxWBRRplIrOTIMk/15/7O0dF X-Google-Smtp-Source: AK7set95iT5ceDsnUf6T4rC7h51IwzHb9QUgjtWUL2faIr/KIA2DNSvgczFtC5kc1NN1JpbNCJP0Uw== X-Received: by 2002:a5e:851a:0:b0:722:19dc:deaa with SMTP id i26-20020a5e851a000000b0072219dcdeaamr10998697ioj.10.1675636782083; Sun, 05 Feb 2023 14:39:42 -0800 (PST) Received: from sjg1.roam.corp.google.com (c-73-14-173-85.hsd1.co.comcast.net. [73.14.173.85]) by smtp.gmail.com with ESMTPSA id m40-20020a05663840a800b003b49e7d990asm2856393jam.30.2023.02.05.14.39.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:41 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 059/169] Correct SPL uses of CMD_TFTPPUT Date: Sun, 5 Feb 2023 15:36:45 -0700 Message-Id: <20230205223836.231657-60-sjg@chromium.org> X-Mailer: git-send-email 2.39.1.519.gcb327c4b5f-goog In-Reply-To: <20230205223836.231657-1-sjg@chromium.org> References: <20230205223836.231657-1-sjg@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 --- (no changes since v1) 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 { -- 2.39.1.519.gcb327c4b5f-goog