From 496c5483e9ad80d34ff0d9ee9abb813e51be2237 Mon Sep 17 00:00:00 2001 From: Heiko Schocher Date: Tue, 7 Jun 2016 08:31:20 +0200 Subject: [PATCH] bootstage: call show_boot_progress also in SPL show_boot_progress() is now called from SPL also. Signed-off-by: Heiko Schocher --- common/init/board_init.c | 5 +++++ common/spl/spl.c | 5 +++++ include/bootstage.h | 6 +++--- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/common/init/board_init.c b/common/init/board_init.c index d17bb298d7..ef01a9aeaa 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -146,3 +146,8 @@ void board_init_f_init_reserve(ulong base) base += CONFIG_SYS_MALLOC_F_LEN; #endif } + +/* + * Board-specific Platform code can reimplement show_boot_progress () if needed + */ +__weak void show_boot_progress(int val) {} diff --git a/common/spl/spl.c b/common/spl/spl.c index c8dfc14508..840910a684 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -35,6 +35,11 @@ struct spl_image_info spl_image; /* Define board data structure */ static bd_t bdata __attribute__ ((section(".data"))); +/* + * Board-specific Platform code can reimplement show_boot_progress () if needed + */ +__weak void show_boot_progress(int val) {} + /* * Default function to determine if u-boot or the OS should * be started. This implementation always returns 1. diff --git a/include/bootstage.h b/include/bootstage.h index 0880a680b9..a589be6316 100644 --- a/include/bootstage.h +++ b/include/bootstage.h @@ -213,7 +213,9 @@ enum bootstage_id { */ ulong timer_get_boot_us(void); -#if !defined(CONFIG_SPL_BUILD) && !defined(USE_HOSTCC) +#if defined(USE_HOSTCC) +#define show_boot_progress(val) do {} while (0) +#else /* * Board code can implement show_boot_progress() if needed. * @@ -221,8 +223,6 @@ ulong timer_get_boot_us(void); * has occurred. */ void show_boot_progress(int val); -#else -#define show_boot_progress(val) do {} while (0) #endif #if defined(CONFIG_BOOTSTAGE) && !defined(CONFIG_SPL_BUILD) && \ -- 2.39.5