projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.denx.de/u-boot-fdt
[oweals/u-boot.git]
/
include
/
config_fallbacks.h
diff --git
a/include/config_fallbacks.h
b/include/config_fallbacks.h
index 76818f673f2810c69520067a7a10e2b34ed4515a..2656c75b3005a8fcb2c1593a79564167224b310b 100644
(file)
--- a/
include/config_fallbacks.h
+++ b/
include/config_fallbacks.h
@@
-29,10
+29,14
@@
#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
+#if defined(CONFIG_ENV_IS_IN_FAT) && !defined(CONFIG_FAT_WRITE)
+#define CONFIG_FAT_WRITE
+#endif
+
#if (defined(CONFIG_CMD_EXT4) || defined(CONFIG_CMD_EXT2)) && \
!defined(CONFIG_FS_EXT4)
#define CONFIG_FS_EXT4
#if (defined(CONFIG_CMD_EXT4) || defined(CONFIG_CMD_EXT2)) && \
!defined(CONFIG_FS_EXT4)
#define CONFIG_FS_EXT4
@@
-43,9
+47,9
@@
#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) || \
+#if defined(CONFIG_IDE) || \
defined(CONFIG_CMD_SATA) || \
defined(CONFIG_CMD_SATA) || \
- defined(CONFIG_
CMD_
SCSI) || \
+ defined(CONFIG_SCSI) || \
defined(CONFIG_CMD_USB) || \
defined(CONFIG_CMD_PART) || \
defined(CONFIG_CMD_GPT) || \
defined(CONFIG_CMD_USB) || \
defined(CONFIG_CMD_PART) || \
defined(CONFIG_CMD_GPT) || \
@@
-55,8
+59,8
@@
#define HAVE_BLOCK_DEVICE
#endif
#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)) && \
defined(CONFIG_RANDOM_UUID) || \
defined(CONFIG_CMD_UUID) || \
defined(CONFIG_BOOTP_PXE)) && \
@@
-71,16
+75,8
@@
#define CONFIG_LIB_RAND
#endif
#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_HZ
-#define CONFIG_SYS_HZ 1000
+#ifndef CONFIG_SYS_PBSIZE
+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + 128)
#endif
#ifndef CONFIG_FIT_SIGNATURE
#endif
#ifndef CONFIG_FIT_SIGNATURE
@@
-91,4
+87,15
@@
#undef CONFIG_IMAGE_FORMAT_LEGACY
#endif
#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
+#endif
+
#endif /* __CONFIG_FALLBACKS_H */
#endif /* __CONFIG_FALLBACKS_H */