common: bootdelay: move CONFIG_BOOTDELAY into a Kconfig option

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

diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h
index 3030054949f8fdea5228b616bee0811cfb5e667e..96c3c4b958d2c247d350d6a4cd9cf8f6c61e2744 100644 (file)
--- a/include/configs/omap3_cairo.h
+++ b/include/configs/omap3_cairo.h
@@ -60,16 +60,8 @@
 #define CONFIG_NAND
 
 /* commands to include */
-#include <config_cmd_default.h>
-
-#define CONFIG_CMD_SETEXPR     /* Evaluate expressions         */
 #define CONFIG_CMD_NAND_LOCK_UNLOCK
 
-/* Disable some commands */
-#undef CONFIG_CMD_FPGA         /* FPGA configuration Support   */
-#undef CONFIG_CMD_IMI          /* iminfo                       */
-#undef CONFIG_CMD_NET          /* bootp, tftpboot, rarpboot    */
-
 /*
  * TWL4030
  */
@@ -78,19 +70,15 @@
 /*
  * Board NAND Info.
  */
-#define CONFIG_SYS_NAND_QUIET_TEST     1
 #define CONFIG_NAND_OMAP_GPMC
 #define CONFIG_SYS_MAX_NAND_DEVICE     1               /* Max number of NAND */
                                                        /* devices */
 /* override default CONFIG_BOOTDELAY */
-#undef CONFIG_BOOTDELAY
-#define CONFIG_BOOTDELAY       0
 
 #define CONFIG_EXTRA_ENV_SETTINGS \
        "machid=ffffffff\0" \
        "fdt_high=0x87000000\0" \
        "baudrate=115200\0" \
-       "ethaddr=00:50:C2:7E:90:F0\0" \
        "fec_addr=00:50:C2:7E:90:F0\0" \
        "netmask=255.255.255.0\0" \
        "ipaddr=192.168.2.9\0" \
@@ -250,10 +238,6 @@
 #define CONFIG_SERIAL2
 #endif
 
-/* Keep old prompt in case some existing script depends on it */
-#undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT              "Cairo # "
-
 /* Provide MACH_TYPE for compatibility with non-DT kernels */
 #define MACH_TYPE_OMAP3_CAIRO  3063
 #define CONFIG_MACH_TYPE       MACH_TYPE_OMAP3_CAIRO