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

[platform/kernel/u-boot.git] / include / configs / colibri_t20.h

diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h
index 01fc13d..8b854c3 100644 (file)
--- a/include/configs/colibri_t20.h
+++ b/include/configs/colibri_t20.h
@@ -11,32 +11,23 @@
 
 #include "tegra20-common.h"
 
-#define CONFIG_ARCH_MISC_INIT
-
 /* High-level configuration options */
-#define CONFIG_TEGRA_BOARD_STRING      "Toradex Colibri T20"
+#define CONFIG_DISPLAY_BOARDINFO_LATE  /* Calls show_board_info() */
 
 /* Board-specific serial config */
 #define CONFIG_TEGRA_ENABLE_UARTA
 #define CONFIG_TEGRA_UARTA_SDIO1
 #define CONFIG_SYS_NS16550_COM1                NV_PA_APB_UARTA_BASE
 
-#define CONFIG_MACH_TYPE               MACH_TYPE_COLIBRI_T20
+#define CONFIG_MACH_TYPE               MACH_TYPE_COLIBRI_TEGRA2
 
 /* I2C */
 #define CONFIG_SYS_I2C_TEGRA
 
-/* SD/MMC support */
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_TEGRA_MMC
-#define CONFIG_CMD_MMC
-
 /* USB host support */
 #define CONFIG_USB_EHCI
 #define CONFIG_USB_EHCI_TEGRA
 #define CONFIG_USB_MAX_CONTROLLER_COUNT        3
-#define CONFIG_USB_STORAGE
 
 /* USB networking support */
 #define CONFIG_USB_HOST_ETHER
@@ -49,7 +40,6 @@
 
 /* LCD support */
 #define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES    10
 #define CONFIG_CMD_BMP
 #define CONFIG_LCD_LOGO
 
@@ -76,15 +66,11 @@
 #define CONFIG_ENV_SIZE                        (SZ_64K)
 
 /* UBI */
-#define CONFIG_CMD_BOOTZ
-#define CONFIG_CMD_UBI
 #define CONFIG_CMD_UBIFS       /* increases size by almost 60 KB */
 #define CONFIG_LZO
-#define CONFIG_MTD_UBI_FASTMAP
 #define CONFIG_RBTREE
 
 /* Debug commands */
-#define CONFIG_CMD_CACHE
 
 /* Miscellaneous commands */
 #define CONFIG_FAT_WRITE