Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / include / configs / xilinx-ppc.h

diff --git a/include/configs/xilinx-ppc.h b/include/configs/xilinx-ppc.h
index 067cfa69f2f6db788f1e66fd1644529ca40fac01..39c1bd89d895c0995a8ff4e2c8244f8e90487b81 100644 (file)
--- a/include/configs/xilinx-ppc.h
+++ b/include/configs/xilinx-ppc.h
@@ -33,7 +33,6 @@
 #undef CONFIG_CMD_EEPROM
 
 /*Misc*/
-#define CONFIG_BOOTDELAY               5/* autoboot after 5 seconds     */
 #define CONFIG_SYS_LONGHELP            /* undef to save memory         */
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_SYS_CBSIZE              1024/* Console I/O Buffer Size      */
@@ -58,7 +57,6 @@
 #define CONFIG_CMDLINE_EDITING         /* add command line history     */
 #define CONFIG_AUTO_COMPLETE           /* add autocompletion support   */
 #define CONFIG_MX_CYCLIC               /* enable mdc/mwc commands      */
-#define CONFIG_ZERO_BOOTDELAY_CHECK    /* check for keypress on bootdelay==0 */
 #define CONFIG_VERSION_VARIABLE                /* include version env variable */
 #define CONFIG_SYS_CONSOLE_INFO_QUIET  /* don't print console @ startup */
 #define CONFIG_LOADS_ECHO              /* echo on for serial download  */