spl: Remove #ifdefs with BOOTSTAGE
This feature has some helpers in its header file so that its functions resolve to nothing when the feature is disabled. Add a few more and use these to simplify the code. With this there are no more #ifdefs in board_init_r() Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
@@ -244,6 +244,8 @@ void show_boot_progress(int val);
|
||||
|
||||
#ifdef ENABLE_BOOTSTAGE
|
||||
|
||||
#include <mapmem.h>
|
||||
|
||||
/* This is the full bootstage implementation */
|
||||
|
||||
/**
|
||||
@@ -452,6 +454,26 @@ static inline int bootstage_init(bool first)
|
||||
|
||||
#endif /* ENABLE_BOOTSTAGE */
|
||||
|
||||
/* helpers for SPL */
|
||||
int _bootstage_stash_default(void);
|
||||
int _bootstage_unstash_default(void);
|
||||
|
||||
static inline int bootstage_stash_default(void)
|
||||
{
|
||||
if (CONFIG_IS_ENABLED(BOOTSTAGE) && IS_ENABLED(CONFIG_BOOTSTAGE_STASH))
|
||||
return _bootstage_stash_default();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int bootstage_unstash_default(void)
|
||||
{
|
||||
if (CONFIG_IS_ENABLED(BOOTSTAGE) && IS_ENABLED(CONFIG_BOOTSTAGE_STASH))
|
||||
return _bootstage_unstash_default();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Helper macro for adding a bootstage to a line of code */
|
||||
#define BOOTSTAGE_MARKER() \
|
||||
bootstage_mark_code(__FILE__, __func__, __LINE__)
|
||||
|
||||
Reference in New Issue
Block a user