projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mmc: fix for old MMCs (below version 4)
[oweals/u-boot.git]
/
include
/
config_fallbacks.h
diff --git
a/include/config_fallbacks.h
b/include/config_fallbacks.h
index 266619186643f82abd7bffd1d2343ce7eade19eb..2c4d43d67269ff53f6ee0ce0a42672c2017129b5 100644
(file)
--- a/
include/config_fallbacks.h
+++ b/
include/config_fallbacks.h
@@
-29,7
+29,7
@@
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#endif
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
#endif
-#if defined(CONFIG_
CMD
_FAT) && !defined(CONFIG_FS_FAT)
+#if defined(CONFIG_
ENV_IS_IN
_FAT) && !defined(CONFIG_FS_FAT)
#define CONFIG_FS_FAT
#endif
#define CONFIG_FS_FAT
#endif
@@
-43,20
+43,22
@@
#endif
/* Rather than repeat this expression each time, add a define for it */
#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) || \
+#if defined(CONFIG_IDE) || \
+ defined(CONFIG_SATA) || \
+ defined(CONFIG_SCSI) || \
defined(CONFIG_CMD_USB) || \
defined(CONFIG_CMD_PART) || \
defined(CONFIG_CMD_GPT) || \
defined(CONFIG_MMC) || \
defined(CONFIG_CMD_USB) || \
defined(CONFIG_CMD_PART) || \
defined(CONFIG_CMD_GPT) || \
defined(CONFIG_MMC) || \
+ defined(CONFIG_NVME) || \
defined(CONFIG_SYSTEMACE) || \
defined(CONFIG_SANDBOX)
#define HAVE_BLOCK_DEVICE
#endif
defined(CONFIG_SYSTEMACE) || \
defined(CONFIG_SANDBOX)
#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) || \
+ CONFIG_IS_ENABLED(EFI_LOADER) || \
defined(CONFIG_RANDOM_UUID) || \
defined(CONFIG_CMD_UUID) || \
defined(CONFIG_BOOTP_PXE)) && \
defined(CONFIG_RANDOM_UUID) || \
defined(CONFIG_CMD_UUID) || \
defined(CONFIG_BOOTP_PXE)) && \
@@
-71,12
+73,21
@@
#define CONFIG_LIB_RAND
#endif
#define CONFIG_LIB_RAND
#endif
-#if defined(CONFIG_API) && defined(CONFIG_LCD)
-#define CONFIG_CMD_BMP
+/* 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
#endif
#ifndef CONFIG_SYS_PBSIZE
#endif
#ifndef CONFIG_SYS_PBSIZE
-#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + 128)
+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
+#endif
+
+#ifndef CONFIG_SYS_MAXARGS
+#define CONFIG_SYS_MAXARGS 16
#endif
#ifndef CONFIG_FIT_SIGNATURE
#endif
#ifndef CONFIG_FIT_SIGNATURE
@@
-96,7
+107,6
@@
#ifndef CONFIG_CMDLINE
#undef CONFIG_CMDLINE_EDITING
#undef CONFIG_SYS_LONGHELP
#ifndef CONFIG_CMDLINE
#undef CONFIG_CMDLINE_EDITING
#undef CONFIG_SYS_LONGHELP
-#undef CONFIG_MENU
#endif
#endif /* __CONFIG_FALLBACKS_H */
#endif
#endif /* __CONFIG_FALLBACKS_H */