Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next

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

diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h
index ab574d589b66dee991dfb1c6093eecaac523055b..3d2891354f882071f5681812d52c833eee48ea43 100644 (file)
--- a/include/configs/M52277EVB.h
+++ b/include/configs/M52277EVB.h
@@ -38,8 +38,6 @@
 #define CONFIG_M52277          /* define processor type */
 #define CONFIG_M52277EVB       /* M52277EVB board */
 
-#undef DEBUG
-
 #define CONFIG_MCFUART
 #define CFG_UART_PORT          (0)
 #define CONFIG_BAUDRATE                115200
@@ -88,6 +86,7 @@
        "save\0"                                \
        ""
 
+#define CONFIG_BOOTDELAY       3       /* autoboot after 3 seconds */
 /* LCD */
 #ifdef CONFIG_CMD_BMP
 #define CONFIG_LCD