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 88220C636CD for ; Sun, 5 Feb 2023 22:51:39 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A917D85A92; Sun, 5 Feb 2023 23:42:30 +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="GhmruG8V"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D024B859CC; Sun, 5 Feb 2023 23:40:28 +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 A825B859C2 for ; Sun, 5 Feb 2023 23:39:33 +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 l7so4134935ilf.0 for ; Sun, 05 Feb 2023 14:39:33 -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=EqaN7pi/drv7KJ1mSVWCJKVwHaLuu5z8vVyeX2f5C6Q=; b=GhmruG8VfRJd8656RyGQEnmzLDXmxmTEZMqoRXYMv3in5dprCDG63BPAzj5UjRLtme FDZ//PgGNPtl1xTAvFXsOC9cvegnKeaayHBe330xBV92FaDeAvLsang+YPc445vicmuC 1vAGLWcxZGxTokwtJZXKcvzNUVu8wRz31KeJ4= 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=EqaN7pi/drv7KJ1mSVWCJKVwHaLuu5z8vVyeX2f5C6Q=; b=gM8W5ib6/9q8HhNIP4Vtu6grCWB0V/BvLO8MJ3T6NOvg0mWwJGQPRR04ALNiOjjN3o kW5O9H59BKPVJVESgUwPvPR0Uq2RMcUc4RHjgK+j4+rAFTwhqNo7EhMCTF5ACAvcQXpc gAv/VNS8IasvVsXNWoIWyKk3a3dciR2PPTKRagJU6fwaD7GZiy4il5x41sZpLukXAA+z OZMd7n7q7LsaIRfZc4bB+qfKCkhWxm9BB6hCqjlFBwcy3al/Ba7rPA5doacNXj4RLPF/ TiNeeMYc1FOHku89XeEe9yqbuOx6MDm0vlVjwHtJxRikpDbEXmQageezEqTH02m67E7G vZJg== X-Gm-Message-State: AO0yUKVH5M4c6NQMslXBd8nTPlaXVfQKnU5RB//O6X4eid5dYpNNfGkk 4QxQq+fWYM31toxLF+68U9lXnKA9b6pMZNU+ X-Google-Smtp-Source: AK7set9wqge0fmmThN7JE+QGWmG+5Sbu7tscEsnOUbqHp3O2D88UZoWz/t1bE86y44Fmw8IRFChRZQ== X-Received: by 2002:a05:6e02:1be6:b0:312:8257:fcc1 with SMTP id y6-20020a056e021be600b003128257fcc1mr11983019ilv.32.1675636772773; Sun, 05 Feb 2023 14:39:32 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:32 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 048/169] Correct SPL uses of CMD_MMC Date: Sun, 5 Feb 2023 15:36:34 -0700 Message-Id: <20230205223836.231657-49-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_MMC defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) include/configs/am62ax_evm.h | 4 ++-- include/configs/imx8mm-cl-iot-gate.h | 2 +- include/configs/imx8mp_rsb3720.h | 2 +- include/configs/rockchip-common.h | 2 +- include/configs/rpi.h | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/am62ax_evm.h b/include/configs/am62ax_evm.h index cdd639b9309..a18b1572b13 100644 --- a/include/configs/am62ax_evm.h +++ b/include/configs/am62ax_evm.h @@ -71,12 +71,12 @@ #define BOOTENV_DEV_NAME_TI_MMC(devtyeu, devtypel, instance) \ "ti_mmc " -#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) #define BOOT_TARGET_MMC(func) \ func(TI_MMC, ti_mmc, na) #else #define BOOT_TARGET_MMC(func) -#endif /* CONFIG_IS_ENABLED(CMD_MMC) */ +#endif /* IS_ENABLED(CONFIG_CMD_MMC) */ #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_MMC(func) diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 6f34b79e0db..3a666acb736 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -30,7 +30,7 @@ EFI_GUID(0x0bf1165c, 0x1831, 0x4864, 0x94, 0x5e, \ 0xac, 0x3d, 0x38, 0x48, 0xf4, 0x99) -#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) # define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 2) \ func(MMC, mmc, 0) diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index 86311ee862b..8008631a7c0 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -39,7 +39,7 @@ #endif -#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) # define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 2) \ func(MMC, mmc, 1) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 4b849134d12..6a283dcfe78 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -12,7 +12,7 @@ #ifndef CONFIG_SPL_BUILD /* First try to boot from SD (index 1), then eMMC (index 0) */ -#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) #define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) diff --git a/include/configs/rpi.h b/include/configs/rpi.h index ffbf4347658..9e63fe9ca96 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -122,7 +122,7 @@ "fdt_addr_r=0x02600000\0" \ "ramdisk_addr_r=0x02700000\0" -#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) #define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ -- 2.39.1.519.gcb327c4b5f-goog