karo: tx6: check ctrlc before returning error code for unsupported baseboard

diff --git a/board/karo/tx6/tx6qdl.c b/board/karo/tx6/tx6qdl.c
index c21f1c4ec5a4562761b25b9e155ec61b71cb125a..f0076e6ccdeee20342e6c73112534ec5077ab2e6 100644 (file)
--- a/board/karo/tx6/tx6qdl.c
+++ b/board/karo/tx6/tx6qdl.c
@@ -1378,7 +1378,6 @@ static void tx6qdl_set_cpu_clock(void)
 
 int board_late_init(void)
 {
 
 int board_late_init(void)
 {

-       int ret = 0;

        const char *baseboard;
 
        debug("%s@%d: \n", __func__, __LINE__);
        const char *baseboard;
 
        debug("%s@%d: \n", __func__, __LINE__);


@@ -1423,7 +1422,8 @@ int board_late_init(void)
        } else {
                printf("WARNING: Unsupported baseboard: '%s'\n",
                        baseboard);
        } else {
                printf("WARNING: Unsupported baseboard: '%s'\n",
                        baseboard);

-               ret = -EINVAL;
+               if (!had_ctrlc())
+                       return -EINVAL;

        }
 
 exit:
        }
 
 exit:


@@ -1431,7 +1431,7 @@ exit:
 
        gpio_set_value(TX6_RESET_OUT_GPIO, 1);
        clear_ctrlc();
 
        gpio_set_value(TX6_RESET_OUT_GPIO, 1);
        clear_ctrlc();

-       return ret;
+       return 0;

 }
 
 #ifdef CONFIG_SERIAL_TAG
 }
 
 #ifdef CONFIG_SERIAL_TAG

diff --git a/board/karo/tx6/tx6ul.c b/board/karo/tx6/tx6ul.c
index ce9450f3ad94aa33b6c393eef16c53e501cf5a8d..7f0133cb5c80e603b81f0a595c59652edfcd248f 100644 (file)
--- a/board/karo/tx6/tx6ul.c
+++ b/board/karo/tx6/tx6ul.c
@@ -1280,7 +1280,6 @@ static void tx6ul_set_cpu_clock(void)
 
 int board_late_init(void)
 {
 
 int board_late_init(void)
 {

-       int ret = 0;

        const char *baseboard;
 
        debug("%s@%d: \n", __func__, __LINE__);
        const char *baseboard;
 
        debug("%s@%d: \n", __func__, __LINE__);


@@ -1325,7 +1324,8 @@ int board_late_init(void)
        } else {
                printf("WARNING: Unsupported baseboard: '%s'\n",
                        baseboard);
        } else {
                printf("WARNING: Unsupported baseboard: '%s'\n",
                        baseboard);

-               ret = -EINVAL;
+               if (!had_ctrlc())
+                       return -EINVAL;

        }
 
 exit:
        }
 
 exit:


@@ -1334,7 +1334,7 @@ exit:
        debug("%s@%d: \n", __func__, __LINE__);
 
        clear_ctrlc();
        debug("%s@%d: \n", __func__, __LINE__);
 
        clear_ctrlc();

-       return ret;
+       return 0;

 }
 
 #ifdef CONFIG_SERIAL_TAG
 }
 
 #ifdef CONFIG_SERIAL_TAG