Merge git://www.denx.de/git/u-boot-marvell

[oweals/u-boot.git] / include / configs / mv-common.h

diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h
index 25562fa12a9f55f97da7a5642311532f874e8f56..18003e1eba5f246824651ce51f9286c4179951ad 100644 (file)
--- a/include/configs/mv-common.h
+++ b/include/configs/mv-common.h
@@ -53,7 +53,6 @@
  */
 
 #define CONFIG_CONS_INDEX      1       /*Console on UART0 */
-#define CONFIG_BAUDRATE                        115200
 #define CONFIG_SYS_BAUDRATE_TABLE      { 9600, 19200, 38400, 57600, \
                                          115200,230400, 460800, 921600 }
 /* auto boot */
@@ -122,7 +121,6 @@
  * Common USB/EHCI configuration
  */
 #if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM)
-#define CONFIG_USB_EHCI                /* Enable EHCI USB support */
 #define CONFIG_SUPPORT_VFAT
 #endif /* CONFIG_CMD_USB */
 
@@ -130,13 +128,8 @@
  * File system
  */
 #ifdef CONFIG_SYS_MVFS
-#define CONFIG_CMD_JFFS2
-#define CONFIG_CMD_UBIFS
-#define CONFIG_RBTREE
 #define CONFIG_MTD_DEVICE               /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
-#define CONFIG_CMD_MTDPARTS
-#define CONFIG_LZO
 #endif
 
 #endif /* _MV_COMMON_H */