Correct SPL uses of CMD_SF

This converts 2 usages of this option to the non-SPL form, since there is
no SPL_CMD_SF defined in Kconfig

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index fda9191f6b3d559954100f4ba8dbe8896dc644ba..e0d38ccc1aac41fb8c072eb7eb9d30d6bddddf83 100644 (file)
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -50,7 +50,7 @@
        #define BOOT_TARGET_DHCP(func)
 #endif
 
-#if CONFIG_IS_ENABLED(CMD_SF)
+#if IS_ENABLED(CONFIG_CMD_SF)
        #define BOOT_TARGET_SF(func)    func(SF, sf, 0)
 #else
        #define BOOT_TARGET_SF(func)

diff --git a/include/environment/distro/sf.h b/include/environment/distro/sf.h
index 62624d553c04ee287ac51666c0d0047f3f27a3dd..ee48a8a4e8fe4cb16d3ae09baac88c173d39d463 100644 (file)
--- a/include/environment/distro/sf.h
+++ b/include/environment/distro/sf.h
@@ -8,7 +8,7 @@
 #ifndef __DISTRO_SF_CONFIG_H
 #define __DISTRO_SF_CONFIG_H
 
-#if CONFIG_IS_ENABLED(CMD_SF)
+#if IS_ENABLED(CONFIG_CMD_SF)
 #define BOOTENV_SHARED_SF(devtypel)                            \
        #devtypel "_boot="                                      \
        "if " #devtypel " probe ${busnum}; then "               \