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

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

diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h
index 01e395a49d6eb2096b18067973d1eddf3b41b778..2420612800fbde9b658ed8e97dcf7e8d97d63bf1 100644 (file)
--- a/include/configs/mt_ventoux.h
+++ b/include/configs/mt_ventoux.h
@@ -22,19 +22,12 @@
 #define MACH_TYPE_AM3517_MT_VENTOUX    3832
 #define CONFIG_MACH_TYPE       MACH_TYPE_AM3517_MT_VENTOUX
 
-#define CONFIG_BOOTDELAY       10
 #define CONFIG_BOOTFILE                "uImage"
 #define CONFIG_AUTO_COMPLETE
 
 #define CONFIG_OMAP3_GPIO_4
 #define CONFIG_HOSTNAME mt_ventoux
 
-/*
- * Miscellaneous configurable options
- */
-#define V_PROMPT                       "mt_ventoux => "
-#define CONFIG_SYS_PROMPT              V_PROMPT
-
 /*
  * Set its own mtdparts, different from common
  */
@@ -48,7 +41,6 @@
 /*
  * FPGA
  */
-#define CONFIG_CMD_FPGA
 #define CONFIG_CMD_FPGA_LOADMK
 #define CONFIG_FPGA
 #define CONFIG_FPGA_XILINX
@@ -59,14 +51,10 @@
 #define CONFIG_FPGA_DELAY() udelay(1)
 #define CONFIG_SYS_FPGA_PROG_FEEDBACK
 
-#define CONFIG_VIDEO
-#define CONFIG_CFB_CONSOLE
-#define CONFIG_VGA_AS_SINGLE_DEVICE
 #define CONFIG_SPLASH_SCREEN
 #define CONFIG_VIDEO_BMP_RLE8
 #define CONFIG_CMD_BMP
 #define CONFIG_VIDEO_OMAP3     /* DSS Support                  */
-#define CONFIG_SYS_CONSOLE_IS_IN_ENV
 
 #define        CONFIG_EXTRA_ENV_SETTINGS       CONFIG_TAM3517_SETTINGS \
        "bootcmd=run net_nfs\0"