diff options
| author | Tom Rini <trini@konsulko.com> | 2023-02-10 09:17:25 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-02-10 09:17:25 -0500 |
| commit | 8b301102e246350a0ccedc370f7c9923b02f86f2 (patch) | |
| tree | 15ddc9d376d630efb4c614c4bda559d3c0c99d64 /common/board_r.c | |
| parent | 81e8a51cee2b265e26272f0c67518c4844baa36c (diff) | |
| parent | 42a13b21dcb6663847ae71c0a42dcf2f4149b69a (diff) | |
Merge branch '2023-02-08-Kconfig-cleanup-CONFIG_IS_ENABLED-to-IS_ENABLED'
- This series brings in a large number of patches in the form of changing
CONFIG_IS_ENABLED(FOO) to IS_ENABLED(CONFIG_FOO) when there it is the
case that CONFIG_xPL_FOO is never a valid symbol. The majority of
the times where we do this, it is unintentional and does not make the
code more useful, or rarely, introduces bugs.
Diffstat (limited to 'common/board_r.c')
| -rw-r--r-- | common/board_r.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/board_r.c b/common/board_r.c index 3618acad437..c6c0c1ab1d9 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -155,7 +155,7 @@ static int initr_reloc_global_data(void) * The fdt_blob needs to be moved to new relocation address * incase of FDT blob is embedded with in image */ - if (CONFIG_IS_ENABLED(OF_EMBED) && CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC)) + if (IS_ENABLED(CONFIG_OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) gd->fdt_blob += gd->reloc_off; #ifdef CONFIG_EFI_LOADER @@ -452,8 +452,8 @@ static int initr_env(void) env_set_hex("fdtcontroladdr", (unsigned long)map_to_sysmem(gd->fdt_blob)); - #if (CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR) || \ - CONFIG_IS_ENABLED(SAVE_PREV_BL_FDT_ADDR)) + #if (IS_ENABLED(CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR) || \ + IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR)) save_prev_bl_data(); #endif @@ -609,7 +609,7 @@ static init_fnc_t init_sequence_r[] = { */ #endif initr_reloc_global_data, -#if CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC) && CONFIG_IS_ENABLED(EVENT) +#if IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) && CONFIG_IS_ENABLED(EVENT) event_manual_reloc, #endif #if defined(CONFIG_SYS_INIT_RAM_LOCK) && defined(CONFIG_E500) |