common: bootdelay: move CONFIG_BOOTDELAY into a Kconfig option

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

diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h
index d896bca68b28030551e335c1265fc213154a148e..794650a51cb30c41ccfde212be0efa7f2768a2a6 100644 (file)
--- a/include/configs/pxm2.h
+++ b/include/configs/pxm2.h
@@ -40,7 +40,6 @@
 #define CONFIG_SYS_I2C_SPEED           400000
 #define CONFIG_SYS_I2C_EEPROM_ADDR     0x50
 
-
 #define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS     0x300
 
 #undef CONFIG_SPL_NET_SUPPORT
@@ -51,7 +50,6 @@
 
 #define CONFIG_FACTORYSET
 
-
 /* Watchdog */
 #define CONFIG_OMAP_WATCHDOG
 
@@ -94,7 +92,6 @@
 
 #ifndef CONFIG_RESTORE_FLASH
 /* set to negative value for no autoboot */
-#define CONFIG_BOOTDELAY               3
 
 #define CONFIG_BOOTCOMMAND \
        "if dfubutton; then " \
@@ -120,7 +117,6 @@
        "reset;"
 
 #else
-#define CONFIG_BOOTDELAY               0
 
 #define CONFIG_BOOTCOMMAND                     \
        "setenv autoload no; "                  \
@@ -149,8 +145,4 @@
 #define CONFIG_SYS_CONSOLE_FG_COL      0x00
 #endif
 
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_FIT
-#endif
-
 #endif /* ! __CONFIG_PXM2_H */