summaryrefslogtreecommitdiff
path: root/lib_arm/bootm.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 /lib_arm/bootm.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 'lib_arm/bootm.c')
-rw-r--r--lib_arm/bootm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib_arm/bootm.c b/lib_arm/bootm.c
index 9dc790dee..174ea9cc4 100644
--- a/lib_arm/bootm.c
+++ b/lib_arm/bootm.c
@@ -24,9 +24,10 @@
#include <common.h>
#include <command.h>
#include <image.h>
+#include <boottime.h>
#include <u-boot/zlib.h>
#include <asm/byteorder.h>
-#include <asm/boottime.h>
+
DECLARE_GLOBAL_DATA_PTR;
@@ -201,7 +202,7 @@ static void setup_boottime_tags(void)
if (b == NULL)
break;
- params->u.boottime.entry[i].tick = b->tick;
+ params->u.boottime.entry[i].time = b->time;
strncpy((char *)params->u.boottime.entry[i].name,
(char *)b->name, BOOTTIME_MAX_NAME_LEN);
params->u.boottime.entry[i].name[BOOTTIME_MAX_NAME_LEN - 1] = '\0';