[PATCH 04/20] timer: Use a shorter error in TPL

Simon Glass sjg at chromium.org
Thu Dec 17 21:57:18 CET 2020


This error should not happen in normal use. Reduce the length of it to
save space in the image.

Add an empty spl.h file to sh since it appears to lack this.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

 lib/time.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/time.c b/lib/time.c
index 88bc50405ff..cc6944ec345 100644
--- a/lib/time.c
+++ b/lib/time.c
@@ -9,6 +9,7 @@
 #include <dm.h>
 #include <errno.h>
 #include <init.h>
+#include <spl.h>
 #include <time.h>
 #include <timer.h>
 #include <watchdog.h>
@@ -96,8 +97,13 @@ uint64_t notrace get_ticks(void)
 	}
 
 	ret = timer_get_count(gd->timer, &count);
-	if (ret)
-		panic("Could not read count from timer (err %d)\n", ret);
+	if (ret) {
+		if (spl_phase() > PHASE_TPL)
+			panic("Could not read count from timer (err %d)\n",
+			      ret);
+		else
+			panic("no timer (err %d)\n", ret);
+	}
 
 	return count;
 }
-- 
2.29.2.684.gfbc64c5ab5-goog



More information about the U-Boot mailing list