[RFC PATCH] common: board: Simply array with function pointers with CONFIG_IS_ENABLED
Michal Simek
michal.simek at amd.com
Tue Dec 10 14:39:42 CET 2024
Convert all simple cases where current ifdef is used with using
CONFIG_IS_ENABLED.
The change doesn't have impact on code size and it is only cleaning up
description.
Checkpatch is reporting issue:
space required after that ',' (ctx:VxB)
When space is there another warning is coming up:
space prohibited before that close parenthesis ')'
but there is no way how to fix it that's why leave it like it is.
Signed-off-by: Michal Simek <michal.simek at amd.com>
---
I think this is the first step to cleanup the array. Another step should be
to look at functions which are called and functions which are called
without checking any Kconfig symbol (for example initr_status_led() which
likely depends on LED code to be enabled).
---
common/board_f.c | 49 +++++-------------
common/board_r.c | 128 ++++++++++++-----------------------------------
2 files changed, 46 insertions(+), 131 deletions(-)
diff --git a/common/board_f.c b/common/board_f.c
index ebc934ab8105..7860ea378651 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -861,28 +861,20 @@ static int initf_upl(void)
static const init_fnc_t init_sequence_f[] = {
setup_mon_len,
-#ifdef CONFIG_OF_CONTROL
- fdtdec_setup,
-#endif
-#ifdef CONFIG_TRACE_EARLY
- trace_early_init,
-#endif
+ CONFIG_IS_ENABLED(OF_CONTROL, (fdtdec_setup,))
+ CONFIG_IS_ENABLED(TRACE_EARLY, (trace_early_init,))
initf_malloc,
initf_upl,
log_init,
initf_bootstage, /* uses its own timer, so does not need DM */
event_init,
bloblist_maybe_init,
-#if defined(CONFIG_CONSOLE_RECORD_INIT_F)
- console_record_init,
-#endif
+ CONFIG_IS_ENABLED(CONSOLE_RECORD_INIT_F, (console_record_init,))
INITCALL_EVENT(EVT_FSP_INIT_F),
arch_cpu_init, /* basic arch cpu dependent setup */
mach_cpu_init, /* SoC/machine dependent CPU setup */
initf_dm,
-#if defined(CONFIG_BOARD_EARLY_INIT_F)
- board_early_init_f,
-#endif
+ CONFIG_IS_ENABLED(BOARD_EARLY_INIT_F, (board_early_init_f,))
#if defined(CONFIG_PPC) || defined(CONFIG_SYS_FSL_CLK) || defined(CONFIG_M68K)
/* get CPU and bus clocks according to the environment variable */
get_clocks, /* get CPU and bus clocks (etc.) */
@@ -890,9 +882,7 @@ static const init_fnc_t init_sequence_f[] = {
#if !defined(CONFIG_M68K) || (defined(CONFIG_M68K) && !defined(CONFIG_MCFTMR))
timer_init, /* initialize timer */
#endif
-#if defined(CONFIG_BOARD_POSTCLK_INIT)
- board_postclk_init,
-#endif
+ CONFIG_IS_ENABLED(BOARD_POSTCLK_INIT, (board_postclk_init,))
env_init, /* initialize environment */
init_baud_rate, /* initialze baudrate settings */
serial_init, /* serial communications setup */
@@ -900,38 +890,25 @@ static const init_fnc_t init_sequence_f[] = {
display_options, /* say that we are here */
display_text_info, /* show debugging info if required */
checkcpu,
-#if defined(CONFIG_SYSRESET)
- print_resetinfo,
-#endif
-#if defined(CONFIG_DISPLAY_CPUINFO)
- print_cpuinfo, /* display cpu info (and speed) */
-#endif
-#if defined(CONFIG_DTB_RESELECT)
- embedded_dtb_select,
-#endif
-#if defined(CONFIG_DISPLAY_BOARDINFO)
- show_board_info,
-#endif
+ CONFIG_IS_ENABLED(SYSRESET, (print_resetinfo,))
+ /* display cpu info (and speed) */
+ CONFIG_IS_ENABLED(DISPLAY_CPUINFO, (print_cpuinfo,))
+ CONFIG_IS_ENABLED(DTB_RESELECT, (embedded_dtb_select,))
+ CONFIG_IS_ENABLED(DISPLAY_BOARDINFO, (show_board_info,))
INIT_FUNC_WATCHDOG_INIT
INITCALL_EVENT(EVT_MISC_INIT_F),
INIT_FUNC_WATCHDOG_RESET
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
- init_func_i2c,
-#endif
+ CONFIG_IS_ENABLED(SYS_I2C_LEGACY, (init_func_i2c,))
announce_dram_init,
dram_init, /* configure available RAM banks */
-#ifdef CONFIG_POST
- post_init_f,
-#endif
+ CONFIG_IS_ENABLED(POST, (post_init_f,))
INIT_FUNC_WATCHDOG_RESET
#if defined(CFG_SYS_DRAM_TEST)
testdram,
#endif /* CFG_SYS_DRAM_TEST */
INIT_FUNC_WATCHDOG_RESET
-#ifdef CONFIG_POST
- init_post,
-#endif
+ CONFIG_IS_ENABLED(POST, (init_post,))
INIT_FUNC_WATCHDOG_RESET
/*
* Now that we have DRAM mapped and working, we can
diff --git a/common/board_r.c b/common/board_r.c
index ff9bce88dc93..9c3706dbfe2b 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -603,19 +603,11 @@ static init_fnc_t init_sequence_r[] = {
initr_malloc,
log_init,
initr_bootstage, /* Needs malloc() but has its own timer */
-#if defined(CONFIG_CONSOLE_RECORD)
- console_record_init,
-#endif
-#ifdef CONFIG_SYS_NONCACHED_MEMORY
- noncached_init,
-#endif
+ CONFIG_IS_ENABLED(CONSOLE_RECORD, (console_record_init,))
+ CONFIG_IS_ENABLED(SYS_NONCACHED_MEMORY, (noncached_init,))
initr_of_live,
-#ifdef CONFIG_DM
- initr_dm,
-#endif
-#ifdef CONFIG_ADDR_MAP
- init_addr_map,
-#endif
+ CONFIG_IS_ENABLED(DM, (initr_dm,))
+ CONFIG_IS_ENABLED(ADDR_MAP, (init_addr_map,))
#if defined(CONFIG_ARM) || defined(CONFIG_RISCV) || defined(CONFIG_SANDBOX)
board_init, /* Setup chipselects */
#endif
@@ -625,36 +617,22 @@ static init_fnc_t init_sequence_r[] = {
* davinci SOC's is added. Remove this check once all the board
* implement this.
*/
-#ifdef CONFIG_CLOCKS
- set_cpu_clk_info, /* Setup clock information */
-#endif
+ CONFIG_IS_ENABLED(CLOCKS, (set_cpu_clk_info,)) /* Setup clock information */
initr_lmb,
-#ifdef CONFIG_EFI_LOADER
- efi_memory_init,
-#endif
-#ifdef CONFIG_BINMAN_FDT
- initr_binman,
-#endif
-#ifdef CONFIG_FSP_VERSION2
- arch_fsp_init_r,
-#endif
+ CONFIG_IS_ENABLED(EFI_LOADER, (efi_memory_init,))
+ CONFIG_IS_ENABLED(BINMAN_FDT, (initr_binman,))
+ CONFIG_IS_ENABLED(FSP_VERSION2, (arch_fsp_init_r,))
initr_dm_devices,
stdio_init_tables,
serial_initialize,
initr_announce,
dm_announce,
-#if CONFIG_IS_ENABLED(WDT)
- initr_watchdog,
-#endif
+ CONFIG_IS_ENABLED(WDT, (initr_watchdog,))
INIT_FUNC_WATCHDOG_RESET
arch_initr_trap,
-#if defined(CONFIG_BOARD_EARLY_INIT_R)
- board_early_init_r,
-#endif
+ CONFIG_IS_ENABLED(BOARD_EARLY_INIT_R, (board_early_init_r,))
INIT_FUNC_WATCHDOG_RESET
-#ifdef CONFIG_POST
- post_output_backlog,
-#endif
+ CONFIG_IS_ENABLED(POST, (post_output_backlog,))
INIT_FUNC_WATCHDOG_RESET
#if defined(CONFIG_PCI_INIT_R) && defined(CONFIG_SYS_EARLY_PCI_INIT)
/*
@@ -663,45 +641,25 @@ static init_fnc_t init_sequence_r[] = {
*/
pci_init,
#endif
-#ifdef CONFIG_ARCH_EARLY_INIT_R
- arch_early_init_r,
-#endif
+ CONFIG_IS_ENABLED(ARCH_EARLY_INIT_R, (arch_early_init_r,))
power_init_board,
-#ifdef CONFIG_MTD_NOR_FLASH
- initr_flash,
-#endif
+ CONFIG_IS_ENABLED(MTD_NOR_FLASH, (initr_flash,))
INIT_FUNC_WATCHDOG_RESET
#if defined(CONFIG_PPC) || defined(CONFIG_M68K) || defined(CONFIG_X86)
/* initialize higher level parts of CPU like time base and timers */
cpu_init_r,
#endif
-#ifdef CONFIG_EFI_LOADER
- efi_init_early,
-#endif
-#ifdef CONFIG_CMD_NAND
- initr_nand,
-#endif
-#ifdef CONFIG_CMD_ONENAND
- initr_onenand,
-#endif
-#ifdef CONFIG_MMC
- initr_mmc,
-#endif
-#ifdef CONFIG_XEN
- xen_init,
-#endif
-#ifdef CONFIG_PVBLOCK
- initr_pvblock,
-#endif
+ CONFIG_IS_ENABLED(EFI_LOADER, (efi_init_early,))
+ CONFIG_IS_ENABLED(CMD_NAND, (initr_nand,))
+ CONFIG_IS_ENABLED(CMD_ONENAND, (initr_onenand,))
+ CONFIG_IS_ENABLED(MMC, (initr_mmc,))
+ CONFIG_IS_ENABLED(XEN, (xen_init,))
+ CONFIG_IS_ENABLED(PVBLOCK, (initr_pvblock,))
initr_env,
-#ifdef CONFIG_SYS_MALLOC_BOOTPARAMS
- initr_malloc_bootparams,
-#endif
+ CONFIG_IS_ENABLED(SYS_MALLOC_BOOTPARAMS, (initr_malloc_bootparams,))
INIT_FUNC_WATCHDOG_RESET
cpu_secondary_init_r,
-#if defined(CONFIG_ID_EEPROM)
- mac_read_from_eeprom,
-#endif
+ CONFIG_IS_ENABLED(ID_EEPROM, (mac_read_from_eeprom,))
INITCALL_EVENT(EVT_SETTINGS_R),
INIT_FUNC_WATCHDOG_RESET
#if defined(CONFIG_PCI_INIT_R) && !defined(CONFIG_SYS_EARLY_PCI_INIT)
@@ -712,24 +670,15 @@ static init_fnc_t init_sequence_r[] = {
#endif
stdio_add_devices,
jumptable_init,
-#ifdef CONFIG_API
- api_init,
-#endif
+ CONFIG_IS_ENABLED(API, (api_init,))
console_init_r, /* fully init console as a device */
-#ifdef CONFIG_DISPLAY_BOARDINFO_LATE
- console_announce_r,
- show_board_info,
-#endif
-#ifdef CONFIG_ARCH_MISC_INIT
- arch_misc_init, /* miscellaneous arch-dependent init */
-#endif
-#ifdef CONFIG_MISC_INIT_R
- misc_init_r, /* miscellaneous platform-dependent init */
-#endif
+ CONFIG_IS_ENABLED(DISPLAY_BOARDINFO_LATE, (console_announce_r, show_board_info,))
+ /* miscellaneous arch-dependent init */
+ CONFIG_IS_ENABLED(ARCH_MISC_INIT, (arch_misc_init,))
+ /* miscellaneous platform-dependent init */
+ CONFIG_IS_ENABLED(MISC_INIT_R, (misc_init_r,))
INIT_FUNC_WATCHDOG_RESET
-#ifdef CONFIG_CMD_KGDB
- kgdb_init,
-#endif
+ CONFIG_IS_ENABLED(CMD_KGDB, (kgdb_init,))
interrupt_init,
#if defined(CONFIG_MICROBLAZE) || defined(CONFIG_M68K)
timer_init, /* initialize timer */
@@ -737,22 +686,11 @@ static init_fnc_t init_sequence_r[] = {
initr_status_led,
initr_boot_led_blink,
/* PPC has a udelay(20) here dating from 2002. Why? */
-#ifdef CONFIG_BOARD_LATE_INIT
- board_late_init,
-#endif
-#ifdef CONFIG_BITBANGMII
- bb_miiphy_init,
-#endif
-#ifdef CONFIG_PCI_ENDPOINT
- pci_ep_init,
-#endif
-#if defined(CONFIG_CMD_NET)
- INIT_FUNC_WATCHDOG_RESET
- initr_net,
-#endif
-#ifdef CONFIG_POST
- initr_post,
-#endif
+ CONFIG_IS_ENABLED(BOARD_LATE_INIT, (board_late_init,))
+ CONFIG_IS_ENABLED(BITBANGMII, (bb_miiphy_init,))
+ CONFIG_IS_ENABLED(PCI_ENDPOINT, (pci_ep_init,))
+ CONFIG_IS_ENABLED(CMD_NET, (INIT_FUNC_WATCHDOG_RESET initr_net,))
+ CONFIG_IS_ENABLED(POST, (initr_post,))
INIT_FUNC_WATCHDOG_RESET
INITCALL_EVENT(EVT_LAST_STAGE_INIT),
#if defined(CFG_PRAM)
--
2.43.0
More information about the U-Boot
mailing list