| Message ID | 20200122202825.9160-1-ovpanait@gmail.com |
|---|---|
| State | Accepted |
| Commit | 016e4ae7ef076e6c4abe0e2ec97cfc3e6d03a578 |
| Headers | show |
| Series | common/board_f.c: Remove arch-specific checks for cpucheck | expand |
On Wed, Jan 22, 2020 at 10:28:25PM +0200, Ovidiu Panait wrote: > This removes the arch-specific checks for "checkcpu" function from the init > sequence. Make "checkcpu" generic and provide a weak nop stub instead. > > Signed-off-by: Ovidiu Panait <ovpanait at gmail.com> Applied to u-boot/master, thanks!
diff --git a/common/board_f.c b/common/board_f.c index 3f0132a6e3..8fa26e3ca5 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -862,6 +862,11 @@ __weak int arch_cpu_init_dm(void) return 0; } +__weak int checkcpu(void) +{ + return 0; +} + static const init_fnc_t init_sequence_f[] = { setup_mon_len, #ifdef CONFIG_OF_CONTROL @@ -904,9 +909,7 @@ static const init_fnc_t init_sequence_f[] = { console_init_f, /* stage 1 init of console */ display_options, /* say that we are here */ display_text_info, /* show debugging info if required */ -#if defined(CONFIG_PPC) || defined(CONFIG_SH) || defined(CONFIG_X86) checkcpu, -#endif #if defined(CONFIG_SYSRESET) print_resetinfo, #endif
This removes the arch-specific checks for "checkcpu" function from the init sequence. Make "checkcpu" generic and provide a weak nop stub instead. Signed-off-by: Ovidiu Panait <ovpanait at gmail.com> --- common/board_f.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)