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 32727C636CD for ; Sun, 5 Feb 2023 22:51:04 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E7AE885A80; Sun, 5 Feb 2023 23:42:15 +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="FifoWcL2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9FD8F859B5; Sun, 5 Feb 2023 23:40:10 +0100 (CET) Received: from mail-il1-x12d.google.com (mail-il1-x12d.google.com [IPv6:2607:f8b0:4864:20::12d]) (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 72E90859B5 for ; Sun, 5 Feb 2023 23:39:27 +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-x12d.google.com with SMTP id z2so4116816ilq.2 for ; Sun, 05 Feb 2023 14:39:27 -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=EKuxKMeoLxS82FMdKcg4hp4BzYJ70LbWb34KgyVOzpY=; b=FifoWcL2JHYUsfJwT9aNV6+jubNh/GGh9h8ST8BiIfn7DLaovMwZv90Gv5OHBeqWeP b/7s7kVU/GxuCM63rHfnX/lJrSAQ9+hEfAs/qRylSLSAn8meNRp2OVHFqLQ68zEDm7N9 TzDx9reMWMV/kpeIKUCX43RjrD7Ru4ash7aKs= 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=EKuxKMeoLxS82FMdKcg4hp4BzYJ70LbWb34KgyVOzpY=; b=Kn1cCXBWXDtmrXg5Y/t68rQiwdwTpmlAstOgs1cYH8ui0wh+OlxGjq7muL+BnBeba9 WtF2javQEBPhwFLHheJkBEpAix24qch6v0gU2CvlcuQfk7wxwJk0L9fRpxt0GLALUmgO QH1Ykbgu13+GwImK3bsVL26EfIG1G42TRP1fJIJ5UsGTTDdZN9lpQysrJR5lTjrNQoDj IwbB8ezdthQrsU3YMdb478ASgL5SbjKIWtcASNWvyGDTIU4x+jdxmIU4zDJsjRCkmsNI 98Uzzkqs+FXObdz7uhURNZ2lvBsB97yOm8guZIkRN8WlPMTIHS5angz3uT7xytPC9LS8 Ydpg== X-Gm-Message-State: AO0yUKUqV01xgQfVmTL4l7sxXK2AUyDnJ8j0SjPqi1iRYK3Y/GZssDLj PlVr6jpQ73U59fWyHDL/BwyYhhZzs2yFeK6O X-Google-Smtp-Source: AK7set/iJjNFpaNdrotxZPw4c+OkcW7L+piOt9mNzlH1620EYMtrIBUQO1YFd8+pHEiPNzCOK0+UCA== X-Received: by 2002:a92:ab01:0:b0:313:bcc4:89d1 with SMTP id v1-20020a92ab01000000b00313bcc489d1mr1876336ilh.14.1675636766969; Sun, 05 Feb 2023 14:39:26 -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.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:26 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 041/169] Correct SPL uses of CMD_DHCP Date: Sun, 5 Feb 2023 15:36:27 -0700 Message-Id: <20230205223836.231657-42-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 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 --- (no changes since v1) 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) -- 2.39.1.519.gcb327c4b5f-goog