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 A047BC636CC for ; Sun, 5 Feb 2023 22:49:28 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D8D4A85A32; Sun, 5 Feb 2023 23:41:41 +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="j1S+tLvJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id F107385996; Sun, 5 Feb 2023 23:40:15 +0100 (CET) Received: from mail-il1-x131.google.com (mail-il1-x131.google.com [IPv6:2607:f8b0:4864:20::131]) (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 BB03285794 for ; Sun, 5 Feb 2023 23:39:36 +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-x131.google.com with SMTP id w13so4115400ilv.3 for ; Sun, 05 Feb 2023 14:39:36 -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=Pxqvg9DyA9dTh3CoLVWPOyRc87AeFcXkHYUjGOxMGuw=; b=j1S+tLvJLBC4x4bFTiZ31/bVzM4aw5KyQUz2cqlpW1i6/wZ5vnKpOxRvJ+Fcr/+HH3 pqkMmIu/ls2OCwN5ANY3kYinncDwYjDkEcl6p4gtbq1H0GCl+8mwej6vB2p0e0clCMYO OJAJxMhTqFCRJpspCSIzxXtOkCWIxzJFA08QY= 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=Pxqvg9DyA9dTh3CoLVWPOyRc87AeFcXkHYUjGOxMGuw=; b=0+bE/z0/2mLOzeJ6pYjCNR7B0AH89g1Ljj30V3G93xN4tXzXBntjXj/c1TA3EdBMiB RB7trFRtWKy08V0knGNc/baPR7Zg2pGoerqGlApavtWCUKcEvcsLiK+cErvSCfgJtM/Z qOW1Hbfi4JQmnJEpw9hEWvx3BskW0PLmtbYBBuiD7vo9ygBtza5QCQ6dxgVn8b914wj9 klCFpHPh5oJh8t3d95YRWEVv9b41shcpS3CCxPD7NOiddmSFjUNdICMog5qJVUlH5V// CeT/V+ferLtQkj7cM6r/wdYagE0FV6OBqcRxeFqJlHfLhQPaSRLnWxQ0Jtg7bXRbic3t HQ4w== X-Gm-Message-State: AO0yUKU2Sipz3WxqksXBQhor8+C4f9TzsKWRjXzfkuixdYUMiDhMpppj hYTo+Ky4717K3c4t8xw7Zl8lKu3FsR6HTuSe X-Google-Smtp-Source: AK7set/NJMiywujSCiiaBYZAVd3seXO6G1nPGxBUwy02nsVxnEZs+n5sFnaxKOVQs0NLuMEhGcD2qQ== X-Received: by 2002:a05:6e02:1a87:b0:312:6a92:472f with SMTP id k7-20020a056e021a8700b003126a92472fmr14427671ilv.24.1675636775279; Sun, 05 Feb 2023 14:39:35 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Feb 2023 14:39:35 -0800 (PST) From: Simon Glass To: U-Boot Mailing List Cc: Tom Rini , Simon Glass Subject: [PATCH v2 051/169] Correct SPL uses of CMD_NVME Date: Sun, 5 Feb 2023 15:36:37 -0700 Message-Id: <20230205223836.231657-52-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_NVME defined in Kconfig Signed-off-by: Simon Glass --- (no changes since v1) include/configs/apple.h | 2 +- include/configs/qemu-arm.h | 2 +- include/configs/rockchip-common.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/configs/apple.h b/include/configs/apple.h index fe7d11bcdb3..ee6e1169b3b 100644 --- a/include/configs/apple.h +++ b/include/configs/apple.h @@ -9,7 +9,7 @@ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" -#if CONFIG_IS_ENABLED(CMD_NVME) +#if IS_ENABLED(CONFIG_CMD_NVME) #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) #else #define BOOT_TARGET_NVME(func) diff --git a/include/configs/qemu-arm.h b/include/configs/qemu-arm.h index 8289e338f6a..4cae2b103e6 100644 --- a/include/configs/qemu-arm.h +++ b/include/configs/qemu-arm.h @@ -54,7 +54,7 @@ # define BOOT_TARGET_VIRTIO(func) #endif -#if CONFIG_IS_ENABLED(CMD_NVME) +#if IS_ENABLED(CONFIG_CMD_NVME) # define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) #else # define BOOT_TARGET_NVME(func) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 6a283dcfe78..2e1325fc816 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -20,7 +20,7 @@ #define BOOT_TARGET_MMC(func) #endif -#if CONFIG_IS_ENABLED(CMD_NVME) +#if IS_ENABLED(CONFIG_CMD_NVME) #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) #else #define BOOT_TARGET_NVME(func) -- 2.39.1.519.gcb327c4b5f-goog