From: Tom Rini <trini@ti.com>
Date: Mon, 15 Oct 2012 20:37:22 +0000 (-0700)
Subject: Merge branch 'agust@denx.de-next' of git://git.denx.de/u-boot-staging
X-Git-Tag: v2013.01-rc1~174
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fkernel%2Fu-boot.git;a=commitdiff_plain;h=bd23b22badadcdc414a900828253961fc5ec6c39

Merge branch 'agust@denx.de-next' of git://git.denx.de/u-boot-staging
---

bd23b22badadcdc414a900828253961fc5ec6c39
diff --cc include/bootstage.h
index db94a95,8fa1326..3b2216b
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@@ -218,13 -228,21 +229,24 @@@ ulong timer_get_boot_us(void)
   *		has occurred.
   */
  void show_boot_progress(int val);
 +#else
 +#define show_boot_progress(val) do {} while (0)
 +#endif
  
 -#ifdef CONFIG_BOOTSTAGE
 +#if defined(CONFIG_BOOTSTAGE) && !defined(CONFIG_SPL_BUILD)
  /* This is the full bootstage implementation */
  
+ /**
+  * Add a new bootstage record
+  *
+  * @param id	Bootstage ID to use (ignored if flags & BOOTSTAGEF_ALLOC)
+  * @param name	Name of record, or NULL for none
+  * @param flags	Flags (BOOTSTAGEF_...)
+  * @param mark	Time to record in this record, in microseconds
+  */
+ ulong bootstage_add_record(enum bootstage_id id, const char *name,
+ 			   int flags, ulong mark);
+ 
  /*
   * Mark a time stamp for the current boot stage.
   */