Merge branch 'tx53-update-2016-02-03' into karo-tx6

[karo-tx-uboot.git] / board / karo / tx53 / tx53.c

diff --git a/board/karo/tx53/tx53.c b/board/karo/tx53/tx53.c
index 082d2bdd761f046acddbb5a1a3e45cca4da07298..49cc641fc6b265d04d83af88360419ae6b901f1f 100644 (file)
--- a/board/karo/tx53/tx53.c
+++ b/board/karo/tx53/tx53.c
@@ -496,7 +496,7 @@ int board_init(void)
                        printf("WDOG RESET detected; Skipping PMIC setup\n");
                else
                        printf("<CTRL-C> detected; safeboot enabled\n");
-               return 1;
+               return 0;
        }
 
        ret = setup_pmic_voltages();
@@ -762,14 +762,12 @@ static const struct gpio stk5_gpios[] = {
 };
 
 #ifdef CONFIG_LCD
-static u16 tx53_cmap[256];
 vidinfo_t panel_info = {
        /* set to max. size supported by SoC */
        .vl_col = 1600,
        .vl_row = 1200,
 
        .vl_bpix = LCD_COLOR32,    /* Bits per pixel, 0: 1bpp, 1: 2bpp, 2: 4bpp, 3: 8bpp ... */
-       .cmap = tx53_cmap,
 };
 
 static struct fb_videomode tx53_fb_modes[] = {
@@ -1332,7 +1330,6 @@ static void tx53_init_mac(void)
 
 int board_late_init(void)
 {
-       int ret = 0;
        const char *baseboard;
 
        env_cleanup();
@@ -1372,7 +1369,8 @@ int board_late_init(void)
        } else {
                printf("WARNING: Unsupported baseboard: '%s'\n",
                        baseboard);
-               ret = -EINVAL;
+               if (!had_ctrlc())
+                       return -EINVAL;
        }
 
 exit:
@@ -1383,7 +1381,7 @@ exit:
 
        get_hab_status();
 
-       return ret;
+       return 0;
 }
 
 int checkboard(void)