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

diff --git a/board/karo/tx28/flash.c b/board/karo/tx28/flash.c
index 7833f797333eb69338bd6480761ff7051720b193..af9bb7285e3146c27262f11176574fe20b75416a 100644 (file)
--- a/board/karo/tx28/flash.c
+++ b/board/karo/tx28/flash.c
@@ -375,7 +375,7 @@ static int tx28_prog_uboot(void *addr, int start_block, int skip,
        if (doit) {
                actual = size;
                ret = nand_write_skip_bad(mtd, prg_start, &actual, NULL,
-                                       prg_length, addr, WITH_DROP_FFS);
+                                       prg_length, addr, 0);
                if (ret) {
                        printf("Failed to program flash: %d\n", ret);
                        return ret;

diff --git a/board/karo/tx28/tx28.c b/board/karo/tx28/tx28.c
index b8086a02e15ea203549b9a6c011de0855334afa1..1089d4f65bf4504d49eac24ded05ffc97f32fc2a 100644 (file)
--- a/board/karo/tx28/tx28.c
+++ b/board/karo/tx28/tx28.c
@@ -24,6 +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 @@ 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
@@ -625,8 +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 +807,7 @@ void lcd_ctrl_init(void *lcdbase)
                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 +876,8 @@ int board_late_init(void)
        } else {
                printf("WARNING: Unsupported baseboard: '%s'\n",
                        baseboard);
-               ret = -EINVAL;
+               if (!had_ctrlc())
+                       ret = -EINVAL;
        }
 
 exit:

diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index f7877dfccb0ac5d2da98e39a10cf03f5518915ad..5976ef8558ef25fc34dd975bd383d8f5c28d87f4 100644 (file)
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -202,7 +202,9 @@
 #define CONFIG_SYS_MAX_NAND_DEVICE     0x1
 #define CONFIG_SYS_NAND_5_ADDR_CYCLE
 #define CONFIG_SYS_NAND_BASE           0x00000000
-#endif /* CONFIG_CMD_NAND */
+#endif /* CONFIG_NAND */
+
+#define CONFIG_ENV_OVERWRITE
 
 #ifdef CONFIG_ENV_IS_IN_NAND
 #define CONFIG_ENV_OFFSET              (CONFIG_U_BOOT_IMG_SIZE + CONFIG_SYS_NAND_U_BOOT_OFFS)
@@ -237,7 +239,6 @@
  */
 #ifdef CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV         0
-#define CONFIG_ENV_OVERWRITE
 /* Associated with the MMC layout defined in mmcops.c */
 #define CONFIG_ENV_OFFSET              SZ_1K
 #define CONFIG_ENV_SIZE                        (SZ_128K - CONFIG_ENV_OFFSET)