[PATCH v2 051/169] Correct SPL uses of CMD_NVME

[Simon Glass]

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 <sjg at chromium.org>
---

(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