From patchwork Mon Jan 30 14:41:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 1734106 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=85.214.62.61; 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=Tdvs23fx; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 4P5B8p6JX8z23hS for ; Tue, 31 Jan 2023 01:56:42 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 34F43857F7; Mon, 30 Jan 2023 15:56:31 +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="Tdvs23fx"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5AB2585835; Mon, 30 Jan 2023 15:53:48 +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=unavailable autolearn_force=no version=3.4.2 Received: from mail-il1-x130.google.com (mail-il1-x130.google.com [IPv6:2607:f8b0:4864:20::130]) (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 1F7B18584C for ; Mon, 30 Jan 2023 15:53:20 +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-x130.google.com with SMTP id l15so1363514ilj.5 for ; Mon, 30 Jan 2023 06:53:20 -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=gJSIY/ytXdt6YlcPrkPCJ9kMHSfq1yd75Pt5Sg6obnY=; b=Tdvs23fxSTyB/lJtldhG8oXYsCNC+lbJvk5llgCxOv3C4uPYXn+fE/WCAYX3QhiuPG bGswBEHAaAZLdjr4FF1QqxYkGYhzb4AFPOl2xItAN2WZH+RssGfoS6TStijs9f7dqWR2 jF4MCRvxsSUvPlIGg2kiOo1Bdpo69jYOG6eRU= 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=gJSIY/ytXdt6YlcPrkPCJ9kMHSfq1yd75Pt5Sg6obnY=; b=BlFj7nW7nGckbEM9fL9+v++GMa2WqMkhy+uCzI0svxkRaxVu+C3IKiRJMI06JXH7O/ MaTJ4DS/AxFwWYm5bpa/YAJHzQHH0jYoZqYFvQ4WafG0hTe2PAeksd2ID6Jh39dhTWFJ 5Spu5mT8YyekTYT7WOCYtbUyDfMqRh475y3cq7ndBsI46FGtYn8q86XfEBfZugvAixqz /sdU16rQY3ads7w4LFcJmhXwpTNkPiBYRqHrxCr5ZUvcXhiS+rHyVHY7x77PbtG1rMu8 sdtyfy9GDxY6mYc6y1+i77ywze4eHUyT7q5d6Lfoc/w5ZAVRGpiYFByqXaw3ORdZNXpy uFaQ== X-Gm-Message-State: AO0yUKXeWbX/vmBMaJrynQIB+m79hmI9Oed1TNxXt3GUDdUpbw+w5dTh ft/HtxO0/EtGWPynpt7AVTn6+a0VDC1CVW47 X-Google-Smtp-Source: AK7set+ue0bh1FDWQL/MOVwijn1lCfBpJix5hB9LtEMusafgjnZu8mLX9VQoObrXIC7G8dpQVuQ0pQ== X-Received: by 2002:a05:6e02:1a8a:b0:310:d237:793e with SMTP id k10-20020a056e021a8a00b00310d237793emr9661537ilv.13.1675090394840; Mon, 30 Jan 2023 06:53:14 -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.53.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 06:53:14 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass , Fabio Estevam , Kever Yang , Matthias Brugger , Peng Fan , Peter Robinson , Philipp Tomsich , Tuomas Tynkkynen , Vagrant Cascadian , "Ying-Chun Liu (PaulLiu)" Subject: [PATCH 043/171] Correct SPL uses of CMD_DHCP Date: Mon, 30 Jan 2023 07:41:16 -0700 Message-Id: <20230130144324.206208-44-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 7 usages of this option to the non-SPL form, since there is no SPL_CMD_DHCP defined in Kconfig Signed-off-by: Simon Glass --- include/configs/am335x_evm.h | 2 +- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/j721e_evm.h | 2 +- include/configs/qemu-arm.h | 2 +- include/configs/rockchip-common.h | 2 +- include/configs/rpi.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 1f473b5a150..60006173c0c 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -59,7 +59,7 @@ # define BOOT_TARGET_PXE(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) # define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else # define BOOT_TARGET_DHCP(func) diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 2641d7bc960..6f34b79e0db 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -50,7 +50,7 @@ # define BOOT_TARGET_PXE(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) # define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else # define BOOT_TARGET_DHCP(func) diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index d4ab6a6207d..86311ee862b 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -53,7 +53,7 @@ # define BOOT_TARGET_PXE(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) # define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else # define BOOT_TARGET_DHCP(func) diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index a7210b5cf3a..f72b31e1d63 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -155,7 +155,7 @@ # define BOOT_TARGET_PXE(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) # define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else # define BOOT_TARGET_DHCP(func) diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 45bd94ee5c7..8289e338f6a 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -60,7 +60,7 @@ # define BOOT_TARGET_NVME(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) # define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else # define BOOT_TARGET_DHCP(func) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 0b23e4c0433..4b849134d12 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -44,7 +44,7 @@ #define BOOT_TARGET_PXE(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) #define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else #define BOOT_TARGET_DHCP(func) diff --git a/include/configs/rpi.h b/include/configs/rpi.h index c3f8e7bf85c..ffbf4347658 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -143,7 +143,7 @@ #define BOOT_TARGET_PXE(func) #endif -#if CONFIG_IS_ENABLED(CMD_DHCP) +#if IS_ENABLED(CONFIG_CMD_DHCP) #define BOOT_TARGET_DHCP(func) func(DHCP, dhcp, na) #else #define BOOT_TARGET_DHCP(func)