Convert CONFIG_CMD_BMP to Kconfig

[u-boot] / include / config_fallbacks.h

diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index ddfe0450d21c780e44cacf4f26b91d1e15a059a9..7aa5b02396f30276d00828f4b27891444646b35d 100644 (file)
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -45,7 +45,7 @@
 /* Rather than repeat this expression each time, add a define for it */
 #if defined(CONFIG_CMD_IDE) || \
        defined(CONFIG_CMD_SATA) || \
-       defined(CONFIG_CMD_SCSI) || \
+       defined(CONFIG_SCSI) || \
        defined(CONFIG_CMD_USB) || \
        defined(CONFIG_CMD_PART) || \
        defined(CONFIG_CMD_GPT) || \
@@ -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,14 +71,6 @@
 #define CONFIG_LIB_RAND
 #endif
 
-#if defined(CONFIG_API) && defined(CONFIG_LCD)
-#define CONFIG_CMD_BMP
-#endif
-
-#ifndef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT      "=> "
-#endif
-
 #ifndef CONFIG_SYS_PBSIZE
 #define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + 128)
 #endif
@@ -97,4 +89,9 @@
 # endif
 #endif
 
+#ifndef CONFIG_CMDLINE
+#undef CONFIG_CMDLINE_EDITING
+#undef CONFIG_SYS_LONGHELP
+#endif
+
 #endif /* __CONFIG_FALLBACKS_H */