Merge branch 'master' of git://www.denx.de/git/u-boot-imx

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

diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h
index bfd5fbd8d7387e9b454089061f9fc004832513e7..888899eacb349e5a61813849685014c771f4b1f1 100644 (file)
--- a/include/configs/colibri_vf.h
+++ b/include/configs/colibri_vf.h
@@ -14,8 +14,6 @@
 
 #include <asm/arch/imx-regs.h>
 
-#define CONFIG_VF610
-#define CONFIG_SYS_THUMB_BUILD
 #define CONFIG_SYS_FSL_CLK
 
 #define CONFIG_DISPLAY_BOARDINFO_LATE  /* Calls show_board_info() */
@@ -34,7 +32,6 @@
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_ENV_VARS_UBOOT_CONFIG
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
-#define CONFIG_BAUDRATE                        115200
 
 /* NAND support */
 #define CONFIG_CMD_NAND