summaryrefslogtreecommitdiff
path: root/common/main.c
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2010-02-01 08:29:27 +0100
committerMichael BRANDT <michael.brandt@stericsson.com>2010-07-23 14:33:28 +0200
commitc00ace75f2658989625d99e0a4e49f4428924555 (patch)
tree85d20d21088db735fe0d915f9522479c400cbfa4 /common/main.c
parentb1078a80d3830ec0ee56091d48e1830abe48d1dd (diff)
Boottime changes. Moved generic boottime code from lib_arm to common. Boottime now internally uses us instead of ticks.
Reviewed-by: Michael Brandt <michael.brandt@stericsson.com> Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com> Change-Id: If30d2eb384d6e82daa86c3cab7a6fd2a22baefb5 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/3053 Reviewed-by: Michael BRANDT <michael.brandt@stericsson.com>
Diffstat (limited to 'common/main.c')
-rw-r--r--common/main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/common/main.c b/common/main.c
index 10d890417..88e7fd2e9 100644
--- a/common/main.c
+++ b/common/main.c
@@ -38,6 +38,7 @@
#include <hush.h>
#endif
+#include <boottime.h>
#include <post.h>
#if defined(CONFIG_SILENT_CONSOLE) || defined(CONFIG_POST) || defined(CONFIG_CMDLINE_EDITING)
@@ -215,6 +216,10 @@ static __inline__ int abortboot(int bootdelay)
{
int abort = 0;
+#ifdef CONFIG_BOOTTIME
+ boottime_tag("autoboot_delay");
+#endif
+
#ifdef CONFIG_MENUPROMPT
printf(CONFIG_MENUPROMPT);
#else