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

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

diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h
index 3db6fa17404176a55f922a47610681f40a8e4af5..45f10e596f998b6907ab70d25cf2874b09ccb2ff 100644 (file)
--- a/include/configs/TQM862M.h
+++ b/include/configs/TQM862M.h
@@ -20,7 +20,6 @@
 #define CONFIG_MPC860          1
 #define CONFIG_MPC860T         1
 #define CONFIG_MPC862          1
-#define CONFIG_DISPLAY_BOARDINFO
 
 #define CONFIG_TQM862M         1       /* ...on a TQM8xxM module       */
 
@@ -33,7 +32,6 @@
 
 #define        CONFIG_BOOTCOUNT_LIMIT
 
-#define CONFIG_BOOTDELAY       5       /* autoboot after 5 seconds     */
 
 #define CONFIG_BOARD_TYPES     1       /* support board types          */
 
@@ -76,8 +74,6 @@
 
 #undef CONFIG_WATCHDOG                 /* watchdog disabled            */
 
-#define        CONFIG_STATUS_LED       1       /* Status LED enabled           */
-
 #undef CONFIG_CAN_DRIVER               /* CAN Driver support disabled  */
 
 /*