Makefile: use EXTRAVERSION for -rc? tag

[platform/kernel/u-boot.git] / board / ttcontrol / vision2 / vision2.c

diff --git a/board/ttcontrol/vision2/vision2.c b/board/ttcontrol/vision2/vision2.c
index f556d30..f28eab0 100644 (file)
--- a/board/ttcontrol/vision2/vision2.c
+++ b/board/ttcontrol/vision2/vision2.c
@@ -428,9 +428,8 @@ static void setup_gpios(void)
        gpio_direction_output(4, 1);
 
        gpio_direction_output(7, 0);
-       for (i = 65; i < 71; i++) {
+       for (i = 65; i < 71; i++)
                gpio_direction_output(i, 0);
-       }
 
        gpio_direction_output(94, 0);
 
@@ -522,7 +521,7 @@ static void setup_fec(void)
 }
 
 struct fsl_esdhc_cfg esdhc_cfg[1] = {
-       {MMC_SDHC1_BASE_ADDR, 1},
+       {MMC_SDHC1_BASE_ADDR},
 };
 
 int get_mmc_getcd(u8 *cd, struct mmc *mmc)
@@ -605,7 +604,7 @@ void lcd_enable(void)
        gpio_set_value(2, 1);
        mxc_request_iomux(MX51_PIN_GPIO1_2, IOMUX_CONFIG_ALT0);
 
-       ret = mx51_fb_init(&nec_nl6448bc26_09c, 0, IPU_PIX_FMT_RGB666);
+       ret = ipuv3_fb_init(&nec_nl6448bc26_09c, 0, IPU_PIX_FMT_RGB666);
        if (ret)
                puts("LCD cannot be configured\n");
 }
@@ -675,11 +674,18 @@ int board_late_init(void)
        udelay(2000);
 #endif
 
-       setenv("stdout", "serial");
-
        return 0;
 }
 
+/*
+ * Do not overwrite the console
+ * Use always serial for U-Boot console
+ */
+int overwrite_console(void)
+{
+       return 1;
+}
+
 int checkboard(void)
 {
        puts("Board: TTControl Vision II CPU V\n");