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

[karo-tx-uboot.git] / include / bootstage.h

diff --git a/include/bootstage.h b/include/bootstage.h
index 8fa13264d043a6abcbf12f658f62e1e9e86ecbc4..3b2216b8a8c8316df3dec35153947087623a905c 100644 (file)
--- a/include/bootstage.h
+++ b/include/bootstage.h
@@ -221,6 +221,7 @@ enum bootstage_id {
  */
 ulong timer_get_boot_us(void);
 
+#ifndef CONFIG_SPL_BUILD
 /*
  * Board code can implement show_boot_progress() if needed.
  *
@@ -228,8 +229,11 @@ 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 */
 
 /**