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

diff --combined board/karo/tx28/tx28.c
index b8086a02e15ea203549b9a6c011de0855334afa1,25d61c2abc52f2b14f852c7a790d70e7e32ed813..1089d4f65bf4504d49eac24ded05ffc97f32fc2a
--- 1/board/karo/tx28/tx28.c
--- 2/board/karo/tx28/tx28.c
+++ b/board/karo/tx28/tx28.c
@@@ -24,6 -24,7 +24,7 @@@
  #include <netdev.h>
  #include <mmc.h>
  #include <mxcfb.h>
+ #include <video_fb.h>
  #include <linux/list.h>
  #include <linux/fb.h>
  #include <asm/io.h>
@@@ -167,10 -168,8 +168,8 @@@ rtc_err
  
  int board_init(void)
  {
-       if (ctrlc()) {
+       if (ctrlc())
                printf("CTRL-C detected; safeboot enabled\n");
-               return 1;
-       }
  
        /* Address of boot parameters */
  #ifdef CONFIG_OF_LIBFDT
@@@ -402,12 -401,14 +401,12 @@@ static const struct gpio stk5_gpios[] 
  };
  
  #ifdef CONFIG_LCD
 -static ushort tx28_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 = tx28_cmap,
  };
  
  static struct fb_videomode tx28_fb_modes[] = {
@@@ -625,8 -626,6 +624,6 @@@ static const struct gpio stk5_lcd_gpios
        { TX28_LCD_BACKLIGHT_GPIO, GPIOFLAG_OUTPUT_INIT_HIGH, "LCD BACKLIGHT", },
  };
  
- extern void video_hw_init(void *lcdbase);
- 
  void lcd_ctrl_init(void *lcdbase)
  {
        int color_depth = 24;
@@@ -810,7 -809,7 +807,7 @@@
                setenv("videomode", vmode);
  
                debug("Initializing LCD controller\n");
-               video_hw_init(lcdbase);
+               video_hw_init();
                setenv("videomode", NULL);
        } else {
                debug("Skipping initialization of LCD controller\n");
@@@ -879,7 -878,8 +876,8 @@@ int board_late_init(void
        } else {
                printf("WARNING: Unsupported baseboard: '%s'\n",
                        baseboard);
-               ret = -EINVAL;
+               if (!had_ctrlc())
+                       ret = -EINVAL;
        }
  
  exit: