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

[people/ms/u-boot.git] / include / configs / 10m50_devboard.h

diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index 608127f40d0a821f8f148c9a87ee48ac2c37ff91..892ceff5e6402099f63b3d29cfd4b8c803250c04 100644 (file)
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -12,14 +12,11 @@
 /*
  * BOARD/CPU
  */
-#define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO_LATE
 
 /*
  * SERIAL
  */
-#define CONFIG_BAUDRATE                        115200
-#define CONFIG_SYS_CONSOLE_INFO_QUIET  /* Suppress console info */
 #define CONFIG_SYS_NS16550_MEM32
 
 /*
@@ -33,8 +30,6 @@
  * NET options
  */
 #define CONFIG_SYS_RX_ETH_BUFFER       0
-#define CONFIG_CMD_MII
-#define CONFIG_PHY_GIGE
 #define CONFIG_SYS_FAULT_ECHO_LINK_DOWN
 #define CONFIG_PHY_MARVELL
 
@@ -49,8 +44,6 @@
 /*
  * FDT options
  */
-#define CONFIG_OF_LIBFDT
-#define CONFIG_OF_BOARD_SETUP
 #define CONFIG_LMB
 
 /*
@@ -76,7 +69,6 @@
  * of flash. NOTE: the monitor length must be multiple of sector size
  * (which is common practice).
  */
-#define CONFIG_ENV_IS_IN_FLASH
 
 #define CONFIG_ENV_SIZE                        0x10000 /* 64k, 1 sector */
 #define CONFIG_ENV_OVERWRITE           /* Serial change Ok     */
@@ -99,6 +91,7 @@
                                         CONFIG_ENV_SIZE - \
                                         CONFIG_SYS_MALLOC_LEN -        \
                                         0x10000)
+#define CONFIG_AUTO_COMPLETE
 #define CONFIG_CMDLINE_EDITING
 
 #endif /* __CONFIG_H */