From: Ben Dooks Date: Wed, 7 May 2025 12:23:42 +0000 (+0100) Subject: common: add config for board_init() call X-Git-Tag: v2025.10-rc1~118^2~75 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=86acdce2ba886153f152b924b28e5c040e316c80;p=thirdparty%2Fu-boot.git common: add config for board_init() call Add CONFIG_BOARD_INIT to specifu if the board_init() needs calling during initcall phase, and default it to 'y' for the relevant architectures which probably need it. This allows anyone with a board that doesn't need it to just remove it from the initcall list w/o an empty code block in the board init file. Signed-off-by: Ben Dooks Reviewed-by: Tom Rini --- diff --git a/common/Kconfig b/common/Kconfig index be517b80eb5..17539079f90 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -727,6 +727,13 @@ config BOARD_EARLY_INIT_R relocation. With this option, U-Boot calls board_early_init_r() in the post-relocation init sequence. +config BOARD_INIT + bool "Call board-specific init board_init() during init-calls" + default y if ARM || RISCV || SANDBOX + help + Some boards need an board_init() function called during the initcall + phase of startup. + config BOARD_POSTCLK_INIT bool "Call board_postclk_init" help diff --git a/common/board_r.c b/common/board_r.c index b90a4d9ff69..65ff5fb595c 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -649,8 +649,7 @@ static void initcall_run_r(void) #if CONFIG_IS_ENABLED(ADDR_MAP) INITCALL(init_addr_map); #endif -#if CONFIG_IS_ENABLED(ARM) || CONFIG_IS_ENABLED(RISCV) || \ - CONFIG_IS_ENABLED(SANDBOX) +#if CONFIG_IS_ENABLED(BOARD_INIT) INITCALL(board_init); /* Setup chipselects */ #endif /*