diff --git a/payloads/libpayload/include/kconfig.h b/payloads/libpayload/include/kconfig.h
index adb3403cf2..9cce6ea706 100644
--- a/payloads/libpayload/include/kconfig.h
+++ b/payloads/libpayload/include/kconfig.h
@@ -17,5 +17,7 @@
 #define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0, 0)
 #define ___config_enabled(__ignored, val, ...) val
 
-#define IS_ENABLED(option) config_enabled(option)
+#define IS_ENABLED(option) config_enabled(option)	/* deprecated */
+#define CONFIG(option) config_enabled(CONFIG_##option)
+
 #endif
diff --git a/src/include/kconfig.h b/src/include/kconfig.h
index 73106e905c..0478548d59 100644
--- a/src/include/kconfig.h
+++ b/src/include/kconfig.h
@@ -17,5 +17,7 @@
 #define __config_enabled(arg1_or_junk) ___config_enabled(arg1_or_junk 1, 0, 0)
 #define ___config_enabled(__ignored, val, ...) val
 
-#define IS_ENABLED(option) config_enabled(option)
+#define IS_ENABLED(option) config_enabled(option)	/* deprecated */
+#define CONFIG(option) config_enabled(CONFIG_##option)
+
 #endif