X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfig_fallbacks.h;h=7aa5b02396f30276d00828f4b27891444646b35d;hb=0f7102588cfb48e74b13646ce6df7c11a374423b;hp=2ad54b7bf6611106b770d0f3b495ba7f4ce32a8f;hpb=fc15b9beed05dec6cc092c265042381a0eadb0e9;p=u-boot

diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index 2ad54b7bf6..7aa5b02396 100644
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -55,8 +55,8 @@
 #define HAVE_BLOCK_DEVICE
 #endif
 
-#if (defined(CONFIG_PARTITION_UUIDS) || \
-	defined(CONFIG_EFI_PARTITION) || \
+#if (CONFIG_IS_ENABLED(PARTITION_UUIDS) || \
+	CONFIG_IS_ENABLED(EFI_PARTITION) || \
 	defined(CONFIG_RANDOM_UUID) || \
 	defined(CONFIG_CMD_UUID) || \
 	defined(CONFIG_BOOTP_PXE)) && \
@@ -71,10 +71,6 @@
 #define CONFIG_LIB_RAND
 #endif
 
-#if defined(CONFIG_API) && defined(CONFIG_LCD)
-#define CONFIG_CMD_BMP
-#endif
-
 #ifndef CONFIG_SYS_PBSIZE
 #define CONFIG_SYS_PBSIZE	(CONFIG_SYS_CBSIZE + 128)
 #endif
@@ -96,7 +92,6 @@
 #ifndef CONFIG_CMDLINE
 #undef CONFIG_CMDLINE_EDITING
 #undef CONFIG_SYS_LONGHELP
-#undef CONFIG_MENU
 #endif
 
 #endif	/* __CONFIG_FALLBACKS_H */