diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2010-02-01 08:29:27 +0100 |
|---|---|---|
| committer | Michael BRANDT <michael.brandt@stericsson.com> | 2010-07-23 14:33:28 +0200 |
| commit | c00ace75f2658989625d99e0a4e49f4428924555 (patch) | |
| tree | 85d20d21088db735fe0d915f9522479c400cbfa4 /include/asm-arm | |
| parent | b1078a80d3830ec0ee56091d48e1830abe48d1dd (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 'include/asm-arm')
| -rw-r--r-- | include/asm-arm/boottime.h | 41 | ||||
| -rw-r--r-- | include/asm-arm/setup.h | 13 |
2 files changed, 6 insertions, 48 deletions
diff --git a/include/asm-arm/boottime.h b/include/asm-arm/boottime.h deleted file mode 100644 index c9a43e259..000000000 --- a/include/asm-arm/boottime.h +++ /dev/null @@ -1,41 +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 - * - */ - - - -#ifndef BOOTTIME_H -#define BOOTTIME_H - -#include <asm/setup.h> - -#ifdef CONFIG_BOOTTIME -int boottime_tag(char *name); -void boottime_remove_last(void); -struct boottime_entry *boottime_get_entry(unsigned int i); -ulong boottime_idle_get(void); -ulong boottime_idle_done(void); -void boottime_idle_add(ulong i); -#else -#define boottime_tag(x) 0 -#define boottime_remove_last() -#define boottime_idle_add(x) -#endif - -#endif diff --git a/include/asm-arm/setup.h b/include/asm-arm/setup.h index 467f6d9dd..36b11c459 100644 --- a/include/asm-arm/setup.h +++ b/include/asm-arm/setup.h @@ -21,6 +21,8 @@ #ifndef __ASMARM_SETUP_H #define __ASMARM_SETUP_H +#include <boottime.h> + /* * Usage: * - do not go blindly adding fields, add them at the end @@ -206,22 +208,19 @@ struct tag_memclk { }; /* for automatic boot timing testcases */ + #define ATAG_BOOTTIME 0x41000403 -#define BOOTTIME_MAX_NAME_LEN 64 #define BOOTTIME_MAX 10 -struct boottime_entry { - u32 tick; - u8 name[BOOTTIME_MAX_NAME_LEN]; -}; struct tag_boottime { struct boottime_entry entry[BOOTTIME_MAX]; - u32 idle; - u32 total; + u32 idle; /* in us */ + u32 total; /* in us */ u8 num; }; + struct tag { struct tag_header hdr; union { |