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>

3 files changed, 3 insertions, 86 deletions

diff --git a/lib_arm/Makefile b/lib_arm/Makefile
index 5cfeba985..02933485c 100644
--- a/lib_arm/Makefile
+++ b/lib_arm/Makefile
@@ -44,7 +44,6 @@ COBJS-y	+= cache-cp15.o
 endif
 COBJS-y	+= interrupts.o
 COBJS-y	+= reset.o
-COBJS-y	+= boottime.o
 
 SRCS	:= $(GLSOBJS:.o=.S) $(GLCOBJS:.o=.c) \
 	   $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
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';
diff --git a/lib_arm/boottime.c b/lib_arm/boottime.c
deleted file mode 100644
index 3c84bb3e3..000000000
--- a/lib_arm/boottime.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * (C) Copyright 2009 ST-Ericsson AB
- * Jonas Aaberg <jonas.aberg@stericsson.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307	 USA
- *
- */
-
-
-#include <common.h>
-#include <asm/byteorder.h>
-#include <asm/boottime.h>
-#include <asm/setup.h>
-
-#ifdef CONFIG_BOOTTIME
-ulong get_raw_timer(void);
-
-static struct tag_boottime boottime;
-
-int boottime_tag(char *name)
-{
-	if (boottime.num == BOOTTIME_MAX) {
-		printf("boottime: out of entries!\n");
-		return -1;
-	}
-
-	strncpy((char *)boottime.entry[boottime.num].name,
-		name,
-		BOOTTIME_MAX_NAME_LEN);
-	boottime.entry[boottime.num].name[BOOTTIME_MAX_NAME_LEN - 1] = '\0';
-	boottime.entry[boottime.num].tick = get_raw_timer();
-
-	boottime.num++;
-	return 0;
-}
-
-
-struct boottime_entry *boottime_get_entry(unsigned int i)
-{
-	if (i >= boottime.num)
-		return NULL;
-	else
-		return &boottime.entry[i];
-}
-
-
-void boottime_idle_add(ulong i)
-{
-	boottime.idle += i;
-}
-
-ulong boottime_idle_done(void)
-{
-	return get_raw_timer();
-}
-
-ulong boottime_idle_get(void)
-{
-	return boottime.idle;
-}
-
-void boottime_remove_last(void)
-{
-	if (boottime.num > 0)
-		boottime.num--;
-}
-#endif
-
-
-
-