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 4D74EC636CC for ; Sun, 5 Feb 2023 22:50:32 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 014A485A56; Sun, 5 Feb 2023 23:42:02 +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="h/BEoU9D"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 738BD85994; Sun, 5 Feb 2023 23:40:17 +0100 (CET) Received: from mail-il1-x12b.google.com (mail-il1-x12b.google.com [IPv6:2607:f8b0:4864:20::12b]) (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 AF48F859CD for ; Sun, 5 Feb 2023 23:39:37 +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-x12b.google.com with SMTP id j12so629360ila.1 for ; Sun, 05 Feb 2023 14:39:37 -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=FLRDREwFMXVb/OmIH4fal6ur/Kz2ivpYQFiD8183Ms4=; b=h/BEoU9Dm95jXUsKSfxYyJshJrrShf/L3Gy2Ax23hU4OGtNVEDzKPNddlit+gx4Vjw EwXiAe9MSPuiiPiOL3WDn2WfC/QanPia08UafgLTn0mT6hdZmBQeHcHoW/wRAySiDAaO FGGCyHKC6BewV6hkUZZrJeeO9AqSor2t0oUSA= 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=FLRDREwFMXVb/OmIH4fal6ur/Kz2ivpYQFiD8183Ms4=; b=8BUgA2EpEcYRwXqsX6EKNOPMDk2zp1qWpNRyFKRB3rApfo0JTSJBhZRu2qX55it6r3 zm3E3yi0LpTaO5YfClqC1GHwktDJxyKJZ7/w8d8ygcyfqZPlWw7y96h457yJitB/zDtO tVB/q4L5NiKnCozX4Wr4cK757PsWrBgQuf8GO5OQNSYYXOB/q9xG/Bp80V/BkJ4TpMuR Tkp8Cr1gicvcTpH2Vi71D3LaNh8HD7IU1fXflDm2o/ko8d7VFteCMQtpI3z9Wb9kQ55T 4daLAiN6JHAmVIa8osdvhxYUEws7vsfcPBxZEnHN5tMiqBVX7lw5g1EzqGyZ+qtgJQ8u 22aw== X-Gm-Message-State: AO0yUKUUF00ufxJjCd97aLS0aPfaruRI35q3vMUWDESKvKJaQlygRD7y vEFu2I44fcjnB2QKFHFRt5srE6cgbdaRxFhR X-Google-Smtp-Source: AK7set9vmQrj5+/1jaqrOYpqFna3x/ZguD02mi0YhCCrVYNayNPXFLKUcSxBzSIdaw+BkbseZiTXqw== X-Received: by 2002:a92:c546:0:b0:310:f694:a882 with SMTP id a6-20020a92c546000000b00310f694a882mr14659916ilj.13.1675636777238; Sun, 05 Feb 2023 14:39:37 -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.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:36 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 053/169] Correct SPL uses of CMD_PXE Date: Sun, 5 Feb 2023 15:36:39 -0700 Message-Id: <20230205223836.231657-54-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 6 usages of this option to the non-SPL form, since there is no SPL_CMD_PXE 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/rockchip-common.h | 2 +- include/configs/rpi.h | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 60006173c0c..d66614598a1 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -53,7 +53,7 @@ # define BOOT_TARGET_USB(func) #endif -#if CONFIG_IS_ENABLED(CMD_PXE) +#if IS_ENABLED(CONFIG_CMD_PXE) # define BOOT_TARGET_PXE(func) func(PXE, pxe, na) #else # define BOOT_TARGET_PXE(func) diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 3a666acb736..c6d7cfbcbcd 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -44,7 +44,7 @@ # define BOOT_TARGET_USB(func) #endif -#if CONFIG_IS_ENABLED(CMD_PXE) +#if IS_ENABLED(CONFIG_CMD_PXE) # define BOOT_TARGET_PXE(func) func(PXE, pxe, na) #else # define BOOT_TARGET_PXE(func) diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index 8008631a7c0..6ebdeb0f11b 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -47,7 +47,7 @@ # define BOOT_TARGET_MMC(func) #endif -#if CONFIG_IS_ENABLED(CMD_PXE) +#if IS_ENABLED(CONFIG_CMD_PXE) # define BOOT_TARGET_PXE(func) func(PXE, pxe, na) #else # define BOOT_TARGET_PXE(func) diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index f72b31e1d63..cda2fcea0ab 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -149,7 +149,7 @@ DFU_ALT_INFO_RAM \ DFU_ALT_INFO_OSPI -#if CONFIG_IS_ENABLED(CMD_PXE) +#if IS_ENABLED(CONFIG_CMD_PXE) # define BOOT_TARGET_PXE(func) func(PXE, pxe, na) #else # define BOOT_TARGET_PXE(func) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 2e1325fc816..332338a876d 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -38,7 +38,7 @@ #define BOOT_TARGET_USB(func) #endif -#if CONFIG_IS_ENABLED(CMD_PXE) +#if IS_ENABLED(CONFIG_CMD_PXE) #define BOOT_TARGET_PXE(func) func(PXE, pxe, na) #else #define BOOT_TARGET_PXE(func) diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 9e63fe9ca96..2593edcf96b 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -137,7 +137,7 @@ #define BOOT_TARGET_USB(func) #endif -#if CONFIG_IS_ENABLED(CMD_PXE) +#if IS_ENABLED(CONFIG_CMD_PXE) #define BOOT_TARGET_PXE(func) func(PXE, pxe, na) #else #define BOOT_TARGET_PXE(func) -- 2.39.1.519.gcb327c4b5f-goog