From 04e7493c4af9aa57a0de68637773d88ba4c69ede Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 5 Feb 2023 15:36:41 -0700 Subject: [PATCH] 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 --- include/configs/rockchip-common.h | 2 +- include/environment/distro/sf.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index fda9191f6b..e0d38ccc1a 100644 --- 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 62624d553c..ee48a8a4e8 100644 --- 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 " \ -- 2.39.5