X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=include%2Fconfig_fallbacks.h;h=2ad54b7bf6611106b770d0f3b495ba7f4ce32a8f;hb=44afdc4a12b9f6f48338e7975e4f08cfe90dba74;hp=76818f673f2810c69520067a7a10e2b34ed4515a;hpb=22692ec0fbdb455ca16d4d0e27768c6b6deb4243;p=oweals%2Fu-boot.git

diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index 76818f673f..2ad54b7bf6 100644
--- 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) || \
@@ -75,12 +75,8 @@
 #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
@@ -91,4 +87,16 @@
 #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 */