diff options
| author | Tom Rini <trini@ti.com> | 2012-10-04 10:00:42 -0700 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2012-10-04 10:00:42 -0700 |
| commit | 198166877768cf4d0197289a524df8a6ca0e2f19 (patch) | |
| tree | d8fb2afc6d5b09ceeb4e3e62dc20b64d167ab346 /include/bootstage.h | |
| parent | 73c15c634dda388e21eaf0ebc85e324872df0d25 (diff) | |
| parent | 777544085d2b417a36df50eb564bf037a044e60e (diff) | |
| download | olio-uboot-2014.01-198166877768cf4d0197289a524df8a6ca0e2f19.tar.xz olio-uboot-2014.01-198166877768cf4d0197289a524df8a6ca0e2f19.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'include/bootstage.h')
| -rw-r--r-- | include/bootstage.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/bootstage.h b/include/bootstage.h index a00053888..db94a957e 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -210,6 +210,7 @@ enum bootstage_id { */ ulong timer_get_boot_us(void); +#ifndef CONFIG_SPL_BUILD /* * Board code can implement show_boot_progress() if needed. * @@ -217,8 +218,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 */ /* |