Merge branch '2020-03-27-master-imports'

[oweals/u-boot.git] / include / config_fallbacks.h

diff --git a/include/config_fallbacks.h b/include/config_fallbacks.h
index 3d68d9fe31a83146ac72e6858bd20568fbd4fb80..c18f19a550f9bfd0006477731e3c9d7450e945ac 100644 (file)
--- a/include/config_fallbacks.h
+++ b/include/config_fallbacks.h
@@ -46,23 +46,10 @@
 #define CONFIG_SYS_MAXARGS     16
 #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
-#endif
-
 #endif /* __CONFIG_FALLBACKS_H */