From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Thu, 18 Feb 2016 17:18:43 +0000 (+0100)
Subject: karo: tx6: check ctrlc before returning error code for unsupported baseboard
X-Git-Tag: KARO-TX6-2016-03-10~2^2~6
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=6ddef5f3686db2caf55c74648891a27be9e23b76

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 c21f1c4ec5..f0076e6ccd 100644
--- 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 ret = 0;
 	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);
-		ret = -EINVAL;
+		if (!had_ctrlc())
+			return -EINVAL;
 	}
 
 exit:
@@ -1431,7 +1431,7 @@ exit:
 
 	gpio_set_value(TX6_RESET_OUT_GPIO, 1);
 	clear_ctrlc();
-	return ret;
+	return 0;
 }
 
 #ifdef CONFIG_SERIAL_TAG
diff --git a/board/karo/tx6/tx6ul.c b/board/karo/tx6/tx6ul.c
index ce9450f3ad..7f0133cb5c 100644
--- 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 ret = 0;
 	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);
-		ret = -EINVAL;
+		if (!had_ctrlc())
+			return -EINVAL;
 	}
 
 exit:
@@ -1334,7 +1334,7 @@ exit:
 	debug("%s@%d: \n", __func__, __LINE__);
 
 	clear_ctrlc();
-	return ret;
+	return 0;
 }
 
 #ifdef CONFIG_SERIAL_TAG