This converts 3 usages of this option to the non-SPL form, since there is no SPL_IMX8M defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/mach-imx/imx_bootaux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-imx/imx_bootaux.c b/arch/arm/mach-imx/imx_bootaux.c index 1a3e538c4fa..433c1f80cee 100644 --- a/arch/arm/mach-imx/imx_bootaux.c +++ b/arch/arm/mach-imx/imx_bootaux.c @@ -15,7 +15,7 @@ #include <cpu_func.h>

/* Just to avoid build error */ -#if CONFIG_IS_ENABLED(IMX8M) +#if IS_ENABLED(CONFIG_IMX8M) #define SRC_M4C_NON_SCLR_RST_MASK BIT(0) #define SRC_M4_ENABLE_MASK BIT(0) #define SRC_M4_REG_OFFSET 0 @@ -128,7 +128,7 @@ int arch_auxiliary_core_up(u32 core_id, ulong addr) flush_dcache_all();

/* Enable M4 */ - if (CONFIG_IS_ENABLED(IMX8M)) { + if (IS_ENABLED(CONFIG_IMX8M)) { arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_START, 0, 0, 0, 0, 0, 0, NULL); } else { clrsetbits_le32(SRC_BASE_ADDR + SRC_M4_REG_OFFSET, @@ -143,7 +143,7 @@ int arch_auxiliary_core_check_up(u32 core_id) struct arm_smccc_res res; unsigned int val;

- if (CONFIG_IS_ENABLED(IMX8M)) { + if (IS_ENABLED(CONFIG_IMX8M)) { arm_smccc_smc(IMX_SIP_SRC, IMX_SIP_SRC_M4_STARTED, 0, 0, 0, 0, 0, 0, &res); return res.a0; }

This converts 2 usages of this option to the non-SPL form, since there is no SPL_IMX_RDC defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/mach-imx/mx7/soc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 02af0d568f2..550e392550e 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -68,7 +68,7 @@ U_BOOT_DRVINFO(imx7_thermal) = { }; #endif

-#if CONFIG_IS_ENABLED(IMX_RDC) +#if IS_ENABLED(CONFIG_IMX_RDC) /* * In current design, if any peripheral was assigned to both A7 and M4, * it will receive ipg_stop or ipg_wait when any of the 2 platforms enter @@ -316,7 +316,7 @@ int arch_cpu_init(void)

init_cpu_basic();

-#if CONFIG_IS_ENABLED(IMX_RDC) +#if IS_ENABLED(CONFIG_IMX_RDC) isolate_resource(); #endif

This converts 2 usages of this option to the non-SPL form, since there is no SPL_MICROBLAZE defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/xilinx/common/board.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c index aa9f3ef071c..bed15319934 100644 --- a/board/xilinx/common/board.c +++ b/board/xilinx/common/board.c @@ -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 (IS_ENABLED(CONFIG_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);

This converts 1 usage of this option to the non-SPL form, since there is no SPL_MMC_QUIRKS defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/mmc/mmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index 210703ea46b..fd4aa946e2a 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c @@ -247,7 +247,7 @@ static int mmc_send_cmd_retry(struct mmc *mmc, struct mmc_cmd *cmd, static int mmc_send_cmd_quirks(struct mmc *mmc, struct mmc_cmd *cmd, struct mmc_data *data, u32 quirk, uint retries) { - if (CONFIG_IS_ENABLED(MMC_QUIRKS) && mmc->quirks & quirk) + if (IS_ENABLED(CONFIG_MMC_QUIRKS) && mmc->quirks & quirk) return mmc_send_cmd_retry(mmc, cmd, data, retries); else return mmc_send_cmd(mmc, cmd, data);

This converts 3 usages of this option to the non-SPL form, since there is no SPL_MULTIPLEXER defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/Makefile | 2 +- drivers/mux/Makefile | 2 +- include/mux.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/Makefile b/drivers/Makefile index 15d19d0c8a3..20497aa2ac9 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -18,7 +18,7 @@ obj-$(CONFIG_$(SPL_TPL_)INPUT) += input/ obj-$(CONFIG_$(SPL_TPL_)LED) += led/ obj-$(CONFIG_$(SPL_TPL_)MMC) += mmc/ obj-y += mtd/ -obj-$(CONFIG_$(SPL_)MULTIPLEXER) += mux/ +obj-$(CONFIG_MULTIPLEXER) += mux/ obj-$(CONFIG_$(SPL_TPL_)ETH) += net/ obj-$(CONFIG_$(SPL_TPL_)PCH) += pch/ obj-$(CONFIG_$(SPL_TPL_)PCI) += pci/ diff --git a/drivers/mux/Makefile b/drivers/mux/Makefile index 78ebf04c7a9..d4e24789d33 100644 --- a/drivers/mux/Makefile +++ b/drivers/mux/Makefile @@ -3,5 +3,5 @@ # (C) Copyright 2019 # Jean-Jacques Hiblot jjhiblot@ti.com

-obj-$(CONFIG_$(SPL_)MULTIPLEXER) += mux-uclass.o +obj-$(CONFIG_MULTIPLEXER) += mux-uclass.o obj-$(CONFIG_$(SPL_)MUX_MMIO) += mmio.o diff --git a/include/mux.h b/include/mux.h index 9f809912742..c92d887591e 100644 --- a/include/mux.h +++ b/include/mux.h @@ -23,7 +23,7 @@ struct udevice; struct mux_control;

-#if CONFIG_IS_ENABLED(MULTIPLEXER) +#if IS_ENABLED(CONFIG_MULTIPLEXER) /** * mux_control_states() - Query the number of multiplexer states. * @mux: The mux-control to query.

This converts 1 usage of this option to the non-SPL form, since there is no SPL_NETDEVICES defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

net/bootp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/bootp.c b/net/bootp.c index cae041988db..8b1a4ae2ef8 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)

This converts 1 usage of this option to the non-SPL form, since there is no SPL_OCTEON_SERIAL_BOOTCMD defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/mips/mach-octeon/cpu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/mach-octeon/cpu.c b/arch/mips/mach-octeon/cpu.c index 1bdc6cd7290..5adf4ba32c8 100644 --- a/arch/mips/mach-octeon/cpu.c +++ b/arch/mips/mach-octeon/cpu.c @@ -451,7 +451,7 @@ int arch_misc_init(void) if (CONFIG_IS_ENABLED(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;

This converts 3 usages of this option to the non-SPL form, since there is no SPL_OF_BOARD defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/pinctrl/broadcom/pinctrl-bcm283x.c | 2 +- drivers/serial/serial_bcm283x_mu.c | 2 +- drivers/serial/serial_bcm283x_pl011.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/broadcom/pinctrl-bcm283x.c b/drivers/pinctrl/broadcom/pinctrl-bcm283x.c index 44a310f83de..e949cb70900 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/serial/serial_bcm283x_mu.c b/drivers/serial/serial_bcm283x_mu.c index 12cbcb9858c..7585f790d22 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 7d172cdac0a..09a9868a38f 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),

This converts 1 usage of this option to the non-SPL form, since there is no SPL_OF_EMBED defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

common/board_r.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/board_r.c b/common/board_r.c index cbc140e6d8b..2cd66eac803 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) && IS_ENABLED(CONFIG_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

This converts 1 usage of this option to the non-SPL form, since there is no SPL_PARTITION_TYPE_GUID defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

disk/part_efi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/disk/part_efi.c b/disk/part_efi.c index 18f7e584050..80a44dc9f07 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);

This converts 2 usages of this option to the non-SPL form, since there is no SPL_PG_WCOM_UBOOT_BOOTPACKAGE defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/keymile/common/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 0252ada93ff..9cf5b71655c 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -79,9 +79,9 @@ int set_km_env(void) }

#if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED) -#if ((!CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ +#if ((!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ !CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE)) || \ - (CONFIG_IS_ENABLED(PG_WCOM_UBOOT_BOOTPACKAGE) && \ + (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE))) #error "It has to be either bootpackage or update u-boot image!" #endif

This converts 2 usages of this option to the non-SPL form, since there is no SPL_PG_WCOM_UBOOT_UPDATE defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/keymile/common/common.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 9cf5b71655c..8c282f9952a 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -80,9 +80,9 @@ int set_km_env(void)

#if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED) #if ((!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ - !CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE)) || \ + !IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE)) || \ (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ - CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE))) + 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)

This converts 1 usage of this option to the non-SPL form, since there is no SPL_PG_WCOM_UBOOT_UPDATE_SUPPORTED defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/keymile/common/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index 8c282f9952a..991022ac833 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -78,7 +78,7 @@ int set_km_env(void) return 0; }

-#if CONFIG_IS_ENABLED(PG_WCOM_UBOOT_UPDATE_SUPPORTED) +#if IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE_SUPPORTED) #if ((!IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \ !IS_ENABLED(CONFIG_PG_WCOM_UBOOT_UPDATE)) || \ (IS_ENABLED(CONFIG_PG_WCOM_UBOOT_BOOTPACKAGE) && \

This converts 1 usage of this option to the non-SPL form, since there is no SPL_PHY_CADENCE_SIERRA defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/phy/cadence/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/phy/cadence/Makefile b/drivers/phy/cadence/Makefile index af63b32d9f5..c247feb8262 100644 --- a/drivers/phy/cadence/Makefile +++ b/drivers/phy/cadence/Makefile @@ -1,2 +1,2 @@ -obj-$(CONFIG_$(SPL_)PHY_CADENCE_SIERRA) += phy-cadence-sierra.o +obj-$(CONFIG_PHY_CADENCE_SIERRA) += phy-cadence-sierra.o obj-$(CONFIG_$(SPL_)PHY_CADENCE_TORRENT) += phy-cadence-torrent.o

This converts 3 usages of this option to the non-SPL form, since there is no SPL_PHY_FIXED defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/net/mvneta.c | 4 ++-- net/mdio-uclass.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/mvneta.c b/drivers/net/mvneta.c index 0fbfad11d45..24933473fa0 100644 --- a/drivers/net/mvneta.c +++ b/drivers/net/mvneta.c @@ -815,7 +815,7 @@ static void mvneta_defaults_set(struct mvneta_port *pp) mvreg_write(pp, MVNETA_SDMA_CONFIG, val);

/* Enable PHY polling in hardware if not in fixed-link mode */ - if (!CONFIG_IS_ENABLED(PHY_FIXED) || + if (!IS_ENABLED(CONFIG_PHY_FIXED) || pp->phydev->phy_id != PHY_FIXED_ID) { mvreg_write(pp, MVNETA_PHY_ADDR, pp->phydev->addr);

@@ -1176,7 +1176,7 @@ static void mvneta_adjust_link(struct udevice *dev) * be added). Also, why is ADVERT_FC enabled if we don't enable * inband AN at all? */ - if (CONFIG_IS_ENABLED(PHY_FIXED) && + if (IS_ENABLED(CONFIG_PHY_FIXED) && pp->phydev->phy_id == PHY_FIXED_ID) val = MVNETA_GMAC_IB_BYPASS_AN_EN | MVNETA_GMAC_SET_FC_EN | diff --git a/net/mdio-uclass.c b/net/mdio-uclass.c index 4401492ca01..989ab3e4c96 100644 --- a/net/mdio-uclass.c +++ b/net/mdio-uclass.c @@ -171,7 +171,7 @@ static struct phy_device *dm_eth_connect_phy_handle(struct udevice *ethdev, struct phy_device *phy; ofnode phynode;

- if (CONFIG_IS_ENABLED(PHY_FIXED) && + if (IS_ENABLED(CONFIG_PHY_FIXED) && ofnode_phy_is_fixed_link(dev_ofnode(ethdev), &phynode)) { phy = phy_connect(NULL, 0, ethdev, interface); goto out;

This converts 1 usage of this option to the non-SPL form, since there is no SPL_QFW_PIO defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/x86/cpu/qemu/qemu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/cpu/qemu/qemu.c b/arch/x86/cpu/qemu/qemu.c index e54082df7f9..4f28dc75b70 100644 --- a/arch/x86/cpu/qemu/qemu.c +++ b/arch/x86/cpu/qemu/qemu.c @@ -17,7 +17,7 @@

static bool i440fx;

-#if CONFIG_IS_ENABLED(QFW_PIO) +#if IS_ENABLED(CONFIG_QFW_PIO) U_BOOT_DRVINFO(x86_qfw_pio) = { .name = "qfw_pio", };

This converts 1 usage of this option to the non-SPL form, since there is no SPL_RENESAS_SDHI defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/mmc/tmio-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/tmio-common.h b/drivers/mmc/tmio-common.h index 59d5a0e22e9..b1556bba5d9 100644 --- a/drivers/mmc/tmio-common.h +++ b/drivers/mmc/tmio-common.h @@ -139,7 +139,7 @@ struct tmio_sd_priv { #if CONFIG_IS_ENABLED(CLK) struct clk clk; #endif -#if CONFIG_IS_ENABLED(RENESAS_SDHI) +#if IS_ENABLED(CONFIG_RENESAS_SDHI) unsigned int smpcmp; u8 tap_set; u8 tap_num;

This converts 2 usages of this option to the non-SPL form, since there is no SPL_ROCKCHIP_EFUSE defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/mach-rockchip/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-rockchip/misc.c b/arch/arm/mach-rockchip/misc.c index 01aedadf2c6..437c7cf896a 100644 --- a/arch/arm/mach-rockchip/misc.c +++ b/arch/arm/mach-rockchip/misc.c @@ -60,12 +60,12 @@ 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) || CONFIG_IS_ENABLED(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)

This converts 1 usage of this option to the non-SPL form, since there is no SPL_SANDBOX defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/pinctrl/pinctrl-single.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index bc9c17bce84..d80281fd3dd 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);

This converts 2 usages of this option to the non-SPL form, since there is no SPL_SAVE_PREV_BL_FDT_ADDR defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/lib/save_prev_bl_data.c | 2 +- common/board_r.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/lib/save_prev_bl_data.c b/arch/arm/lib/save_prev_bl_data.c index f4ee86a89c6..cd943eefe10 100644 --- a/arch/arm/lib/save_prev_bl_data.c +++ b/arch/arm/lib/save_prev_bl_data.c @@ -60,7 +60,7 @@ 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)) return 0; diff --git a/common/board_r.c b/common/board_r.c index 2cd66eac803..56c50f43baf 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -453,7 +453,7 @@ static int initr_env(void) (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)) + IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR)) save_prev_bl_data(); #endif

This converts 2 usages of this option to the non-SPL form, since there is no SPL_SEC_FIRMWARE_ARMV8_PSCI defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/cpu/armv8/cpu-dt.c | 2 +- arch/arm/lib/bootm-fdt.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/cpu/armv8/cpu-dt.c b/arch/arm/cpu/armv8/cpu-dt.c index 9bfe3815e51..afb2dd6c5b6 100644 --- a/arch/arm/cpu/armv8/cpu-dt.c +++ b/arch/arm/cpu/armv8/cpu-dt.c @@ -18,7 +18,7 @@ __weak int psci_update_dt(void *fdt) * number to support detecting PSCI dynamically and then switching * the SMP boot method between PSCI and spin-table. */ - if (CONFIG_IS_ENABLED(SEC_FIRMWARE_ARMV8_PSCI) && + if (IS_ENABLED(CONFIG_SEC_FIRMWARE_ARMV8_PSCI) && sec_firmware_support_psci_version() == PSCI_INVALID_VER) return 0;

diff --git a/arch/arm/lib/bootm-fdt.c b/arch/arm/lib/bootm-fdt.c index 29020bd1c6b..69e688f677f 100644 --- a/arch/arm/lib/bootm-fdt.c +++ b/arch/arm/lib/bootm-fdt.c @@ -64,7 +64,7 @@ int arch_fixup_fdt(void *blob) #endif

#if defined(CONFIG_ARMV7_NONSEC) || defined(CONFIG_ARMV8_PSCI) || \ - CONFIG_IS_ENABLED(SEC_FIRMWARE_ARMV8_PSCI) + IS_ENABLED(CONFIG_SEC_FIRMWARE_ARMV8_PSCI) ret = psci_update_dt(blob); if (ret) return ret;

This converts 1 usage of this option to the non-SPL form, since there is no SPL_SL28CPLD defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/kontron/sl28/sl28.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index 4ad6b323476..257923685a5 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -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;

This converts 1 usage of this option to the non-SPL form, since there is no SPL_SPI_FLASH_BAR defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/mtd/spi/spi-nor-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c index 2c3116ee530..d410ae58953 100644 --- a/drivers/mtd/spi/spi-nor-core.c +++ b/drivers/mtd/spi/spi-nor-core.c @@ -3894,7 +3894,7 @@ void spi_nor_set_fixups(struct spi_nor *nor) } }

- if (CONFIG_IS_ENABLED(SPI_FLASH_BAR) && + if (IS_ENABLED(CONFIG_SPI_FLASH_BAR) && !strcmp(nor->info->name, "s25fl256l")) nor->fixups = &s25fl256l_fixups; #endif

This converts 1 usage of this option to the non-SPL form, since there is no SPL_SPLASH_SOURCE defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

common/splash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/splash.c b/common/splash.c index 2e466a8a0f5..245ff680ebd 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));

This converts 1 usage of this option to the non-SPL form, since there is no SPL_SUPPORT_EMMC_RPMB defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/mmc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 3a664c2ebbb..3dc757108d5 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

This converts 5 usages of this option to the non-SPL form, since there is no SPL_SYS_LONGHELP defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

cmd/bootcount.c | 4 ++-- cmd/cpu.c | 2 +- cmd/dm.c | 2 +- cmd/ti/pd.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/bootcount.c b/cmd/bootcount.c index 654bbb805c1..3898d2543d2 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/cpu.c b/cmd/cpu.c index a09736e1bb9..314852440f1 100644 --- a/cmd/cpu.c +++ b/cmd/cpu.c @@ -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" diff --git a/cmd/dm.c b/cmd/dm.c index 979cd36061e..3263547cbec 100644 --- a/cmd/dm.c +++ b/cmd/dm.c @@ -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/ti/pd.c b/cmd/ti/pd.c index 008668fd903..a9a182fc386 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"

This converts 3 usages of this option to the non-SPL form, since there is no SPL_TARGET_LX2160ARDB defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/freescale/lx2160a/lx2160a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/board/freescale/lx2160a/lx2160a.c b/board/freescale/lx2160a/lx2160a.c index cf5b1ee46e0..d8a86cdf618 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);

This converts 1 usage of this option to the non-SPL form, since there is no SPL_TARGET_PG_WCOM_EXPU1 defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c index e005ece469b..c65cd9cdc9b 100644 --- a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c +++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c @@ -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);

This converts 1 usage of this option to the non-SPL form, since there is no SPL_TARGET_PG_WCOM_SELI8 defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c index c65cd9cdc9b..2f1731eea6a 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);

This converts 1 usage of this option to the non-SPL form, since there is no SPL_TEE defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

include/tee.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/tee.h b/include/tee.h index 13f6096b9a6..ab0c5832613 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),

This converts 1 usage of this option to the non-SPL form, since there is no SPL_TPM_RNG defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/tpm/tpm-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tpm/tpm-uclass.c b/drivers/tpm/tpm-uclass.c index 5ff0cd3958c..b2286f7e7ed 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);

This converts 2 usages of this option to the non-SPL form, since there is no SPL_USB_DWC3_MESON_GXL defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/mach-meson/board-axg.c | 2 +- arch/arm/mach-meson/board-gx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c index 236ec815799..8bcb0b3a212 100644 --- a/arch/arm/mach-meson/board-axg.c +++ b/arch/arm/mach-meson/board-axg.c @@ -91,7 +91,7 @@ static struct mm_region axg_mem_map[] = {

struct mm_region *mem_map = axg_mem_map;

-#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ +#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data;

diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index 01fafd81c48..41f767302ec 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -109,7 +109,7 @@ static struct mm_region gx_mem_map[] = {

struct mm_region *mem_map = gx_mem_map;

-#if CONFIG_IS_ENABLED(USB_DWC3_MESON_GXL) && \ +#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data;

This converts 1 usage of this option to the non-SPL form, since there is no SPL_USB_FUNCTION_FASTBOOT defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

cmd/fastboot.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmd/fastboot.c b/cmd/fastboot.c index 17c53bbe277..97dc02ce748 100644 --- a/cmd/fastboot.c +++ b/cmd/fastboot.c @@ -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; }

This converts 3 usages of this option to the non-SPL form, since there is no SPL_USB_GADGET_DWC2_OTG defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/arm/mach-meson/board-axg.c | 2 +- arch/arm/mach-meson/board-g12a.c | 2 +- arch/arm/mach-meson/board-gx.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-meson/board-axg.c b/arch/arm/mach-meson/board-axg.c index 8bcb0b3a212..4baf045d416 100644 --- a/arch/arm/mach-meson/board-axg.c +++ b/arch/arm/mach-meson/board-axg.c @@ -92,7 +92,7 @@ static struct mm_region axg_mem_map[] = { struct mm_region *mem_map = axg_mem_map;

#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) + IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data;

int board_usb_init(int index, enum usb_init_type init) diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c index d9f1acdef74..46507c6a0f9 100644 --- a/arch/arm/mach-meson/board-g12a.c +++ b/arch/arm/mach-meson/board-g12a.c @@ -98,7 +98,7 @@ static struct mm_region g12a_mem_map[] = { struct mm_region *mem_map = g12a_mem_map;

#if IS_ENABLED(CONFIG_USB_DWC3_MESON_G12A) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) + IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_g12a_dwc2_data;

int board_usb_init(int index, enum usb_init_type init) diff --git a/arch/arm/mach-meson/board-gx.c b/arch/arm/mach-meson/board-gx.c index 41f767302ec..b850460c26c 100644 --- a/arch/arm/mach-meson/board-gx.c +++ b/arch/arm/mach-meson/board-gx.c @@ -110,7 +110,7 @@ static struct mm_region gx_mem_map[] = { struct mm_region *mem_map = gx_mem_map;

#if IS_ENABLED(CONFIG_USB_DWC3_MESON_GXL) && \ - CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG) + IS_ENABLED(CONFIG_USB_GADGET_DWC2_OTG) static struct dwc2_plat_otg_data meson_gx_dwc2_data;

int board_usb_init(int index, enum usb_init_type init)

This converts 2 usages of this option to the non-SPL form, since there is no SPL_USB_KEYBOARD defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

arch/x86/cpu/coreboot/coreboot.c | 2 +- arch/x86/cpu/efi/payload.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/cpu/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c index aaa5ae112e4..d7eedbd7436 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 1c28a43778e..19a25dd6408 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;

This converts 2 usages of this option to the non-SPL form, since there is no SPL_VIDEO defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

cmd/cls.c | 2 +- common/fdt_simplefb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmd/cls.c b/cmd/cls.c index 18643ec0243..787c7edbee3 100644 --- a/cmd/cls.c +++ b/cmd/cls.c @@ -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) && !CONFIG_IS_ENABLED(VIDEO_ANSI)) { if (uclass_first_device_err(UCLASS_VIDEO, &dev)) return CMD_RET_FAILURE; if (video_clear(dev)) diff --git a/common/fdt_simplefb.c b/common/fdt_simplefb.c index 71d4c8fde90..282c34fe0b9 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;

This converts 1 usage of this option to the non-SPL form, since there is no SPL_VIDEO_BPP16 defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/video/video-uclass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/video/video-uclass.c b/drivers/video/video-uclass.c index 0ce376ca3f1..f36970e0420 100644 --- a/drivers/video/video-uclass.c +++ b/drivers/video/video-uclass.c @@ -196,7 +196,7 @@ 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);

This converts 1 usage of this option to the non-SPL form, since there is no SPL_WATCHDOG_AUTOSTART defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

board/kontron/sl28/sl28.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/board/kontron/sl28/sl28.c b/board/kontron/sl28/sl28.c index e78a0d5dd3c..89948e087f1 100644 --- a/board/kontron/sl28/sl28.c +++ b/board/kontron/sl28/sl28.c @@ -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;

This converts 2 usages of this option to the non-SPL form, since there is no SPL_ZYNQMP_FIRMWARE defined in Kconfig

Signed-off-by: Simon Glass sjg@chromium.org ---

drivers/spi/cadence_ospi_versal.c | 2 +- drivers/spi/cadence_qspi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/cadence_ospi_versal.c b/drivers/spi/cadence_ospi_versal.c index e0d5e6b9e69..434c6038f3b 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 3ce5f8fb8d8..c7f10c50132 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);