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

diff --cc README
Simple merge

diff --cc arch/arm/lib/bootm.c
Simple merge

diff --cc common/Makefile
Simple merge

diff --cc include/bootstage.h
index db94a957e6e65ae057314fa62bfcc380808e580c,8fa13264d043a6abcbf12f658f62e1e9e86ecbc4..3b2216b8a8c8316df3dec35153947087623a905c
--- 1/include/bootstage.h
--- 2/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.
   */