projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'agust@denx.de-next' of git://git.denx.de/u-boot-staging
[platform/kernel/u-boot.git]
/
include
/
bootstage.h
diff --git
a/include/bootstage.h
b/include/bootstage.h
index
8fa1326
..
3b2216b
100644
(file)
--- a/
include/bootstage.h
+++ b/
include/bootstage.h
@@
-221,6
+221,7
@@
enum bootstage_id {
*/
ulong timer_get_boot_us(void);
*/
ulong timer_get_boot_us(void);
+#ifndef CONFIG_SPL_BUILD
/*
* Board code can implement show_boot_progress() if needed.
*
/*
* 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);
* has occurred.
*/
void show_boot_progress(int val);
+#else
+#define show_boot_progress(val) do {} while (0)
+#endif
-#if
def CONFIG_BOOTSTAGE
+#if
defined(CONFIG_BOOTSTAGE) && !defined(CONFIG_SPL_BUILD)
/* This is the full bootstage implementation */
/**
/* This is the full bootstage implementation */
/**