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 | |
| parent | 81e8a51cee2b265e26272f0c67518c4844baa36c (diff) | |
| parent | 42a13b21dcb6663847ae71c0a42dcf2f4149b69a (diff) | |
| download | u-boot-8b301102e246350a0ccedc370f7c9923b02f86f2.zip u-boot-8b301102e246350a0ccedc370f7c9923b02f86f2.tar.gz u-boot-8b301102e246350a0ccedc370f7c9923b02f86f2.tar.bz2 | |
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.
139 files changed, 230 insertions, 229 deletions
diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c index 07b2c15..2dd0034 100644 --- a/arch/arc/lib/bootm.c +++ b/arch/arc/lib/bootm.c @@ -29,7 +29,7 @@ static int boot_prep_linux(struct bootm_headers *images) { int ret; - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) return ret; diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index b0e8678..12d3118 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -760,7 +760,7 @@ enum boot_src __get_boot_src(u32 porsr1) } #endif - if (CONFIG_IS_ENABLED(SYS_FSL_ERRATUM_A010539) && !rcw_src) + if (IS_ENABLED(CONFIG_SYS_FSL_ERRATUM_A010539) && !rcw_src) src = BOOT_SOURCE_QSPI_NOR; debug("%s: src 0x%x\n", __func__, src); diff --git a/arch/arm/include/asm/mach-imx/module_fuse.h b/arch/arm/include/asm/mach-imx/module_fuse.h index a46fc3f..6c92cb4 100644 --- a/arch/arm/include/asm/mach-imx/module_fuse.h +++ b/arch/arm/include/asm/mach-imx/module_fuse.h @@ -74,7 +74,7 @@ struct fuse_entry_desc { u32 status; }; -#if !CONFIG_IS_ENABLED(IMX_MODULE_FUSE) +#if !IS_ENABLED(CONFIG_IMX_MODULE_FUSE) static inline u32 check_module_fused(enum fuse_module_type module) { return 0; diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index e414ef8..c562857 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -199,7 +199,7 @@ static void boot_prep_linux(struct bootm_headers *images) { char *commandline = env_get("bootargs"); - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { panic("FDT creation failed!"); diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c index f4ee86a..f7b23fa 100644 --- a/arch/arm/lib/save_prev_bl_data.c +++ b/arch/arm/lib/save_prev_bl_data.c @@ -60,9 +60,9 @@ int save_prev_bl_data(void) return -ENODATA; } - if (CONFIG_IS_ENABLED(SAVE_PREV_BL_FDT_ADDR)) + if (IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR)) env_set_addr("prevbl_fdt_addr", (void *)reg0); - if (!CONFIG_IS_ENABLED(SAVE_PREV_BL_INITRAMFS_START_ADDR)) + if (!IS_ENABLED(CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR)) return 0; node = fdt_path_offset(fdt_blob, "/chosen"); diff --git a/arch/arm/mach-exynos/mmu-arm64.c b/arch/arm/mach-exynos/mmu-arm64.c index d2c550b..8d8c64e 100644 --- a/arch/arm/mach-exynos/mmu-arm64.c +++ b/arch/arm/mach-exynos/mmu-arm64.c @@ -7,7 +7,7 @@ #include <common.h> #include <asm/armv8/mmu.h> -#if CONFIG_IS_ENABLED(EXYNOS7420) +#if IS_ENABLED(CONFIG_EXYNOS7420) static struct mm_region exynos7420_mem_map[] = { { diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index 2c94f89..d3a9573 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -49,11 +49,11 @@ const struct mbus_dram_target_info *mvebu_mbus_dram_info(void) __weak int dram_init_banksize(void) { - if (CONFIG_IS_ENABLED(ARMADA_8K)) + if (IS_ENABLED(CONFIG_ARMADA_8K)) return a8k_dram_init_banksize(); - else if (CONFIG_IS_ENABLED(ARMADA_3700)) + else if (IS_ENABLED(CONFIG_ARMADA_3700)) return a3700_dram_init_banksize(); - else if (CONFIG_IS_ENABLED(ALLEYCAT_5)) + else if (IS_ENABLED(CONFIG_ALLEYCAT_5)) return alleycat5_dram_init_banksize(); else return fdtdec_setup_memory_banksize(); @@ -61,16 +61,16 @@ __weak int dram_init_banksize(void) __weak int dram_init(void) { - if (CONFIG_IS_ENABLED(ARMADA_8K)) { + if (IS_ENABLED(CONFIG_ARMADA_8K)) { gd->ram_size = a8k_dram_scan_ap_sz(); if (gd->ram_size != 0) return 0; } - if (CONFIG_IS_ENABLED(ARMADA_3700)) + if (IS_ENABLED(CONFIG_ARMADA_3700)) return a3700_dram_init(); - if (CONFIG_IS_ENABLED(ALLEYCAT_5)) + if (IS_ENABLED(CONFIG_ALLEYCAT_5)) return alleycat5_dram_init(); if (fdtdec_setup_mem_size_base() != 0) diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c index 6e05a8f..ebffb6c 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -306,7 +306,7 @@ int board_usb_init(int index, enum usb_init_type init) #endif /* CONFIG_USB_GADGET */ -#if CONFIG_IS_ENABLED(FASTBOOT) +#if IS_ENABLED(CONFIG_FASTBOOT) int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) { if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER) diff --git a/arch/arm/mach-rockchip/cpu-info.c b/arch/arm/mach-rockchip/cpu-info.c index d0f0301..dac2491 100644 --- a/arch/arm/mach-rockchip/cpu-info.c +++ b/arch/arm/mach-rockchip/cpu-info.c @@ -44,7 +44,7 @@ char *get_reset_cause(void) return cause; } -#if CONFIG_IS_ENABLED(DISPLAY_CPUINFO) +#if IS_ENABLED(CONFIG_DISPLAY_CPUINFO) int print_cpuinfo(void) { char *cause = get_reset_cause(); diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index 87eebd9..b350f18 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -23,7 +23,7 @@ int rockchip_setup_macaddr(void) { -#if CONFIG_IS_ENABLED(CMD_NET) +#if IS_ENABLED(CONFIG_CMD_NET) int ret; const char *cpuid = env_get("cpuid#"); u8 hash[SHA256_SUM_LEN]; @@ -60,15 +60,15 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset, const u32 cpuid_length, u8 *cpuid) { -#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE) || CONFIG_IS_ENABLED(ROCKCHIP_OTP) +#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) || IS_ENABLED(CONFIG_ROCKCHIP_OTP) struct udevice *dev; int ret; /* retrieve the device */ -#if CONFIG_IS_ENABLED(ROCKCHIP_EFUSE) +#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(rockchip_efuse), &dev); -#elif CONFIG_IS_ENABLED(ROCKCHIP_OTP) +#elif IS_ENABLED(CONFIG_ROCKCHIP_OTP) ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(rockchip_otp), &dev); #endif diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c index a837235..cfafa53 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/cmd_stm32prog.c @@ -150,7 +150,7 @@ static int do_stm32prog(struct cmd_tbl *cmdtp, int flag, int argc, /* Try bootm for legacy and FIT format image */ if (genimg_get_format(uimage) != IMAGE_FORMAT_INVALID) do_bootm(cmdtp, 0, 4, bootm_argv); - else if (CONFIG_IS_ENABLED(CMD_BOOTZ)) + else if (IS_ENABLED(CONFIG_CMD_BOOTZ)) do_bootz(cmdtp, 0, 4, bootm_argv); } if (data->script) diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c index 89552d2..6f3641c 100644 --- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c +++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c @@ -1583,7 +1583,7 @@ int stm32prog_pmic_read(struct stm32prog_data *data, u32 offset, u8 *buffer, int result = 0, ret; struct udevice *dev; - if (!CONFIG_IS_ENABLED(PMIC_STPMIC1)) { + if (!IS_ENABLED(CONFIG_PMIC_STPMIC1)) { stm32prog_err("PMIC update not supported"); return -EOPNOTSUPP; @@ -1633,7 +1633,7 @@ int stm32prog_pmic_start(struct stm32prog_data *data) int ret; struct udevice *dev; - if (!CONFIG_IS_ENABLED(PMIC_STPMIC1)) { + if (!IS_ENABLED(CONFIG_PMIC_STPMIC1)) { stm32prog_err("PMIC update not supported"); return -EOPNOTSUPP; @@ -1748,7 +1748,7 @@ static void stm32prog_end_phase(struct stm32prog_data *data, u64 offset) } } - if (CONFIG_IS_ENABLED(MTD) && + if (IS_ENABLED(CONFIG_MTD) && data->cur_part->bin_nb > 1) { if (stm32prog_copy_fsbl(data->cur_part)) { stm32prog_err("%s (0x%x): copy of fsbl failed", diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c index 3b4c05d..de5c5a5 100644 --- a/arch/arm/mach-stm32mp/fdt.c +++ b/arch/arm/mach-stm32mp/fdt.c @@ -505,7 +505,7 @@ int ft_system_setup(void *blob, struct bd_info *bd) * under CONFIG_STM32MP15x_STM32IMAGE only for compatibility * when FIP is not used by TF-A */ - if (CONFIG_IS_ENABLED(STM32MP15x_STM32IMAGE) && + if (IS_ENABLED(CONFIG_STM32MP15x_STM32IMAGE) && !tee_find_device(NULL, NULL, NULL, NULL)) stm32_fdt_disable_optee(blob); } diff --git a/arch/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c index c1c9bdc..f18bed2 100644 --- a/arch/m68k/lib/bootm.c +++ b/arch/m68k/lib/bootm.c @@ -60,7 +60,7 @@ int do_bootm_linux(int flag, int argc, char *const argv[], } set_clocks_in_mhz(kbd); - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) goto error; diff --git a/arch/microblaze/cpu/cpuinfo.c b/arch/microblaze/cpu/cpuinfo.c index f021f4e..6b15d6c 100644 --- a/arch/microblaze/cpu/cpuinfo.c +++ b/arch/microblaze/cpu/cpuinfo.c @@ -8,7 +8,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if CONFIG_IS_ENABLED(CPU_MICROBLAZE) +#if IS_ENABLED(CONFIG_CPU_MICROBLAZE) /* These key value are as per MBV field in PVR0 */ static const struct microblaze_version_map cpu_ver_lookup[] = { {"5.00.a", 0x01}, diff --git a/arch/microblaze/include/asm/cpuinfo.h b/arch/microblaze/include/asm/cpuinfo.h index 86d2c8a..3c58e52 100644 --- a/arch/microblaze/include/asm/cpuinfo.h +++ b/arch/microblaze/include/asm/cpuinfo.h @@ -26,7 +26,7 @@ struct microblaze_cpuinfo { u32 dcache_size; u32 dcache_line_length; -#if CONFIG_IS_ENABLED(CPU_MICROBLAZE) +#if IS_ENABLED(CONFIG_CPU_MICROBLAZE) u32 use_mmu; u32 cpu_freq; u32 addr_size; diff --git a/arch/microblaze/lib/bootm.c b/arch/microblaze/lib/bootm.c index 4a54214..930384f 100644 --- a/arch/microblaze/lib/bootm.c +++ b/arch/microblaze/lib/bootm.c @@ -73,7 +73,7 @@ static void boot_jump_linux(struct bootm_headers *images, int flag) static void boot_prep_linux(struct bootm_headers *images) { - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { printf("FDT creation failed! hanging..."); diff --git a/arch/mips/include/asm/cm.h b/arch/mips/include/asm/cm.h index 5cc8c09..c695ffc 100644 --- a/arch/mips/include/asm/cm.h +++ b/arch/mips/include/asm/cm.h @@ -108,7 +108,7 @@ #include <asm/io.h> #include <linux/bitops.h> -#if CONFIG_IS_ENABLED(MIPS_CM) +#if IS_ENABLED(CONFIG_MIPS_CM) static inline void *mips_cm_base(void) { return (void *)CKSEG1ADDR(CONFIG_MIPS_CM_BASE); diff --git a/arch/mips/lib/bootm.c b/arch/mips/lib/bootm.c index 5fda914..ab92bd0 100644 --- a/arch/mips/lib/bootm.c +++ b/arch/mips/lib/bootm.c @@ -284,10 +284,10 @@ static void boot_jump_linux(struct bootm_headers *images) if (CONFIG_IS_ENABLED(MALTA)) linux_extra = gd->ram_size; -#if CONFIG_IS_ENABLED(BOOTSTAGE_FDT) +#if IS_ENABLED(CONFIG_BOOTSTAGE_FDT) bootstage_fdt_add_report(); #endif -#if CONFIG_IS_ENABLED(BOOTSTAGE_REPORT) +#if IS_ENABLED(CONFIG_BOOTSTAGE_REPORT) bootstage_report(); #endif diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c index 1bdc6cd..c7744e8 100644 --- a/arch/mips/mach-octeon/cpu.c +++ b/arch/mips/mach-octeon/cpu.c @@ -448,10 +448,10 @@ int arch_misc_init(void) if (ret) return ret; - if (CONFIG_IS_ENABLED(OCTEON_SERIAL_PCIE_CONSOLE)) + if (IS_ENABLED(CONFIG_OCTEON_SERIAL_PCIE_CONSOLE)) init_pcie_console(); - if (CONFIG_IS_ENABLED(OCTEON_SERIAL_BOOTCMD)) + if (IS_ENABLED(CONFIG_OCTEON_SERIAL_BOOTCMD)) init_bootcmd_console(); return 0; diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c index 7b392b0..910121e 100644 --- a/arch/powerpc/lib/bootm.c +++ b/arch/powerpc/lib/bootm.c @@ -214,7 +214,7 @@ static int boot_body_linux(struct bootm_headers *images) if (ret) return ret; - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) return ret; diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c index f5f8b4c..276677a 100644 --- a/arch/riscv/lib/bootm.c +++ b/arch/riscv/lib/bootm.c @@ -64,7 +64,7 @@ static void announce_and_cleanup(int fake) static void boot_prep_linux(struct bootm_headers *images) { - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { printf("FDT creation failed! hanging..."); diff --git a/arch/sandbox/lib/bootm.c b/arch/sandbox/lib/bootm.c index 28f4a74..dc8b8e4 100644 --- a/arch/sandbox/lib/bootm.c +++ b/arch/sandbox/lib/bootm.c @@ -55,7 +55,7 @@ static int boot_prep_linux(struct bootm_headers *images) { int ret; - if (CONFIG_IS_ENABLED(LMB)) { + if (IS_ENABLED(CONFIG_LMB)) { ret = image_setup_linux(images); if (ret) return ret; diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index aaa5ae1..d7eedbd 100644 --- a/arch/x86/cpu/coreboot/coreboot.c +++ b/arch/x86/cpu/coreboot/coreboot.c @@ -77,7 +77,7 @@ static void board_final_init(void) int last_stage_init(void) { /* start usb so that usb keyboard can be used as input device */ - if (CONFIG_IS_ENABLED(USB_KEYBOARD)) + if (IS_ENABLED(CONFIG_USB_KEYBOARD)) usb_init(); board_final_init(); diff --git a/arch/x86/cpu/efi/payload.c b/arch/x86/cpu/efi/payload.c index 1c28a43..19a25dd 100644 --- a/arch/x86/cpu/efi/payload.c +++ b/arch/x86/cpu/efi/payload.c @@ -171,7 +171,7 @@ int reserve_arch(void) int last_stage_init(void) { /* start usb so that usb keyboard can be used as input device */ - if (CONFIG_IS_ENABLED(USB_KEYBOARD)) + if (IS_ENABLED(CONFIG_USB_KEYBOARD)) usb_init(); return 0; diff --git a/arch/x86/lib/bootm.c b/arch/x86/lib/bootm.c index eafcddf..873e2bc 100644 --- a/arch/x86/lib/bootm.c +++ b/arch/x86/lib/bootm.c @@ -39,7 +39,7 @@ void bootm_announce_and_cleanup(void) timestamp_add_now(TS_START_KERNEL); #endif bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel"); -#if CONFIG_IS_ENABLED(BOOTSTAGE_REPORT) +#if IS_ENABLED(CONFIG_BOOTSTAGE_REPORT) bootstage_report(); #endif @@ -78,7 +78,7 @@ static int boot_prep_linux(struct bootm_headers *images) size_t len; int ret; - if (CONFIG_IS_ENABLED(OF_LIBFDT) && CONFIG_IS_ENABLED(LMB) && images->ft_len) { + if (CONFIG_IS_ENABLED(OF_LIBFDT) && IS_ENABLED(CONFIG_LMB) && images->ft_len) { debug("using: FDT\n"); if (image_setup_linux(images)) { puts("FDT creation failed! hanging..."); diff --git a/arch/x86/lib/fsp/fsp_dram.c b/arch/x86/lib/fsp/fsp_dram.c index 2bd408d..cc889a6 100644 --- a/arch/x86/lib/fsp/fsp_dram.c +++ b/arch/x86/lib/fsp/fsp_dram.c @@ -60,7 +60,7 @@ int dram_init_banksize(void) * * However it seems FSP2's behavior is different. We need to add the * DRAM range in MTRR otherwise the boot process goes very slowly, - * which was observed on Chrromebook Coral with FSP2. + * which was observed on Chromebook Coral with FSP2. */ update_mtrr = CONFIG_IS_ENABLED(FSP_VERSION2); diff --git a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c index aa9687f..34109c6 100644 --- a/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c +++ b/board/advantech/imx8mp_rsb3720a1/imx8mp_rsb3720a1.c @@ -35,7 +35,7 @@ static void setup_gpmi_nand(void) } #endif -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { #if defined(CONFIG_TARGET_IMX8MP_RSB3720A1_4G) { diff --git a/board/broadcom/bcmns3/ns3.c b/board/broadcom/bcmns3/ns3.c index 26652e8..2a78df6 100644 --- a/board/broadcom/bcmns3/ns3.c +++ b/board/broadcom/bcmns3/ns3.c @@ -150,7 +150,7 @@ int board_init(void) if (bl33_info->version != BL33_INFO_VERSION) printf("*** warning: ATF BL31 and U-Boot not in sync! ***\n"); -#if CONFIG_IS_ENABLED(BNXT_ETH) +#if IS_ENABLED(CONFIG_BNXT_ETH) if (chimp_fastboot_optee() != 0) printf("*** warning: secure chimp fastboot failed! ***\n"); #endif diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 847ac33..7bce09e 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -736,7 +736,7 @@ U_BOOT_DRVINFO(cm_fx6_serial) = { .plat = &cm_fx6_mxc_serial_plat, }; -#if CONFIG_IS_ENABLED(AHCI) +#if IS_ENABLED(CONFIG_AHCI) static int sata_imx_probe(struct udevice *dev) { int i, err; diff --git a/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c b/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c index 3d7fff3..b373e45 100644 --- a/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c +++ b/board/compulab/imx8mm-cl-iot-gate/imx8mm-cl-iot-gate.c @@ -31,7 +31,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { #if defined(CONFIG_TARGET_IMX8MM_CL_IOT_GATE) { diff --git a/board/emulation/common/qemu_dfu.c b/board/emulation/common/qemu_dfu.c index c1aeaf1..332d659 100644 --- a/board/emulation/common/qemu_dfu.c +++ b/board/emulation/common/qemu_dfu.c @@ -44,7 +44,7 @@ void set_dfu_alt_info(char *interface, char *devstr) ALLOC_CACHE_ALIGN_BUFFER(char, buf, DFU_ALT_BUF_LEN); - if (!CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) && + if (!IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) && env_get("dfu_alt_info")) return; diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c index dae3764..34ed3e8 100644 --- a/board/emulation/qemu-arm/qemu-arm.c +++ b/board/emulation/qemu-arm/qemu-arm.c @@ -29,7 +29,7 @@ #ifdef CONFIG_ARM64 #include <asm/armv8/mmu.h> -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { #if defined(CONFIG_TARGET_QEMU_ARM_32BIT) { diff --git a/board/engicam/imx8mp/icore_mx8mp.c b/board/engicam/imx8mp/icore_mx8mp.c index b309a12..500080c 100644 --- a/board/engicam/imx8mp/icore_mx8mp.c +++ b/board/engicam/imx8mp/icore_mx8mp.c @@ -58,10 +58,10 @@ int board_phy_config(struct phy_device *phydev) int board_init(void) { - if (CONFIG_IS_ENABLED(FEC_MXC)) + if (IS_ENABLED(CONFIG_FEC_MXC)) setup_fec(); - if (CONFIG_IS_ENABLED(DWC_ETH_QOS)) + if (IS_ENABLED(CONFIG_DWC_ETH_QOS)) setup_eqos(); return 0; diff --git a/board/engicam/stm32mp1/stm32mp1.c b/board/engicam/stm32mp1/stm32mp1.c index 0a3e580..5223e9b 100644 --- a/board/engicam/stm32mp1/stm32mp1.c +++ b/board/engicam/stm32mp1/stm32mp1.c @@ -68,7 +68,7 @@ enum env_location env_get_location(enum env_operation op, int prio) case BOOT_FLASH_NAND: case BOOT_FLASH_SPINAND: - if (CONFIG_IS_ENABLED(ENV_IS_IN_UBI)) + if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI)) return ENVL_UBI; else return ENVL_NOWHERE; diff --git a/board/freescale/imx8mp_evk/imx8mp_evk.c b/board/freescale/imx8mp_evk/imx8mp_evk.c index 8971a82..ce211d4 100644 --- a/board/freescale/imx8mp_evk/imx8mp_evk.c +++ b/board/freescale/imx8mp_evk/imx8mp_evk.c @@ -55,11 +55,11 @@ int board_init(void) { int ret = 0; - if (CONFIG_IS_ENABLED(FEC_MXC)) { + if (IS_ENABLED(CONFIG_FEC_MXC)) { setup_fec(); } - if (CONFIG_IS_ENABLED(DWC_ETH_QOS)) { + if (IS_ENABLED(CONFIG_DWC_ETH_QOS)) { ret = setup_eqos(); } diff --git a/board/freescale/imx93_evk/imx93_evk.c b/board/freescale/imx93_evk/imx93_evk.c index 182ae5f..e73a4987 100644 --- a/board/freescale/imx93_evk/imx93_evk.c +++ b/board/freescale/imx93_evk/imx93_evk.c @@ -66,10 +66,10 @@ static int setup_eqos(void) int board_init(void) { - if (CONFIG_IS_ENABLED(FEC_MXC)) + if (IS_ENABLED(CONFIG_FEC_MXC)) setup_fec(); - if (CONFIG_IS_ENABLED(DWC_ETH_QOS)) + if (IS_ENABLED(CONFIG_DWC_ETH_QOS)) setup_eqos(); return 0; diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index cf5b1ee..d8a86cd 100644 --- a/board/freescale/lx2160a/lx2160a.c +++ b/board/freescale/lx2160a/lx2160a.c @@ -676,7 +676,7 @@ void board_quiesce_devices(void) } #endif -#if CONFIG_IS_ENABLED(TARGET_LX2160ARDB) +#if IS_ENABLED(CONFIG_TARGET_LX2160ARDB) int fdt_fixup_add_thermal(void *blob, int mux_node, int channel, int reg) { int err; @@ -798,7 +798,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) u64 mc_memory_size = 0; u16 total_memory_banks; int err; -#if CONFIG_IS_ENABLED(TARGET_LX2160ARDB) +#if IS_ENABLED(CONFIG_TARGET_LX2160ARDB) u8 board_rev; #endif @@ -862,7 +862,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) #endif fdt_fixup_icid(blob); -#if CONFIG_IS_ENABLED(TARGET_LX2160ARDB) +#if IS_ENABLED(CONFIG_TARGET_LX2160ARDB) board_rev = (QIXIS_READ(arch) & 0xf) - 1 + 'A'; if (board_rev == 'C') fdt_fixup_i2c_thermal_node(blob); diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 0252ada..8c282f9 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -79,10 +79,10 @@ int set_km_env(void) } #if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED) -#if ((!CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ - !CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE)) || \ - (CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ - CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE))) +#if ((!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ + !IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE)) || \ + (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ + IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE))) #error "It has to be either bootpackage or update u-boot image!" #endif void check_for_uboot_update(void) diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c index e005ece..2f1731e 100644 --- a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c +++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c @@ -71,7 +71,7 @@ int board_early_init_f(void) /* QRIO Configuration */ qrio_uprstreq(UPREQ_CORE_RST); -#if CONFIG_IS_ENABLED(TARGET_PG_WCOM_SELI8) +#if IS_ENABLED(CONFIG_TARGET_PG_WCOM_SELI8) qrio_prstcfg(KM_LIU_RST, PRSTCFG_POWUP_UNIT_RST); qrio_wdmask(KM_LIU_RST, true); @@ -79,7 +79,7 @@ int board_early_init_f(void) qrio_wdmask(KM_PAXK_RST, true); #endif -#if CONFIG_IS_ENABLED(TARGET_PG_WCOM_EXPU1) +#if IS_ENABLED(CONFIG_TARGET_PG_WCOM_EXPU1) qrio_prstcfg(WCOM_TMG_RST, PRSTCFG_POWUP_UNIT_RST); qrio_wdmask(WCOM_TMG_RST, true); diff --git a/board/kontron/pitx_imx8m/pitx_imx8m.c b/board/kontron/pitx_imx8m/pitx_imx8m.c index d974af8..af1832c 100644 --- a/board/kontron/pitx_imx8m/pitx_imx8m.c +++ b/board/kontron/pitx_imx8m/pitx_imx8m.c @@ -32,7 +32,7 @@ static iomux_v3_cfg_t const uart_pads[] = { IMX8MQ_PAD_ECSPI1_MISO__UART3_CTS_B | MUX_PAD_CTRL(UART_PAD_CTRL), }; -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { { .image_type_id = KONTRON_PITX_IMX8M_FIT_IMAGE_GUID, diff --git a/board/kontron/sl-mx8mm/sl-mx8mm.c b/board/kontron/sl-mx8mm/sl-mx8mm.c index 4ac430b..2501956 100644 --- a/board/kontron/sl-mx8mm/sl-mx8mm.c +++ b/board/kontron/sl-mx8mm/sl-mx8mm.c @@ -18,7 +18,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { { .image_type_id = KONTRON_SL_MX8MM_FIT_IMAGE_GUID, diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index 0576b3e..89948e0 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -28,7 +28,7 @@ DECLARE_GLOBAL_DATA_PTR; -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { { .image_type_id = KONTRON_SL28_FIT_IMAGE_GUID, @@ -109,7 +109,7 @@ static void print_cpld_version(void) int checkboard(void) { printf("EL: %d\n", current_el()); - if (CONFIG_IS_ENABLED(SL28CPLD)) + if (IS_ENABLED(CONFIG_SL28CPLD)) print_cpld_version(); return 0; @@ -157,7 +157,7 @@ int fsl_board_late_init(void) * If the watchdog isn't enabled at reset (which is a configuration * option) disabling it doesn't hurt either. */ - if (!CONFIG_IS_ENABLED(WATCHDOG_AUTOSTART)) + if (!IS_ENABLED(CONFIG_WATCHDOG_AUTOSTART)) stop_recovery_watchdog(); return 0; @@ -188,7 +188,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) fdt_fixup_icid(blob); - if (CONFIG_IS_ENABLED(SL28_SPL_LOADS_OPTEE_BL32)) { + if (IS_ENABLED(CONFIG_SL28_SPL_LOADS_OPTEE_BL32)) { node = fdt_node_offset_by_compatible(blob, -1, "linaro,optee-tz"); if (node) fdt_set_node_status(blob, node, FDT_STATUS_OKAY); diff --git a/board/rockchip/evb_rk3399/evb-rk3399.c b/board/rockchip/evb_rk3399/evb-rk3399.c index f56b379..c99ffdd 100644 --- a/board/rockchip/evb_rk3399/evb-rk3399.c +++ b/board/rockchip/evb_rk3399/evb-rk3399.c @@ -14,7 +14,7 @@ #define ROCKPI4_UPDATABLE_IMAGES 2 -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) static struct efi_fw_image fw_images[ROCKPI4_UPDATABLE_IMAGES] = {0}; struct efi_capsule_update_info update_info = { diff --git a/board/sandbox/sandbox.c b/board/sandbox/sandbox.c index 8b953f9..2e44bdf 100644 --- a/board/sandbox/sandbox.c +++ b/board/sandbox/sandbox.c @@ -29,7 +29,7 @@ */ gd_t *gd; -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) /* GUIDs for capsule updatable firmware images */ #define SANDBOX_UBOOT_IMAGE_GUID \ EFI_GUID(0x09d7cf52, 0x0720, 0x4710, 0x91, 0xd1, \ diff --git a/board/sifive/unleashed/unleashed.c b/board/sifive/unleashed/unleashed.c index f8aad86..b6ab06a 100644 --- a/board/sifive/unleashed/unleashed.c +++ b/board/sifive/unleashed/unleashed.c @@ -27,7 +27,7 @@ #ifdef CONFIG_MISC_INIT_R -#if CONFIG_IS_ENABLED(SIFIVE_OTP) +#if IS_ENABLED(CONFIG_SIFIVE_OTP) static u32 otp_read_serialnum(struct udevice *dev) { int ret; @@ -53,7 +53,7 @@ static u32 fu540_read_serialnum(void) { u32 serial = ERROR_READING_SERIAL_NUMBER; -#if CONFIG_IS_ENABLED(SIFIVE_OTP) +#if IS_ENABLED(CONFIG_SIFIVE_OTP) struct udevice *dev; int ret; diff --git a/board/socionext/developerbox/developerbox.c b/board/socionext/developerbox/developerbox.c index 6415c90..16e14d4 100644 --- a/board/socionext/developerbox/developerbox.c +++ b/board/socionext/developerbox/developerbox.c @@ -18,7 +18,7 @@ #include <linux/kernel.h> -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { { .image_type_id = DEVELOPERBOX_UBOOT_IMAGE_GUID, diff --git a/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c index 0096f71..1cf4a3d 100644 --- a/board/st/common/stm32mp_dfu.c +++ b/board/st/common/stm32mp_dfu.c @@ -123,7 +123,7 @@ void set_dfu_alt_info(char *interface, char *devstr) board_get_alt_info_mmc(dev, buf); } - if (CONFIG_IS_ENABLED(MTD)) { + if (IS_ENABLED(CONFIG_MTD)) { /* probe all MTD devices */ mtd_probe_devices(); diff --git a/board/st/common/stm32mp_mtdparts.c b/board/st/common/stm32mp_mtdparts.c index 1887842..67a56a2 100644 --- a/board/st/common/stm32mp_mtdparts.c +++ b/board/st/common/stm32mp_mtdparts.c @@ -96,7 +96,7 @@ void board_mtdparts_default(const char **mtdids, const char **mtdparts) case BOOT_SERIAL_UART: case BOOT_SERIAL_USB: serial = true; - if (CONFIG_IS_ENABLED(CMD_STM32PROG)) { + if (IS_ENABLED(CONFIG_CMD_STM32PROG)) { #ifdef CONFIG_STM32MP15x_STM32IMAGE tee = stm32prog_get_tee_partitions(); #endif diff --git a/board/st/stm32mp1/stm32mp1.c b/board/st/stm32mp1/stm32mp1.c index 47b3d1b..ca8f025 100644 --- a/board/st/stm32mp1/stm32mp1.c +++ b/board/st/stm32mp1/stm32mp1.c @@ -88,7 +88,7 @@ #define USB_START_LOW_THRESHOLD_UV 1230000 #define USB_START_HIGH_THRESHOLD_UV 2150000 -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[1]; struct efi_capsule_update_info update_info = { @@ -129,7 +129,7 @@ int checkboard(void) fdt_compat && fdt_compat_len ? fdt_compat : ""); /* display the STMicroelectronics board identification */ - if (CONFIG_IS_ENABLED(CMD_STBOARD)) { + if (IS_ENABLED(CONFIG_CMD_STBOARD)) { ret = uclass_get_device_by_driver(UCLASS_MISC, DM_DRIVER_GET(stm32mp_bsec), &dev); @@ -677,7 +677,7 @@ int board_init(void) setup_led(LEDST_ON); -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) efi_guid_t image_type_guid = STM32MP_FIP_IMAGE_GUID; guidcpy(&fw_images[0].image_type_id, &image_type_guid); @@ -831,7 +831,7 @@ enum env_location env_get_location(enum env_operation op, int prio) case BOOT_FLASH_NAND: case BOOT_FLASH_SPINAND: - if (CONFIG_IS_ENABLED(ENV_IS_IN_UBI)) + if (IS_ENABLED(CONFIG_ENV_IS_IN_UBI)) return ENVL_UBI; else return ENVL_NOWHERE; @@ -930,7 +930,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) if (IS_ENABLED(CONFIG_FDT_FIXUP_PARTITIONS)) fdt_fixup_mtdparts(blob, nodes, ARRAY_SIZE(nodes)); - if (CONFIG_IS_ENABLED(FDT_SIMPLEFB)) + if (IS_ENABLED(CONFIG_FDT_SIMPLEFB)) fdt_simplefb_enable_and_mem_rsv(blob); return 0; diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index 0e57ee5..9ea507a 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -1172,7 +1172,7 @@ int board_fit_config_name_match(const char *name) } #endif -#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) +#if IS_ENABLED(CONFIG_FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) { if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER) diff --git a/board/ti/dra7xx/evm.c b/board/ti/dra7xx/evm.c index 568c8fb..a8a216d 100644 --- a/board/ti/dra7xx/evm.c +++ b/board/ti/dra7xx/evm.c @@ -1049,7 +1049,7 @@ int board_fit_config_name_match(const char *name) } #endif -#if CONFIG_IS_ENABLED(FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) +#if IS_ENABLED(CONFIG_FASTBOOT) && !CONFIG_IS_ENABLED(ENV_IS_NOWHERE) int fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) { if (reason != FASTBOOT_REBOOT_REASON_BOOTLOADER) diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c index e6403ca..5dfb716 100644 --- a/board/traverse/ten64/ten64.c +++ b/board/traverse/ten64/ten64.c @@ -97,7 +97,7 @@ int checkboard(void) printf("Unknown boot source %d\n", src); puts("Controller: "); - if (CONFIG_IS_ENABLED(TEN64_CONTROLLER)) { + if (IS_ENABLED(CONFIG_TEN64_CONTROLLER)) { /* Driver not compatible with alpha/beta board MCU firmware */ if (board_rev <= TEN64_BOARD_REV_C) { if (ten64_read_board_info(&boardinfo)) { @@ -123,7 +123,7 @@ int board_init(void) { init_final_memctl_regs(); - if (CONFIG_IS_ENABLED(FSL_CAAM)) + if (IS_ENABLED(CONFIG_FSL_CAAM)) sec_init(); return 0; @@ -211,7 +211,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) base[i] = gd->bd->bi_dram[i].start; size[i] = gd->bd->bi_dram[i].size; /* reduce size if reserved memory is within this bank */ - if (CONFIG_IS_ENABLED(RESV_RAM) && RESV_MEM_IN_BANK(i)) + if (IS_ENABLED(CONFIG_RESV_RAM) && RESV_MEM_IN_BANK(i)) size[i] = gd->arch.resv_ram - base[i]; } @@ -229,7 +229,7 @@ int ft_board_setup(void *blob, struct bd_info *bd) fdt_fsl_mc_fixup_iommu_map_entry(blob); - if (CONFIG_IS_ENABLED(FSL_MC_ENET)) + if (IS_ENABLED(CONFIG_FSL_MC_ENET)) fdt_fixup_board_enet(blob); fdt_fixup_icid(blob); @@ -375,7 +375,7 @@ static void ten64_board_retimer_ds110df410_init(void) /* Retimer power cycle not implemented on early board * revisions/controller firmwares */ - if (CONFIG_IS_ENABLED(TEN64_CONTROLLER) && + if (IS_ENABLED(CONFIG_TEN64_CONTROLLER) && board_rev >= TEN64_BOARD_REV_C) { ret = board_cycle_retimer(&retim_dev); if (ret) { diff --git a/board/variscite/imx8mn_var_som/imx8mn_var_som.c b/board/variscite/imx8mn_var_som/imx8mn_var_som.c index e274e0e..d40f4d0 100644 --- a/board/variscite/imx8mn_var_som/imx8mn_var_som.c +++ b/board/variscite/imx8mn_var_som/imx8mn_var_som.c @@ -18,7 +18,7 @@ static void setup_fec(void) int board_init(void) { - if (CONFIG_IS_ENABLED(FEC_MXC)) + if (IS_ENABLED(CONFIG_FEC_MXC)) setup_fec(); return 0; diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index fbc76ee..d071ebf 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -33,7 +33,7 @@ #include "fru.h" -#if CONFIG_IS_ENABLED(EFI_HAVE_CAPSULE_SUPPORT) +#if IS_ENABLED(CONFIG_EFI_HAVE_CAPSULE_SUPPORT) struct efi_fw_image fw_images[] = { #if defined(XILINX_BOOT_IMAGE_GUID) { @@ -208,7 +208,7 @@ static int xilinx_read_eeprom_fru(struct udevice *dev, char *name, } fru_capture((unsigned long)fru_content); - if (gd->flags & GD_FLG_RELOC || (_DEBUG && CONFIG_IS_ENABLED(DTB_RESELECT))) { + if (gd->flags & GD_FLG_RELOC || (_DEBUG && IS_ENABLED(CONFIG_DTB_RESELECT))) { printf("Xilinx I2C FRU format at %s:\n", name); ret = fru_display(0); if (ret) { @@ -306,7 +306,7 @@ static int xilinx_read_eeprom_single(char *name, debug("%s: i2c memory detected: %s\n", __func__, name); - if (CONFIG_IS_ENABLED(CMD_FRU) && xilinx_detect_fru(buffer)) + if (IS_ENABLED(CONFIG_CMD_FRU) && xilinx_detect_fru(buffer)) return xilinx_read_eeprom_fru(dev, name, desc); if (xilinx_detect_legacy(buffer)) @@ -412,14 +412,14 @@ int board_late_init_xilinx(void) struct xilinx_board_description *desc; phys_size_t bootm_size = gd->ram_top - gd->ram_base; - if (!CONFIG_IS_ENABLED(MICROBLAZE)) { + if (!IS_ENABLED(CONFIG_MICROBLAZE)) { ulong scriptaddr; scriptaddr = env_get_hex("scriptaddr", 0); ret |= env_set_hex("scriptaddr", gd->ram_base + scriptaddr); } - if (CONFIG_IS_ENABLED(ARCH_ZYNQ) || CONFIG_IS_ENABLED(MICROBLAZE)) + if (IS_ENABLED(CONFIG_ARCH_ZYNQ) || IS_ENABLED(CONFIG_MICROBLAZE)) bootm_size = min(bootm_size, (phys_size_t)(SZ_512M + SZ_256M)); ret |= env_set_hex("script_offset_f", CONFIG_BOOT_SCRIPT_OFFSET); @@ -481,7 +481,7 @@ int __maybe_unused board_fit_config_name_match(const char *name) debug("%s: Check %s, default %s\n", __func__, name, board_name); #if !defined(CONFIG_SPL_BUILD) - if (CONFIG_IS_ENABLED(REGEX)) { + if (IS_ENABLED(CONFIG_REGEX)) { struct slre slre; int ret; @@ -501,7 +501,7 @@ int __maybe_unused board_fit_config_name_match(const char *name) return -1; } -#if CONFIG_IS_ENABLED(DTB_RESELECT) +#if IS_ENABLED(CONFIG_DTB_RESELECT) #define MAX_NAME_LENGTH 50 char * __maybe_unused __weak board_name_decode(void) diff --git a/board/xilinx/versal-net/board.c b/board/xilinx/versal-net/board.c index 5fb7110..6724c72 100644 --- a/board/xilinx/versal-net/board.c +++ b/board/xilinx/versal-net/board.c @@ -172,7 +172,7 @@ int board_late_init(void) return 0; } - if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) return 0; return board_late_init_xilinx(); @@ -195,7 +195,7 @@ int dram_init(void) { int ret; - if (CONFIG_IS_ENABLED(SYS_MEM_RSVD_FOR_MMU)) + if (IS_ENABLED(CONFIG_SYS_MEM_RSVD_FOR_MMU)) ret = fdtdec_setup_mem_size_base(); else ret = fdtdec_setup_mem_size_base_lowest(); diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 4cdc2ec..81e1b69 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -142,7 +142,7 @@ int board_late_init(void) return 0; } - if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) return 0; bootmode = versal_get_bootmode(); diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index df4c457..9a59445 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -55,7 +55,7 @@ int board_late_init(void) return 0; } - if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) return 0; switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) { diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index e3f70c4..39da96b 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -405,7 +405,7 @@ int board_late_init(void) return 0; } - if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG)) return 0; ret = set_fdtfile(); diff --git a/boot/Makefile b/boot/Makefile index 0db4672..5424b6f 100644 --- a/boot/Makefile +++ b/boot/Makefile @@ -30,8 +30,9 @@ obj-$(CONFIG_$(SPL_TPL_)QFW) += bootmeth_qfw.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SANDBOX) += bootmeth_sandbox.o obj-$(CONFIG_$(SPL_TPL_)BOOTMETH_SCRIPT) += bootmeth_script.o ifdef CONFIG_$(SPL_TPL_)BOOTSTD_FULL -obj-$(CONFIG_$(SPL_TPL_)CMD_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o +obj-$(CONFIG_CMD_BOOTEFI_BOOTMGR) += bootmeth_efi_mgr.o obj-$(CONFIG_$(SPL_TPL_)EXPO) += bootflow_menu.o +obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o endif obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o diff --git a/boot/bootm.c b/boot/bootm.c index 15fce8a..2eec60e 100644 --- a/boot/bootm.c +++ b/boot/bootm.c @@ -100,7 +100,7 @@ static int bootm_pre_load(struct cmd_tbl *cmdtp, int flag, int argc, ulong data_addr = bootm_data_addr(argc, argv); int ret = 0; - if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD)) + if (IS_ENABLED(CONFIG_CMD_BOOTM_PRE_LOAD)) ret = image_pre_load(data_addr); if (ret) @@ -226,7 +226,7 @@ static int bootm_find_os(struct cmd_tbl *cmdtp, int flag, int argc, } if (images.os.type == IH_TYPE_KERNEL_NOLOAD) { - if (CONFIG_IS_ENABLED(CMD_BOOTI) && + if (IS_ENABLED(CONFIG_CMD_BOOTI) && images.os.arch == IH_ARCH_ARM64) { ulong image_addr; ulong image_size; @@ -313,7 +313,7 @@ int bootm_find_images(int flag, int argc, char *const argv[], ulong start, return 1; } - if (CONFIG_IS_ENABLED(CMD_FDT)) + if (IS_ENABLED(CONFIG_CMD_FDT)) set_working_fdt_addr(map_to_sysmem(images.ft_addr)); #endif @@ -893,7 +893,7 @@ static const void *boot_get_kernel(struct cmd_tbl *cmdtp, int flag, int argc, &fit_uname_config, &fit_uname_kernel); - if (CONFIG_IS_ENABLED(CMD_BOOTM_PRE_LOAD)) + if (IS_ENABLED(CONFIG_CMD_BOOTM_PRE_LOAD)) img_addr += image_load_offset; bootstage_mark(BOOTSTAGE_ID_CHECK_MAGIC); diff --git a/boot/image-board.c b/boot/image-board.c index e5d71a3..25b60ec 100644 --- a/boot/image-board.c +++ b/boot/image-board.c @@ -927,7 +927,7 @@ int image_setup_linux(struct bootm_headers *images) int ret; /* This function cannot be called without lmb support */ - if (!CONFIG_IS_ENABLED(LMB)) + if (!IS_ENABLED(CONFIG_LMB)) return -EFAULT; if (CONFIG_IS_ENABLED(OF_LIBFDT)) boot_fdt_add_mem_rsv_regions(lmb, *of_flat_tree); diff --git a/boot/image-fdt.c b/boot/image-fdt.c index b830a0a..714d05d 100644 --- a/boot/image-fdt.c +++ b/boot/image-fdt.c @@ -272,7 +272,7 @@ int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size) *of_flat_tree = of_start; *of_size = of_len; - if (CONFIG_IS_ENABLED(CMD_FDT)) + if (IS_ENABLED(CONFIG_CMD_FDT)) set_working_fdt_addr(map_to_sysmem(*of_flat_tree)); return 0; @@ -638,7 +638,7 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, /* Update ethernet nodes */ fdt_fixup_ethernet(blob); -#if CONFIG_IS_ENABLED(CMD_PSTORE) +#if IS_ENABLED(CONFIG_CMD_PSTORE) /* Append PStore configuration */ fdt_fixup_pstore(blob); #endif diff --git a/cmd/bootcount.c b/cmd/bootcount.c index 654bbb8..3898d25 100644 --- a/cmd/bootcount.c +++ b/cmd/bootcount.c @@ -46,7 +46,7 @@ static int do_bootcount(struct cmd_tbl *cmdtp, int flag, int argc, return CMD_RET_USAGE; } -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) static char bootcount_help_text[] = "print - print current bootcounter\n" "reset - reset the bootcounter" @@ -55,7 +55,7 @@ static char bootcount_help_text[] = U_BOOT_CMD(bootcount, 2, 1, do_bootcount, "bootcount", -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) bootcount_help_text #endif ); diff --git a/cmd/bootmenu.c b/cmd/bootmenu.c index 3236ca5..ef196bd 100644 --- a/cmd/bootmenu.c +++ b/cmd/bootmenu.c @@ -223,7 +223,7 @@ static int prepare_bootmenu_entry(struct bootmenu_data *menu, return 1; } -#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG)) +#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (IS_ENABLED(CONFIG_CMD_EFICONFIG)) /** * prepare_uefi_bootorder_entry() - generate the uefi bootmenu entries * @@ -343,7 +343,7 @@ static struct bootmenu_data *bootmenu_create(int delay) if (ret < 0) goto cleanup; -#if (CONFIG_IS_ENABLED(CMD_BOOTEFI_BOOTMGR)) && (CONFIG_IS_ENABLED(CMD_EFICONFIG)) +#if (IS_ENABLED(CONFIG_CMD_BOOTEFI_BOOTMGR)) && (IS_ENABLED(CONFIG_CMD_EFICONFIG)) if (i < MAX_COUNT - 1) { efi_status_t efi_ret; @@ -19,7 +19,7 @@ static int do_video_clear(struct cmd_tbl *cmdtp, int flag, int argc, /* Send clear screen and home */ printf(CSI "2J" CSI "1;1H"); - if (CONFIG_IS_ENABLED(VIDEO) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) { + if (IS_ENABLED(CONFIG_VIDEO) && !IS_ENABLED(CONFIG_VIDEO_ANSI)) { if (uclass_first_device_err(UCLASS_VIDEO, &dev)) return CMD_RET_FAILURE; if (video_clear(dev)) @@ -83,7 +83,7 @@ static int do_cpu_detail(struct cmd_tbl *cmdtp, int flag, int argc, return 0; } -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) static char cpu_help_text[] = "list - list available CPUs\n" "cpu detail - show CPU detail" @@ -84,7 +84,7 @@ static int do_dm_dump_uclass(struct cmd_tbl *cmdtp, int flag, int argc, #define DM_MEM #endif -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) static char dm_help_text[] = "compat Dump list of drivers with compatibility strings\n" "dm devres Dump list of device resources for each device\n" diff --git a/cmd/eficonfig.c b/cmd/eficonfig.c index 47c04cf..46f652c 100644 --- a/cmd/eficonfig.c +++ b/cmd/eficonfig.c @@ -2670,7 +2670,7 @@ static const struct eficonfig_item maintenance_menu_items[] = { {"Edit Boot Option", eficonfig_process_edit_boot_option}, {"Change Boot Order", eficonfig_process_change_boot_order}, {"Delete Boot Option", eficonfig_process_delete_boot_option}, -#if (CONFIG_IS_ENABLED(EFI_SECURE_BOOT) && CONFIG_IS_ENABLED(EFI_MM_COMM_TEE)) +#if (CONFIG_IS_ENABLED(EFI_SECURE_BOOT) && IS_ENABLED(CONFIG_EFI_MM_COMM_TEE)) {"Secure Boot Configuration", eficonfig_process_secure_boot_config}, #endif {"Quit", eficonfig_process_quit}, diff --git a/cmd/fastboot.c b/cmd/fastboot.c index b94dbd5..97dc02c 100644 --- a/cmd/fastboot.c +++ b/cmd/fastboot.c @@ -21,7 +21,7 @@ static int do_fastboot_udp(int argc, char *const argv[], { int err; - if (!CONFIG_IS_ENABLED(UDP_FUNCTION_FASTBOOT)) { + if (!IS_ENABLED(CONFIG_UDP_FUNCTION_FASTBOOT)) { pr_err("Fastboot UDP not enabled\n"); return CMD_RET_FAILURE; } @@ -44,7 +44,7 @@ static int do_fastboot_usb(int argc, char *const argv[], char *endp; int ret; - if (!CONFIG_IS_ENABLED(USB_FUNCTION_FASTBOOT)) { + if (!IS_ENABLED(CONFIG_USB_FUNCTION_FASTBOOT)) { pr_err("Fastboot USB not enabled\n"); return CMD_RET_FAILURE; } @@ -280,7 +280,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[]) switch (argc) { case 1: - if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT) + if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) return 1; /* refresh bootfile name from env */ @@ -289,7 +289,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[]) break; case 2: - if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT) + if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) return 1; /* * Only one arg - accept two forms: @@ -311,7 +311,7 @@ static int parse_args(enum proto_t proto, int argc, char *const argv[]) break; case 3: - if (CONFIG_IS_ENABLED(CMD_TFTPPUT) && proto == TFTPPUT) { + if (IS_ENABLED(CONFIG_CMD_TFTPPUT) && proto == TFTPPUT) { if (parse_addr_size(argv)) return 1; } else { diff --git a/cmd/nvedit.c b/cmd/nvedit.c index e2a5f00..7cbc3fd 100644 --- a/cmd/nvedit.c +++ b/cmd/nvedit.c @@ -231,7 +231,7 @@ static int _do_env_set(int flag, int argc, char *const argv[], int env_flag) debug("Initial value for argc=%d\n", argc); -#if CONFIG_IS_ENABLED(CMD_NVEDIT_EFI) +#if !IS_ENABLED(CONFIG_SPL_BUILD) && IS_ENABLED(CONFIG_CMD_NVEDIT_EFI) if (argc > 1 && argv[1][0] == '-' && argv[1][1] == 'e') return do_env_set_efi(NULL, flag, --argc, ++argv); #endif diff --git a/cmd/ti/pd.c b/cmd/ti/pd.c index 008668f..a9a182f 100644 --- a/cmd/ti/pd.c +++ b/cmd/ti/pd.c @@ -177,7 +177,7 @@ static int ti_do_pd(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv U_BOOT_CMD(pd, 4, 1, ti_do_pd, "TI power domain control", -#if CONFIG_IS_ENABLED(SYS_LONGHELP) +#if IS_ENABLED(CONFIG_SYS_LONGHELP) "dump - show power domain status\n" "enable [psc] [lpsc] - enable power domain\n" "disable [psc] [lpsc] - disable power domain\n" diff --git a/common/board_r.c b/common/board_r.c index 3618aca..c6c0c1a 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) diff --git a/common/cli.c b/common/cli.c index ba45dad..9451e6a 100644 --- a/common/cli.c +++ b/common/cli.c @@ -31,7 +31,7 @@ */ int run_command(const char *cmd, int flag) { -#if !CONFIG_IS_ENABLED(HUSH_PARSER) +#if !IS_ENABLED(CONFIG_HUSH_PARSER) /* * cli_run_command can return 0 or 1 for success, so clean up * its result. diff --git a/common/event.c b/common/event.c index c312556..164c95f 100644 --- a/common/event.c +++ b/common/event.c @@ -155,7 +155,7 @@ void event_show_spy_list(void) } } -#if CONFIG_IS_ENABLED(NEEDS_MANUAL_RELOC) +#if IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC) int event_manual_reloc(void) { struct evspy_info *spy, *end; diff --git a/common/fdt_simplefb.c b/common/fdt_simplefb.c index 71d4c8f..282c34f 100644 --- a/common/fdt_simplefb.c +++ b/common/fdt_simplefb.c @@ -82,7 +82,7 @@ int fdt_simplefb_enable_existing_node(void *blob) return fdt_simplefb_configure_node(blob, off); } -#if CONFIG_IS_ENABLED(VIDEO) +#if IS_ENABLED(CONFIG_VIDEO) int fdt_simplefb_enable_and_mem_rsv(void *blob) { struct fdt_memory mem; diff --git a/common/hash.c b/common/hash.c index 9e53545..9a52d60 100644 --- a/common/hash.c +++ b/common/hash.c @@ -326,8 +326,8 @@ static struct hash_algo hash_algo[] = { }; /* Try to minimize code size for boards that don't want much hashing */ -#if CONFIG_IS_ENABLED(SHA256) || CONFIG_IS_ENABLED(CMD_SHA1SUM) || \ - CONFIG_IS_ENABLED(CRC32_VERIFY) || CONFIG_IS_ENABLED(CMD_HASH) || \ +#if CONFIG_IS_ENABLED(SHA256) || IS_ENABLED(CONFIG_CMD_SHA1SUM) || \ + CONFIG_IS_ENABLED(CRC32_VERIFY) || IS_ENABLED(CONFIG_CMD_HASH) || \ CONFIG_IS_ENABLED(SHA384) || CONFIG_IS_ENABLED(SHA512) #define multi_hash() 1 #else diff --git a/common/splash.c b/common/splash.c index 2e466a8..245ff68 100644 --- a/common/splash.c +++ b/common/splash.c @@ -89,7 +89,7 @@ static inline int splash_video_logo_load(void) { return -ENOSYS; } __weak int splash_screen_prepare(void) { - if (CONFIG_IS_ENABLED(SPLASH_SOURCE)) + if (IS_ENABLED(CONFIG_SPLASH_SOURCE)) return splash_source_load(default_splash_locations, ARRAY_SIZE(default_splash_locations)); diff --git a/disk/part_dos.c b/disk/part_dos.c index a94702c..56e6188 100644 --- a/disk/part_dos.c +++ b/disk/part_dos.c @@ -318,7 +318,7 @@ int is_valid_dos_buf(void *buf) return test_block_type(buf) == DOS_MBR ? 0 : -1; } -#if CONFIG_IS_ENABLED(CMD_MBR) +#if IS_ENABLED(CONFIG_CMD_MBR) static void lba_to_chs(lbaint_t lba, unsigned char *rc, unsigned char *rh, unsigned char *rs) { diff --git a/disk/part_efi.c b/disk/part_efi.c index 18f7e58..80a44dc 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -242,7 +242,7 @@ void part_print_efi(struct blk_desc *dev_desc) print_efiname(&gpt_pte[i])); printf("\tattrs:\t0x%016llx\n", gpt_pte[i].attributes.raw); uuid = (unsigned char *)gpt_pte[i].partition_type_guid.b; - if (CONFIG_IS_ENABLED(PARTITION_TYPE_GUID)) + if (IS_ENABLED(CONFIG_PARTITION_TYPE_GUID)) printf("\ttype:\t%pUl\n\t\t(%pUs)\n", uuid, uuid); else printf("\ttype:\t%pUl\n", uuid); diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c index 7e8e62f..6ab137a 100644 --- a/drivers/clk/clk-divider.c +++ b/drivers/clk/clk-divider.c @@ -81,7 +81,7 @@ static ulong clk_divider_recalc_rate(struct clk *clk) unsigned long parent_rate = clk_get_parent_rate(clk); unsigned int val; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) val = divider->io_divider_val; #else val = readl(divider->reg); @@ -210,7 +210,7 @@ static struct clk *_register_divider(struct device *dev, const char *name, div->width = width; div->flags = clk_divider_flags; div->table = table; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) div->io_divider_val = *(u32 *)reg; #endif diff --git a/drivers/clk/clk-gate.c b/drivers/clk/clk-gate.c index aa40daf..a8775c7 100644 --- a/drivers/clk/clk-gate.c +++ b/drivers/clk/clk-gate.c @@ -62,7 +62,7 @@ static void clk_gate_endisable(struct clk *clk, int enable) if (set) reg |= BIT(gate->bit_idx); } else { -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) reg = gate->io_gate_val; #else reg = readl(gate->reg); @@ -96,7 +96,7 @@ int clk_gate_is_enabled(struct clk *clk) struct clk_gate *gate = to_clk_gate(clk); u32 reg; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) reg = gate->io_gate_val; #else reg = readl(gate->reg); @@ -142,7 +142,7 @@ struct clk *clk_register_gate(struct device *dev, const char *name, gate->reg = reg; gate->bit_idx = bit_idx; gate->flags = clk_gate_flags; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) gate->io_gate_val = *(u32 *)reg; #endif diff --git a/drivers/clk/clk-mux.c b/drivers/clk/clk-mux.c index b49946f..184d426 100644 --- a/drivers/clk/clk-mux.c +++ b/drivers/clk/clk-mux.c @@ -90,7 +90,7 @@ u8 clk_mux_get_parent(struct clk *clk) struct clk_mux *mux = to_clk_mux(clk); u32 val; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) val = mux->io_mux_val; #else val = readl(mux->reg); @@ -137,7 +137,7 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent) if (mux->flags & CLK_MUX_HIWORD_MASK) { reg = mux->mask << (mux->shift + 16); } else { -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) reg = mux->io_mux_val; #else reg = readl(mux->reg); @@ -146,7 +146,7 @@ static int clk_mux_set_parent(struct clk *clk, struct clk *parent) } val = val << mux->shift; reg |= val; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) mux->io_mux_val = reg; #else writel(reg, mux->reg); @@ -194,7 +194,7 @@ struct clk *clk_hw_register_mux_table(struct device *dev, const char *name, mux->mask = mask; mux->flags = clk_mux_flags; mux->table = table; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) mux->io_mux_val = *(u32 *)reg; #endif diff --git a/drivers/clk/clk_k210.c b/drivers/clk/clk_k210.c index f7d3696..c534cc0 100644 --- a/drivers/clk/clk_k210.c +++ b/drivers/clk/clk_k210.c @@ -308,7 +308,7 @@ enum k210_clk_flags { * @gate: An &enum k210_gate_id of this clock's gate */ struct k210_clk_params { -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) const char *name; #endif u8 flags; @@ -326,7 +326,7 @@ struct k210_clk_params { }; static const struct k210_clk_params k210_clks[] = { -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) #define NAME(_name) .name = (_name), #else #define NAME(name) @@ -1284,7 +1284,7 @@ U_BOOT_DRIVER(k210_clk) = { .priv_auto = sizeof(struct k210_clk_priv), }; -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) static char show_enabled(struct k210_clk_priv *priv, int id) { bool enabled; diff --git a/drivers/clk/imx/clk-imx8.c b/drivers/clk/imx/clk-imx8.c index b3dc138..24bdab2 100644 --- a/drivers/clk/imx/clk-imx8.c +++ b/drivers/clk/imx/clk-imx8.c @@ -42,7 +42,7 @@ static int imx8_clk_enable(struct clk *clk) return __imx8_clk_enable(clk, 1); } -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) int soc_clk_dump(void) { struct udevice *dev; diff --git a/drivers/clk/imx/clk-imx8.h b/drivers/clk/imx/clk-imx8.h index 68ad675..6e850ba 100644 --- a/drivers/clk/imx/clk-imx8.h +++ b/drivers/clk/imx/clk-imx8.h @@ -9,7 +9,7 @@ struct imx8_clks { const char *name; }; -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) extern struct imx8_clks imx8_clk_names[]; extern int num_clks; #endif diff --git a/drivers/clk/imx/clk-imx8qm.c b/drivers/clk/imx/clk-imx8qm.c index 7759dc6..b874915 100644 --- a/drivers/clk/imx/clk-imx8qm.c +++ b/drivers/clk/imx/clk-imx8qm.c @@ -16,7 +16,7 @@ #include "clk-imx8.h" -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) struct imx8_clks imx8_clk_names[] = { { IMX8QM_A53_DIV, "A53_DIV" }, { IMX8QM_UART0_CLK, "UART0" }, diff --git a/drivers/clk/imx/clk-imx8qxp.c b/drivers/clk/imx/clk-imx8qxp.c index ffa2fce..d580b43 100644 --- a/drivers/clk/imx/clk-imx8qxp.c +++ b/drivers/clk/imx/clk-imx8qxp.c @@ -16,7 +16,7 @@ #include "clk-imx8.h" -#if CONFIG_IS_ENABLED(CMD_CLK) +#if IS_ENABLED(CONFIG_CMD_CLK) struct imx8_clks imx8_clk_names[] = { { IMX8QXP_A35_DIV, "A35_DIV" }, { IMX8QXP_I2C0_CLK, "I2C0" }, diff --git a/drivers/crypto/aspeed/aspeed_hace.c b/drivers/crypto/aspeed/aspeed_hace.c index a1b0b9f..6b6c8fa 100644 --- a/drivers/crypto/aspeed/aspeed_hace.c +++ b/drivers/crypto/aspeed/aspeed_hace.c @@ -288,7 +288,7 @@ static int aspeed_hace_digest_wd(struct udevice *dev, enum HASH_ALGO algo, if (rc) return rc; - if (CONFIG_IS_ENABLED(HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) { + if (IS_ENABLED(CONFIG_HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) { cur = ibuf; end = ibuf + ilen; diff --git a/drivers/crypto/hash/hash_sw.c b/drivers/crypto/hash/hash_sw.c index 553c068..d8065d6 100644 --- a/drivers/crypto/hash/hash_sw.c +++ b/drivers/crypto/hash/hash_sw.c @@ -244,7 +244,7 @@ static int sw_hash_digest_wd(struct udevice *dev, enum HASH_ALGO algo, if (rc) return rc; - if (CONFIG_IS_ENABLED(HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) { + if (IS_ENABLED(CONFIG_HW_WATCHDOG) || CONFIG_IS_ENABLED(WATCHDOG)) { cur = ibuf; end = ibuf + ilen; diff --git a/drivers/fastboot/fb_command.c b/drivers/fastboot/fb_command.c index 67a9479..71cfaec 100644 --- a/drivers/fastboot/fb_command.c +++ b/drivers/fastboot/fb_command.c @@ -295,11 +295,11 @@ void fastboot_data_complete(char *response) */ static void __maybe_unused flash(char *cmd_parameter, char *response) { - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) fastboot_mmc_flash_write(cmd_parameter, fastboot_buf_addr, image_size, response); - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) fastboot_nand_flash_write(cmd_parameter, fastboot_buf_addr, image_size, response); } @@ -315,10 +315,10 @@ static void __maybe_unused flash(char *cmd_parameter, char *response) */ static void __maybe_unused erase(char *cmd_parameter, char *response) { - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) fastboot_mmc_erase(cmd_parameter, response); - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) fastboot_nand_erase(cmd_parameter, response); } diff --git a/drivers/fastboot/fb_common.c b/drivers/fastboot/fb_common.c index 7563650..57b6182 100644 --- a/drivers/fastboot/fb_common.c +++ b/drivers/fastboot/fb_common.c @@ -99,7 +99,7 @@ int __weak fastboot_set_reboot_flag(enum fastboot_reboot_reason reason) const int mmc_dev = config_opt_enabled(CONFIG_FASTBOOT_FLASH_MMC, CONFIG_FASTBOOT_FLASH_MMC_DEV, -1); - if (!CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) + if (!IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) return -EINVAL; if (reason >= FASTBOOT_REBOOT_REASONS_COUNT) diff --git a/drivers/fastboot/fb_getvar.c b/drivers/fastboot/fb_getvar.c index 2fbd285..dd3475e 100644 --- a/drivers/fastboot/fb_getvar.c +++ b/drivers/fastboot/fb_getvar.c @@ -57,17 +57,17 @@ static const struct { }, { .variable = "current-slot", .dispatch = getvar_current_slot -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH) +#if IS_ENABLED(CONFIG_FASTBOOT_FLASH) }, { .variable = "has-slot", .dispatch = getvar_has_slot #endif -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC) +#if IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC) }, { .variable = "partition-type", .dispatch = getvar_partition_type #endif -#if CONFIG_IS_ENABLED(FASTBOOT_FLASH) +#if IS_ENABLED(CONFIG_FASTBOOT_FLASH) }, { .variable = "partition-size", .dispatch = getvar_partition_size @@ -99,12 +99,12 @@ static int getvar_get_part_info(const char *part_name, char *response, struct disk_partition disk_part; struct part_info *part_info; - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_MMC)) { + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_MMC)) { r = fastboot_mmc_get_part_info(part_name, &dev_desc, &disk_part, response); if (r >= 0 && size) *size = disk_part.size * disk_part.blksz; - } else if (CONFIG_IS_ENABLED(FASTBOOT_FLASH_NAND)) { + } else if (IS_ENABLED(CONFIG_FASTBOOT_FLASH_NAND)) { r = fastboot_nand_get_part_info(part_name, &part_info, response); if (r >= 0 && size) *size = part_info->size; diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c index 033c510..a06c590 100644 --- a/drivers/fastboot/fb_mmc.c +++ b/drivers/fastboot/fb_mmc.c @@ -588,7 +588,7 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer, } #endif -#if CONFIG_IS_ENABLED(FASTBOOT_MMC_USER_SUPPORT) +#if IS_ENABLED(CONFIG_FASTBOOT_MMC_USER_SUPPORT) if (strcmp(cmd, CONFIG_FASTBOOT_MMC_USER_NAME) == 0) { dev_desc = fastboot_mmc_get_dev(response); if (!dev_desc) diff --git a/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c index 9a1599d..86b9fb5 100644 --- a/drivers/i2c/mxc_i2c.c +++ b/drivers/i2c/mxc_i2c.c @@ -744,7 +744,7 @@ void bus_i2c_init(int index, int speed, int unused, return; } - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (i2c_fused((ulong)mxc_i2c_buses[index].base)) { printf("SoC fuse indicates I2C@0x%lx is unavailable.\n", (ulong)mxc_i2c_buses[index].base); @@ -878,7 +878,7 @@ static int mxc_i2c_probe(struct udevice *bus) if (addr == FDT_ADDR_T_NONE) return -EINVAL; - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (i2c_fused((ulong)addr)) { printf("SoC fuse indicates I2C@0x%lx is unavailable.\n", (ulong)addr); diff --git a/drivers/misc/fsl_ifc.c b/drivers/misc/fsl_ifc.c index 58b0058..f165b8c 100644 --- a/drivers/misc/fsl_ifc.c +++ b/drivers/misc/fsl_ifc.c @@ -371,7 +371,7 @@ void init_early_memctl_regs(void) for (i = 0 ; i < regs_info.cs_size; i++) { if (regs[i].pr && (regs[i].pr & CSPR_V)) { /* skip setting cspr/csor_ext in below condition */ - if (!(CONFIG_IS_ENABLED(A003399_NOR_WORKAROUND) && + if (!(IS_ENABLED(CONFIG_A003399_NOR_WORKAROUND) && i == 0 && ((regs[0].pr & CSPR_MSEL) == CSPR_MSEL_NOR))) { if (regs[i].pr_ext) diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 3a664c2..3dc7571 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -46,7 +46,7 @@ obj-$(CONFIG_MMC_MXS) += mxsmmc.o obj-$(CONFIG_MMC_OCTEONTX) += octeontx_hsmmc.o obj-$(CONFIG_MMC_OWL) += owl_mmc.o obj-$(CONFIG_MMC_PCI) += pci_mmc.o -obj-$(CONFIG_$(SPL_TPL_)SUPPORT_EMMC_RPMB) += rpmb.o +obj-$(CONFIG_SUPPORT_EMMC_RPMB) += rpmb.o obj-$(CONFIG_MMC_SANDBOX) += sandbox_mmc.o obj-$(CONFIG_SH_MMCIF) += sh_mmcif.o obj-$(CONFIG_SH_SDHI) += sh_sdhi.o diff --git a/drivers/mmc/tmio-common.h b/drivers/mmc/tmio-common.h index 88244e8..4d717d8 100644 --- a/drivers/mmc/tmio-common.h +++ b/drivers/mmc/tmio-common.h @@ -140,7 +140,7 @@ struct tmio_sd_priv { struct clk clk; struct clk clkh; #endif -#if CONFIG_IS_ENABLED(RENESAS_SDHI) +#if IS_ENABLED(CONFIG_RENESAS_SDHI) unsigned int smpcmp; u8 tap_set; u8 tap_num; diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 8abfdbd..1a6c18a 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1205,7 +1205,7 @@ static int fecmxc_probe(struct udevice *dev) uint32_t start; int ret; - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (enet_fused((ulong)priv->eth)) { printf("SoC fuse indicates Ethernet@0x%lx is unavailable.\n", (ulong)priv->eth); return -ENODEV; diff --git a/drivers/phy/phy-ab8500-usb.c b/drivers/phy/phy-ab8500-usb.c index 0e04595..3d3d48c 100644 --- a/drivers/phy/phy-ab8500-usb.c +++ b/drivers/phy/phy-ab8500-usb.c @@ -19,7 +19,7 @@ static int ab8500_usb_phy_power_on(struct phy *phy) struct udevice *dev = phy->dev; uint set = AB8500_BIT_PHY_CTRL_DEVICE_EN; - if (CONFIG_IS_ENABLED(USB_MUSB_HOST)) + if (IS_ENABLED(CONFIG_USB_MUSB_HOST)) set = AB8500_BIT_PHY_CTRL_HOST_EN; return pmic_clrsetbits(dev->parent, AB8500_USB_PHY_CTRL_REG, diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c index 44a310f..e949cb7 100644 --- a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c +++ b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c @@ -153,7 +153,7 @@ U_BOOT_DRIVER(pinctrl_bcm283x) = { .priv_auto = sizeof(struct bcm283x_pinctrl_priv), .ops = &bcm283x_pinctrl_ops, .probe = bcm283x_pinctl_probe, -#if CONFIG_IS_ENABLED(OF_BOARD) +#if IS_ENABLED(CONFIG_OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif }; diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index 50e3dd4..84b3986 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c @@ -271,7 +271,7 @@ static int atmel_pinctrl_bind(struct udevice *dev) ofnode node = dev_ofnode(dev); struct atmel_pinctrl_data *priv = (struct atmel_pinctrl_data *)dev_get_driver_data(dev); - if (!CONFIG_IS_ENABLED(ATMEL_PIO4)) + if (!IS_ENABLED(CONFIG_ATMEL_PIO4)) return 0; /* Obtain a handle to the GPIO driver */ diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index bc9c17b..d80281f 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -541,7 +541,7 @@ static int single_probe(struct udevice *dev) INIT_LIST_HEAD(&priv->gpiofuncs); size = pdata->offset + pdata->width / BITS_PER_BYTE; - #if (CONFIG_IS_ENABLED(SANDBOX)) + #if (IS_ENABLED(CONFIG_SANDBOX)) priv->sandbox_regs = devm_kzalloc(dev, size * sizeof(*priv->sandbox_regs), GFP_KERNEL); diff --git a/drivers/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index 12cbcb9..7585f79 100644 --- a/drivers/serial/serial_bcm283x_mu.c +++ b/drivers/serial/serial_bcm283x_mu.c @@ -197,7 +197,7 @@ U_BOOT_DRIVER(serial_bcm283x_mu) = { .plat_auto = sizeof(struct bcm283x_mu_serial_plat), .probe = bcm283x_mu_serial_probe, .ops = &bcm283x_mu_serial_ops, -#if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) +#if !CONFIG_IS_ENABLED(OF_CONTROL) || IS_ENABLED(CONFIG_OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif .priv_auto = sizeof(struct bcm283x_mu_priv), diff --git a/drivers/serial/serial_bcm283x_pl011.c b/drivers/serial/serial_bcm283x_pl011.c index 7d172cd..09a9868 100644 --- a/drivers/serial/serial_bcm283x_pl011.c +++ b/drivers/serial/serial_bcm283x_pl011.c @@ -94,7 +94,7 @@ U_BOOT_DRIVER(bcm283x_pl011_uart) = { .probe = bcm283x_pl011_serial_probe, .plat_auto = sizeof(struct pl01x_serial_plat), .ops = &bcm283x_pl011_serial_ops, -#if !CONFIG_IS_ENABLED(OF_CONTROL) || CONFIG_IS_ENABLED(OF_BOARD) +#if !CONFIG_IS_ENABLED(OF_CONTROL) || IS_ENABLED(CONFIG_OF_BOARD) .flags = DM_FLAG_PRE_RELOC, #endif .priv_auto = sizeof(struct pl01x_priv), diff --git a/drivers/serial/serial_zynq.c b/drivers/serial/serial_zynq.c index 4b18183..9bb9b7d 100644 --- a/drivers/serial/serial_zynq.c +++ b/drivers/serial/serial_zynq.c @@ -108,7 +108,7 @@ static void _uart_zynq_serial_init(struct uart_zynq *regs) static int _uart_zynq_serial_putc(struct uart_zynq *regs, const char c) { - if (CONFIG_IS_ENABLED(DEBUG_UART_ZYNQ)) { + if (IS_ENABLED(CONFIG_DEBUG_UART_ZYNQ)) { if (!(readl(®s->channel_sts) & ZYNQ_UART_SR_TXEMPTY)) return -EAGAIN; } else { diff --git a/drivers/spi/cadence_ospi_versal.c b/drivers/spi/cadence_ospi_versal.c index e0d5e6b..434c603 100644 --- a/drivers/spi/cadence_ospi_versal.c +++ b/drivers/spi/cadence_ospi_versal.c @@ -216,7 +216,7 @@ int cadence_qspi_versal_flash_reset(struct udevice *dev) void cadence_qspi_apb_enable_linear_mode(bool enable) { - if (CONFIG_IS_ENABLED(ZYNQMP_FIRMWARE)) { + if (IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE)) { if (enable) /* ahb read mode */ xilinx_pm_request(PM_IOCTL, PM_DEV_OSPI, diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index 328dfb0..c7f10c5 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -215,7 +215,7 @@ static int cadence_spi_probe(struct udevice *bus) priv->tchsh_ns = plat->tchsh_ns; priv->tslch_ns = plat->tslch_ns; - if (CONFIG_IS_ENABLED(ZYNQMP_FIRMWARE)) + if (IS_ENABLED(CONFIG_ZYNQMP_FIRMWARE)) xilinx_pm_request(PM_REQUEST_NODE, PM_DEV_OSPI, ZYNQMP_PM_CAPABILITY_ACCESS, ZYNQMP_PM_MAX_QOS, ZYNQMP_PM_REQUEST_ACK_NO, NULL); @@ -249,7 +249,7 @@ static int cadence_spi_probe(struct udevice *bus) priv->wr_delay = 50 * DIV_ROUND_UP(NSEC_PER_SEC, priv->ref_clk_hz); - if (CONFIG_IS_ENABLED(ARCH_VERSAL)) { + if (IS_ENABLED(CONFIG_ARCH_VERSAL)) { /* Versal platform uses spi calibration to set read delay */ if (priv->read_delay >= 0) priv->read_delay = -1; diff --git a/drivers/sysreset/sysreset_mpc83xx.c b/drivers/sysreset/sysreset_mpc83xx.c index 81fccf9..c9a0326 100644 --- a/drivers/sysreset/sysreset_mpc83xx.c +++ b/drivers/sysreset/sysreset_mpc83xx.c @@ -120,7 +120,7 @@ static int print_83xx_arb_event(bool force, char *buf, int size) "Master ID", mstr_id, master[mstr_id], "Transfer Size", tsize_val, tsize_bytes, "Transfer Type", ttype, transfer[ttype]); - } else if (CONFIG_IS_ENABLED(DISPLAY_AER_BRIEF)) { + } else if (IS_ENABLED(CONFIG_DISPLAY_AER_BRIEF)) { res = snprintf(buf, size, "Arbiter Event Status: AEATR=0x%08lX, AEADR=0x%08lX\n", gd->arch.arbiter_event_attributes, @@ -185,7 +185,7 @@ static int mpc83xx_sysreset_get_status(struct udevice *dev, char *buf, int size) * arbiter driver */ if (CONFIG_IS_ENABLED(DISPLAY_AER_FULL) || - CONFIG_IS_ENABLED(DISPLAY_AER_BRIEF)) { + IS_ENABLED(CONFIG_DISPLAY_AER_BRIEF)) { /* * If there was a bus monitor reset event, we force the arbiter * event to be printed diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c index 5ff0cd3..b2286f7 100644 --- a/drivers/tpm/tpm-uclass.c +++ b/drivers/tpm/tpm-uclass.c @@ -156,7 +156,7 @@ static int tpm_uclass_post_probe(struct udevice *dev) const char *drv = TPM_RNG_DRV_NAME; struct udevice *child; - if (CONFIG_IS_ENABLED(TPM_RNG)) { + if (IS_ENABLED(CONFIG_TPM_RNG)) { ret = device_find_first_child_by_uclass(dev, UCLASS_RNG, &child); diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 0a12db6..91633f0 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -360,7 +360,7 @@ int ehci_hcd_init(int index, enum usb_init_type init, if (index > 3) return -EINVAL; - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (usb_fused((ulong)ehci)) { printf("SoC fuse indicates USB@0x%lx is unavailable.\n", (ulong)ehci); @@ -641,7 +641,7 @@ static int ehci_usb_probe(struct udevice *dev) struct ehci_hcor *hcor; int ret; - if (CONFIG_IS_ENABLED(IMX_MODULE_FUSE)) { + if (IS_ENABLED(CONFIG_IMX_MODULE_FUSE)) { if (usb_fused((ulong)ehci)) { printf("SoC fuse indicates USB@0x%lx is unavailable.\n", (ulong)ehci); diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index 42e7abd..482dfdc 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -231,7 +231,7 @@ static int omap2430_musb_probe(struct udevice *dev) otg_board_data = &plat->otg_board_data; - if (CONFIG_IS_ENABLED(USB_MUSB_HOST)) { + if (IS_ENABLED(CONFIG_USB_MUSB_HOST)) { struct musb_host_data *host = dev_get_priv(dev); struct usb_bus_priv *priv = dev_get_uclass_priv(dev); diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c index 8b01a1b..7e60385 100644 --- a/drivers/video/imx/mxc_ipuv3_fb.c +++ b/drivers/video/imx/mxc_ipuv3_fb.c @@ -615,7 +615,7 @@ static int ipuv3_video_probe(struct udevice *dev) if (ret < 0) return ret; #endif - if (CONFIG_IS_ENABLED(PANEL)) { + if (IS_ENABLED(CONFIG_PANEL)) { struct udevice *panel_dev; ret = uclass_get_device(UCLASS_PANEL, 0, &panel_dev); diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 0ce376c..6aaacff 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -196,14 +196,14 @@ u32 video_index_to_colour(struct video_priv *priv, unsigned int idx) { switch (priv->bpix) { case VIDEO_BPP16: - if (CONFIG_IS_ENABLED(VIDEO_BPP16)) { + if (IS_ENABLED(CONFIG_VIDEO_BPP16)) { return ((colours[idx].r >> 3) << 11) | ((colours[idx].g >> 2) << 5) | ((colours[idx].b >> 3) << 0); } break; case VIDEO_BPP32: - if (CONFIG_IS_ENABLED(VIDEO_BPP32)) { + if (IS_ENABLED(CONFIG_VIDEO_BPP32)) { if (priv->format == VIDEO_X2R10G10B10) return (colours[idx].r << 22) | (colours[idx].g << 12) | diff --git a/drivers/xen/events.c b/drivers/xen/events.c index 532216f..2ebe20d 100644 --- a/drivers/xen/events.c +++ b/drivers/xen/events.c @@ -23,9 +23,9 @@ #include <xen/events.h> #include <xen/hvm.h> -#if CONFIG_IS_ENABLED(XEN_SERIAL) +#if IS_ENABLED(CONFIG_XEN_SERIAL) extern u32 console_evtchn; -#endif /* CONFIG_IS_ENABLED(XEN_SERIAL) */ +#endif /* IS_ENABLED(CONFIG_XEN_SERIAL) */ #define NR_EVS 1024 @@ -53,10 +53,10 @@ void unbind_all_ports(void) struct vcpu_info *vcpu_info = &s->vcpu_info[cpu]; for (i = 0; i < NR_EVS; i++) { -#if CONFIG_IS_ENABLED(XEN_SERIAL) +#if IS_ENABLED(CONFIG_XEN_SERIAL) if (i == console_evtchn) continue; -#endif /* CONFIG_IS_ENABLED(XEN_SERIAL) */ +#endif /* IS_ENABLED(CONFIG_XEN_SERIAL) */ if (test_and_clear_bit(i, bound_ports)) { printf("port %d still bound!\n", i); diff --git a/fs/erofs/Makefile b/fs/erofs/Makefile index 58af6a6..ef94d2d 100644 --- a/fs/erofs/Makefile +++ b/fs/erofs/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -obj-$(CONFIG_$(SPL_)FS_EROFS) = fs.o \ +obj-$(CONFIG_FS_EROFS) = fs.o \ super.o \ namei.o \ data.o \ diff --git a/include/bcb.h b/include/bcb.h index 897e83d..5edb17a 100644 --- a/include/bcb.h +++ b/include/bcb.h @@ -8,7 +8,7 @@ #ifndef __BCB_H__ #define __BCB_H__ -#if CONFIG_IS_ENABLED(CMD_BCB) +#if IS_ENABLED(CONFIG_CMD_BCB) int bcb_write_reboot_reason(int devnum, char *partp, const char *reasonp); #else #include <linux/errno.h> diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 1f473b5..5b47778 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -47,7 +47,7 @@ #define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ #devtypel #instance " " -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) func(USB, usb, 0) #else # define BOOT_TARGET_USB(func) diff --git a/include/configs/am62ax_evm.h b/include/configs/am62ax_evm.h index cdd639b..a18b157 100644 --- a/include/configs/am62ax_evm.h +++ b/include/configs/am62ax_evm.h @@ -71,12 +71,12 @@ #define BOOTENV_DEV_NAME_TI_MMC(devtyeu, devtypel, instance) \ "ti_mmc " -#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) #define BOOT_TARGET_MMC(func) \ func(TI_MMC, ti_mmc, na) #else #define BOOT_TARGET_MMC(func) -#endif /* CONFIG_IS_ENABLED(CMD_MMC) */ +#endif /* IS_ENABLED(CONFIG_CMD_MMC) */ #define BOOT_TARGET_DEVICES(func) \ BOOT_TARGET_MMC(func) diff --git a/include/configs/apple.h b/include/configs/apple.h index fe7d11b..0576bc0 100644 --- a/include/configs/apple.h +++ b/include/configs/apple.h @@ -9,13 +9,13 @@ "stdout=serial,vidconsole\0" \ "stderr=serial,vidconsole\0" -#if CONFIG_IS_ENABLED(CMD_NVME) +#if IS_ENABLED(CONFIG_CMD_NVME) #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) #else #define BOOT_TARGET_NVME(func) #endif -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) #define BOOT_TARGET_USB(func) func(USB, usb, 0) #else #define BOOT_TARGET_USB(func) diff --git a/include/configs/imx8mm-cl-iot-gate.h b/include/configs/imx8mm-cl-iot-gate.h index 2641d7b..09d87cf 100644 --- a/include/configs/imx8mm-cl-iot-gate.h +++ b/include/configs/imx8mm-cl-iot-gate.h @@ -30,7 +30,7 @@ EFI_GUID(0x0bf1165c, 0x1831, 0x4864, 0x94, 0x5e, \ 0xac, 0x3d, 0x38, 0x48, 0xf4, 0x99) -#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) # define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 2) \ func(MMC, mmc, 0) @@ -38,7 +38,7 @@ # define BOOT_TARGET_MMC(func) #endif -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) func(USB, usb, 0) #else # define BOOT_TARGET_USB(func) diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h index bb3dfe3..1880d03 100644 --- a/include/configs/imx8mn_beacon.h +++ b/include/configs/imx8mn_beacon.h @@ -80,7 +80,7 @@ #define CFG_SYS_SDRAM_BASE 0x40000000 #define PHYS_SDRAM 0x40000000 -#if CONFIG_IS_ENABLED(IMX8MN_BEACON_2GB_LPDDR) +#if IS_ENABLED(CONFIG_IMX8MN_BEACON_2GB_LPDDR) #define PHYS_SDRAM_SIZE 0x80000000 /* 2GB DDR */ #else #define PHYS_SDRAM_SIZE 0x40000000 /* 1GB DDR */ diff --git a/include/configs/imx8mp_rsb3720.h b/include/configs/imx8mp_rsb3720.h index d4ab6a6..e577f60 100644 --- a/include/configs/imx8mp_rsb3720.h +++ b/include/configs/imx8mp_rsb3720.h @@ -39,7 +39,7 @@ #endif -#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) # define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 2) \ func(MMC, mmc, 1) diff --git a/include/configs/iot2050.h b/include/configs/iot2050.h index 7d08741..cfff46c 100644 --- a/include/configs/iot2050.h +++ b/include/configs/iot2050.h @@ -19,7 +19,7 @@ #define EXTRA_ENV_IOT2050_BOARD_SETTINGS \ "usb_pgood_delay=900\0" -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) \ func(USB, usb, 0) \ func(USB, usb, 1) \ diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h index 635ae78..98b743b 100644 --- a/include/configs/mx6ul_14x14_evk.h +++ b/include/configs/mx6ul_14x14_evk.h @@ -13,7 +13,7 @@ #include "mx6_common.h" #include <asm/mach-imx/gpio.h> -#define is_mx6ul_9x9_evk() CONFIG_IS_ENABLED(TARGET_MX6UL_9X9_EVK) +#define is_mx6ul_9x9_evk() IS_ENABLED(CONFIG_TARGET_MX6UL_9X9_EVK) #define CFG_MXC_UART_BASE UART1_BASE diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index 0b23e4c..ff8123d 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -12,7 +12,7 @@ #ifndef CONFIG_SPL_BUILD /* First try to boot from SD (index 1), then eMMC (index 0) */ -#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) #define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 1) \ func(MMC, mmc, 0) @@ -20,19 +20,19 @@ #define BOOT_TARGET_MMC(func) #endif -#if CONFIG_IS_ENABLED(CMD_NVME) +#if IS_ENABLED(CONFIG_CMD_NVME) #define BOOT_TARGET_NVME(func) func(NVME, nvme, 0) #else #define BOOT_TARGET_NVME(func) #endif -#if CONFIG_IS_ENABLED(CMD_SCSI) +#if IS_ENABLED(CONFIG_CMD_SCSI) #define BOOT_TARGET_SCSI(func) func(SCSI, scsi, 0) #else #define BOOT_TARGET_SCSI(func) #endif -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) #define BOOT_TARGET_USB(func) func(USB, usb, 0) #else #define BOOT_TARGET_USB(func) @@ -50,7 +50,7 @@ #define BOOT_TARGET_DHCP(func) #endif -#if CONFIG_IS_ENABLED(CMD_SF) +#if IS_ENABLED(CONFIG_CMD_SF) #define BOOT_TARGET_SF(func) func(SF, sf, 0) #else #define BOOT_TARGET_SF(func) diff --git a/include/configs/rpi.h b/include/configs/rpi.h index c3f8e7b..4da982f 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -122,7 +122,7 @@ "fdt_addr_r=0x02600000\0" \ "ramdisk_addr_r=0x02700000\0" -#if CONFIG_IS_ENABLED(CMD_MMC) +#if IS_ENABLED(CONFIG_CMD_MMC) #define BOOT_TARGET_MMC(func) \ func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ @@ -131,7 +131,7 @@ #define BOOT_TARGET_MMC(func) #endif -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) #define BOOT_TARGET_USB(func) func(USB, usb, 0) #else #define BOOT_TARGET_USB(func) diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 0fdb5a8..991ffbb 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -7,7 +7,7 @@ #ifndef __TEGRA_COMMON_POST_H #define __TEGRA_COMMON_POST_H -#if CONFIG_IS_ENABLED(CMD_USB) +#if IS_ENABLED(CONFIG_CMD_USB) # define BOOT_TARGET_USB(func) func(USB, usb, 0) #else # define BOOT_TARGET_USB(func) diff --git a/include/env_internal.h b/include/env_internal.h index aee6b3e..6a69494 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -189,7 +189,7 @@ struct env_driver { #endif #define ENV_SAVE_PTR(x) (CONFIG_IS_ENABLED(SAVEENV) ? (x) : NULL) -#define ENV_ERASE_PTR(x) (CONFIG_IS_ENABLED(CMD_ERASEENV) ? (x) : NULL) +#define ENV_ERASE_PTR(x) (IS_ENABLED(CONFIG_CMD_ERASEENV) ? (x) : NULL) extern struct hsearch_data env_htab; diff --git a/include/environment/distro/sf.h b/include/environment/distro/sf.h index 62624d5..ee48a8a 100644 --- a/include/environment/distro/sf.h +++ b/include/environment/distro/sf.h @@ -8,7 +8,7 @@ #ifndef __DISTRO_SF_CONFIG_H #define __DISTRO_SF_CONFIG_H -#if CONFIG_IS_ENABLED(CMD_SF) +#if IS_ENABLED(CONFIG_CMD_SF) #define BOOTENV_SHARED_SF(devtypel) \ #devtypel "_boot=" \ "if " #devtypel " probe ${busnum}; then " \ diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h index 2d04882..b8acacd 100644 --- a/include/linux/clk-provider.h +++ b/include/linux/clk-provider.h @@ -65,7 +65,7 @@ struct clk_mux { */ const char * const *parent_names; u8 num_parents; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) u32 io_mux_val; #endif @@ -93,7 +93,7 @@ struct clk_gate { void __iomem *reg; u8 bit_idx; u8 flags; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) u32 io_gate_val; #endif }; @@ -121,7 +121,7 @@ struct clk_divider { u8 width; u8 flags; const struct clk_div_table *table; -#if CONFIG_IS_ENABLED(SANDBOX_CLK_CCF) +#if IS_ENABLED(CONFIG_SANDBOX_CLK_CCF) u32 io_divider_val; #endif }; diff --git a/include/tee.h b/include/tee.h index 13f6096..ab0c583 100644 --- a/include/tee.h +++ b/include/tee.h @@ -328,7 +328,7 @@ bool tee_shm_is_registered(struct tee_shm *shm, struct udevice *dev); * Returns a probed TEE device of the first TEE device matched by the * match() callback or NULL. */ -#if CONFIG_IS_ENABLED(TEE) +#if IS_ENABLED(CONFIG_TEE) struct udevice *tee_find_device(struct udevice *start, int (*match)(struct tee_version_data *vers, const void *data), diff --git a/lib/efi_loader/efi_image_loader.c b/lib/efi_loader/efi_image_loader.c index eaf75a5..26df0da 100644 --- a/lib/efi_loader/efi_image_loader.c +++ b/lib/efi_loader/efi_image_loader.c @@ -938,7 +938,7 @@ efi_status_t efi_load_pe(struct efi_loaded_image_obj *handle, goto err; } -#if CONFIG_IS_ENABLED(EFI_TCG2_PROTOCOL) +#if IS_ENABLED(CONFIG_EFI_TCG2_PROTOCOL) /* Measure an PE/COFF image */ ret = tcg2_measure_pe_image(efi, efi_size, handle, loaded_image_info); if (ret == EFI_SECURITY_VIOLATION) { diff --git a/lib/efi_loader/efi_root_node.c b/lib/efi_loader/efi_root_node.c index a4eb6f4..108c14b 100644 --- a/lib/efi_loader/efi_root_node.c +++ b/lib/efi_loader/efi_root_node.c @@ -58,7 +58,7 @@ efi_status_t efi_root_node_register(void) &efi_guid_device_path_to_text_protocol, &efi_device_path_to_text, #endif -#if CONFIG_IS_ENABLED(EFI_DEVICE_PATH_UTIL) +#if IS_ENABLED(CONFIG_EFI_DEVICE_PATH_UTIL) /* Device path utilities protocol */ &efi_guid_device_path_utilities_protocol, &efi_device_path_utilities, @@ -68,11 +68,11 @@ efi_status_t efi_root_node_register(void) &efi_guid_dt_fixup_protocol, &efi_dt_fixup_prot, #endif -#if CONFIG_IS_ENABLED(EFI_UNICODE_COLLATION_PROTOCOL2) +#if IS_ENABLED(CONFIG_EFI_UNICODE_COLLATION_PROTOCOL2) &efi_guid_unicode_collation_protocol2, &efi_unicode_collation_protocol2, #endif -#if CONFIG_IS_ENABLED(EFI_LOADER_HII) +#if IS_ENABLED(CONFIG_EFI_LOADER_HII) /* HII string protocol */ &efi_guid_hii_string_protocol, &efi_hii_string, diff --git a/lib/hashtable.c b/lib/hashtable.c index 90c8465..f2d36bd 100644 --- a/lib/hashtable.c +++ b/lib/hashtable.c @@ -942,7 +942,7 @@ int himport_r(struct hsearch_data *htab, e.data = value; hsearch_r(e, ENV_ENTER, &rv, htab, flag); -#if !CONFIG_IS_ENABLED(ENV_WRITEABLE_LIST) +#if !IS_ENABLED(CONFIG_ENV_WRITEABLE_LIST) if (rv == NULL) { printf("himport_r: can't insert \"%s=%s\" into hash table\n", name, value); diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 8de3882..2d13e68 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -629,7 +629,7 @@ repeat: case 's': /* U-Boot uses UTF-16 strings in the EFI context only. */ -#if (CONFIG_IS_ENABLED(EFI_LOADER) || CONFIG_IS_ENABLED(EFI_APP)) && \ +#if (CONFIG_IS_ENABLED(EFI_LOADER) || IS_ENABLED(CONFIG_EFI_APP)) && \ !defined(API_BUILD) if (qualifier == 'l') { str = string16(str, end, va_arg(args, u16 *), diff --git a/net/bootp.c b/net/bootp.c index cae0419..8b1a4ae 100644 --- a/net/bootp.c +++ b/net/bootp.c @@ -1078,7 +1078,7 @@ static void dhcp_handler(uchar *pkt, unsigned dest, struct in_addr sip, #endif /* CONFIG_SYS_BOOTFILE_PREFIX */ dhcp_packet_process_options(bp); if (CONFIG_IS_ENABLED(EFI_LOADER) && - CONFIG_IS_ENABLED(NETDEVICES)) + IS_ENABLED(CONFIG_NETDEVICES)) efi_net_set_dhcp_ack(pkt, len); #if defined(CONFIG_SERVERIP_FROM_PROXYDHCP) diff --git a/net/fastboot.c b/net/fastboot.c index 96bdf54..e9569d8 100644 --- a/net/fastboot.c +++ b/net/fastboot.c @@ -307,7 +307,7 @@ void fastboot_start_server(void) fastboot_our_port = CONFIG_UDP_FUNCTION_FASTBOOT_PORT; - if (CONFIG_IS_ENABLED(FASTBOOT_FLASH)) + if (IS_ENABLED(CONFIG_FASTBOOT_FLASH)) fastboot_set_progress_callback(fastboot_timed_send_info); net_set_udp_handler(fastboot_handler); |