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

diff --git a/board/karo/tx53/flash.c b/board/karo/tx53/flash.c
index 2d5bcde891ac4f34d9a79e09f76a6818c4253322..c5fe8d7a42f904cb1482e261c56572912b6a3b03 100644 (file)
--- a/board/karo/tx53/flash.c
+++ b/board/karo/tx53/flash.c
@@ -232,7 +232,7 @@ static int tx53_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/tx53/tx53.c b/board/karo/tx53/tx53.c
index 11b071eb33d4f421594d2f24b64ea537a48b776f..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();
@@ -1330,7 +1330,6 @@ static void tx53_init_mac(void)
 
 int board_late_init(void)
 {
-       int ret = 0;
        const char *baseboard;
 
        env_cleanup();
@@ -1370,7 +1369,8 @@ int board_late_init(void)
        } else {
                printf("WARNING: Unsupported baseboard: '%s'\n",
                        baseboard);
-               ret = -EINVAL;
+               if (!had_ctrlc())
+                       return -EINVAL;
        }
 
 exit:
@@ -1381,7 +1381,7 @@ exit:
 
        get_hab_status();
 
-       return ret;
+       return 0;
 }
 
 int checkboard(void)