Merge git://git.denx.de/u-boot-mmc

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

diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index ddfe0450d21c780e44cacf4f26b91d1e15a059a9..23a4cfbac7a3ead12fcec6ae467deda166e03dca 100644 (file)
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -29,58 +29,21 @@
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, 115200 }
 #endif
 
-#if defined(CONFIG_CMD_FAT) && !defined(CONFIG_FS_FAT)
-#define CONFIG_FS_FAT
-#endif
-
-#if (defined(CONFIG_CMD_EXT4) || defined(CONFIG_CMD_EXT2)) && \
-                                               !defined(CONFIG_FS_EXT4)
-#define CONFIG_FS_EXT4
-#endif
-
-#if defined(CONFIG_CMD_EXT4_WRITE) && !defined(CONFIG_EXT4_WRITE)
-#define CONFIG_EXT4_WRITE
-#endif
-
-/* 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_CMD_USB) || \
-       defined(CONFIG_CMD_PART) || \
-       defined(CONFIG_CMD_GPT) || \
-       defined(CONFIG_MMC) || \
-       defined(CONFIG_SYSTEMACE) || \
-       defined(CONFIG_SANDBOX)
-#define HAVE_BLOCK_DEVICE
-#endif
-
-#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
+/* Console I/O Buffer Size */
+#ifndef CONFIG_SYS_CBSIZE
+#if defined(CONFIG_CMD_KGDB)
+#define CONFIG_SYS_CBSIZE      1024
+#else
+#define CONFIG_SYS_CBSIZE      256
 #endif
-
-#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_PROMPT
-#define CONFIG_SYS_PROMPT      "=> "
+#ifndef CONFIG_SYS_PBSIZE
+#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
 #endif
 
-#ifndef CONFIG_SYS_PBSIZE
-#define CONFIG_SYS_PBSIZE      (CONFIG_SYS_CBSIZE + 128)
+#ifndef CONFIG_SYS_MAXARGS
+#define CONFIG_SYS_MAXARGS     16
 #endif
 
 #ifndef CONFIG_FIT_SIGNATURE