configs: Re-sync with cmd/Kconfig

[people/ms/u-boot.git] / include / config_fallbacks.h

diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index d8339b26cca91e53a703ca60be6805e117561d3a..266619186643f82abd7bffd1d2343ce7eade19eb 100644 (file)
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -55,12 +55,48 @@
 #define HAVE_BLOCK_DEVICE
 #endif
 
-#ifndef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT      "=> "
+#if (defined(CONFIG_PARTITION_UUIDS) || \
+       defined(CONFIG_EFI_PARTITION) || \
+       defined(CONFIG_RANDOM_UUID) || \
+       defined(CONFIG_CMD_UUID) || \
+       defined(CONFIG_BOOTP_PXE)) && \
+       !defined(CONFIG_LIB_UUID)
+#define CONFIG_LIB_UUID
 #endif
 
-#ifndef CONFIG_SYS_HZ
-#define CONFIG_SYS_HZ          1000
+#if (defined(CONFIG_RANDOM_UUID) || \
+       defined(CONFIG_CMD_UUID)) && \
+       (!defined(CONFIG_LIB_RAND) && \
+       !defined(CONFIG_LIB_HW_RAND))
+#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
+
+#ifndef CONFIG_FIT_SIGNATURE
+#define CONFIG_IMAGE_FORMAT_LEGACY
+#endif
+
+#ifdef CONFIG_DISABLE_IMAGE_LEGACY
+#undef CONFIG_IMAGE_FORMAT_LEGACY
+#endif
+
+#ifdef CONFIG_DM_I2C
+# ifdef CONFIG_SYS_I2C
+#  error "Cannot define CONFIG_SYS_I2C when CONFIG_DM_I2C is used"
+# endif
+#endif
+
+#ifndef CONFIG_CMDLINE
+#undef CONFIG_CMDLINE_EDITING
+#undef CONFIG_SYS_LONGHELP
+#undef CONFIG_MENU
 #endif
 
 #endif /* __CONFIG_FALLBACKS_H */