[PATCH 101/171] Correct SPL uses of I8259_PIC

[PATCH 101/171] Correct SPL uses of I8259_PIC

[Simon Glass]

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

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

 arch/x86/lib/interrupts.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/lib/interrupts.c b/arch/x86/lib/interrupts.c
index ff52959ed28..33d6eb49d75 100644
--- a/arch/x86/lib/interrupts.c
+++ b/arch/x86/lib/interrupts.c
@@ -66,7 +66,7 @@ void irq_install_handler(int irq, interrupt_handler_t *handler, void *arg)
 	irq_handlers[irq].arg = arg;
 	irq_handlers[irq].count = 0;
 
-	if (CONFIG_IS_ENABLED(I8259_PIC))
+	if (IS_ENABLED(CONFIG_I8259_PIC))
 		unmask_irq(irq);
 
 	if (status)
@@ -86,7 +86,7 @@ void irq_free_handler(int irq)
 
 	status = disable_interrupts();
 
-	if (CONFIG_IS_ENABLED(I8259_PIC))
+	if (IS_ENABLED(CONFIG_I8259_PIC))
 		mask_irq(irq);
 
 	irq_handlers[irq].handler = NULL;
@@ -108,13 +108,13 @@ void do_irq(int hw_irq)
 	}
 
 	if (irq_handlers[irq].handler) {
-		if (CONFIG_IS_ENABLED(I8259_PIC))
+		if (IS_ENABLED(CONFIG_I8259_PIC))
 			mask_irq(irq);
 
 		irq_handlers[irq].handler(irq_handlers[irq].arg);
 		irq_handlers[irq].count++;
 
-		if (CONFIG_IS_ENABLED(I8259_PIC)) {
+		if (IS_ENABLED(CONFIG_I8259_PIC)) {
 			unmask_irq(irq);
 			specific_eoi(irq);
 		}
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 102/171] Correct SPL uses of IMX8M

[Simon Glass]

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;
 	}
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 103/171] Correct SPL use of IMX8MN_BEACON_2GB_LPDDR

[Simon Glass]

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

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

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

diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
index bb3dfe3fa0d..1880d0311e4 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 */
-- 
2.39.1.456.gfc5497dd1b-goog

Re: [PATCH 103/171] Correct SPL use of IMX8MN_BEACON_2GB_LPDDR

[Adam Ford]

On Mon, Jan 30, 2023 at 9:17 AM Simon Glass <sjg@chromium.org> wrote:
>
> This converts 1 usage of this option to the non-SPL form, since there is
> no SPL_IMX8MN_BEACON_2GB_LPDDR defined in Kconfig
>

Reviewed-by: Adam Ford <aford173@gmail.com>

> Signed-off-by: Simon Glass <sjg@chromium.org>
> ---
>
>  include/configs/imx8mn_beacon.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/configs/imx8mn_beacon.h b/include/configs/imx8mn_beacon.h
> index bb3dfe3fa0d..1880d0311e4 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 */
> --
> 2.39.1.456.gfc5497dd1b-goog
>

[PATCH 104/171] Correct SPL uses of IMX_MODULE_FUSE

[Simon Glass]

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

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

 arch/arm/include/asm/mach-imx/module_fuse.h | 2 +-
 drivers/i2c/mxc_i2c.c                       | 4 ++--
 drivers/net/fec_mxc.c                       | 2 +-
 drivers/usb/host/ehci-mx6.c                 | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/arch/arm/include/asm/mach-imx/module_fuse.h b/arch/arm/include/asm/mach-imx/module_fuse.h
index a46fc3f1f8e..6c92cb40d6d 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/drivers/i2c/mxc_i2c.c b/drivers/i2c/mxc_i2c.c
index 9a1599dcd91..86b9fb57c83 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/net/fec_mxc.c b/drivers/net/fec_mxc.c
index 006d27051eb..5cc35958c49 100644
--- a/drivers/net/fec_mxc.c
+++ b/drivers/net/fec_mxc.c
@@ -1125,7 +1125,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/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c
index 0a12db614ff..91633f013a5 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);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 105/171] Correct SPL uses of IMX_RDC

[Simon Glass]

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
 
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 106/171] Correct SPL uses of LMB

[Simon Glass]

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

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

 arch/arc/lib/bootm.c        | 2 +-
 arch/arm/lib/bootm.c        | 2 +-
 arch/m68k/lib/bootm.c       | 2 +-
 arch/microblaze/lib/bootm.c | 2 +-
 arch/powerpc/lib/bootm.c    | 2 +-
 arch/riscv/lib/bootm.c      | 2 +-
 arch/sandbox/lib/bootm.c    | 2 +-
 arch/x86/lib/bootm.c        | 2 +-
 boot/image-board.c          | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arc/lib/bootm.c b/arch/arc/lib/bootm.c
index 07b2c1540d0..2dd003445f8 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/lib/bootm.c b/arch/arm/lib/bootm.c
index e414ef82673..c56285738a2 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/m68k/lib/bootm.c b/arch/m68k/lib/bootm.c
index c1c9bdceb50..f18bed235d4 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/lib/bootm.c b/arch/microblaze/lib/bootm.c
index 4a5421497e5..930384f4015 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/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index ef1d5af8908..7a305456346 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 f5f8b4c7333..276677a5e2f 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 28f4a746fb6..dc8b8e46cb4 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/lib/bootm.c b/arch/x86/lib/bootm.c
index 04e475bdc24..873e2bc176f 100644
--- a/arch/x86/lib/bootm.c
+++ b/arch/x86/lib/bootm.c
@@ -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/boot/image-board.c b/boot/image-board.c
index e5d71a3d541..25b60ec30b3 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);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 107/171] Correct SPL uses of MICROBLAZE

[Simon Glass]

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);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 108/171] Correct SPL use of MIPS_CM

[Simon Glass]

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

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

 arch/mips/include/asm/cm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/include/asm/cm.h b/arch/mips/include/asm/cm.h
index 5cc8c09621d..c695ffc71f5 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);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 109/171] Correct SPL use of MMC_QUIRKS

[Simon Glass]

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);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 110/171] Correct SPL uses of MTD

[Simon Glass]

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

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

 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 2 +-
 board/st/common/stm32mp_dfu.c                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 4b75397b1cc..9c4ba407ba0 100644
--- a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
+++ b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
@@ -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/board/st/common/stm32mp_dfu.c b/board/st/common/stm32mp_dfu.c
index 19e9c3b2402..079ba15ddb1 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();
 
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 111/171] Correct SPL uses of MULTIPLEXER

[Simon Glass]

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.
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 112/171] Correct SPL uses of NEEDS_MANUAL_RELOC

[Simon Glass]

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

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

 common/board_r.c | 4 ++--
 common/event.c   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/board_r.c b/common/board_r.c
index 552b9899323..cbc140e6d8b 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 (CONFIG_IS_ENABLED(OF_EMBED) && IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC))
 		gd->fdt_blob += gd->reloc_off;
 
 #ifdef CONFIG_EFI_LOADER
@@ -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/event.c b/common/event.c
index c312556490e..164c95f8f52 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;
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 113/171] Correct SPL use of NETDEVICES

[Simon Glass]

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)
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 114/171] Correct SPL uses of NXP_FSPI

[Simon Glass]

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

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

 drivers/clk/imx/clk-imx8mm.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/imx/clk-imx8mm.c b/drivers/clk/imx/clk-imx8mm.c
index b5c253e4966..663b9a1bc7e 100644
--- a/drivers/clk/imx/clk-imx8mm.c
+++ b/drivers/clk/imx/clk-imx8mm.c
@@ -86,7 +86,7 @@ static const char *imx8mm_wdog_sels[] = {"clock-osc-24m", "sys_pll1_133m", "sys_
 static const char *imx8mm_usdhc3_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll1_800m", "sys_pll2_500m",
 					   "sys_pll3_out", "sys_pll1_266m", "audio_pll2_clk", "sys_pll1_100m", };
 
-#if CONFIG_IS_ENABLED(NXP_FSPI)
+#if IS_ENABLED(CONFIG_NXP_FSPI)
 static const char *imx8mm_qspi_sels[] = {"clock-osc-24m", "sys_pll1_400m", "sys_pll2_333m", "sys_pll2_500m",
 					   "audio_pll2_out", "sys_pll1_266m", "sys_pll3_out", "sys_pll1_100m", };
 #endif
@@ -355,7 +355,7 @@ static int imx8mm_clk_probe(struct udevice *dev)
 	       imx_clk_gate4("ecspi3_root_clk", "ecspi3", base + 0x4090, 0));
 #endif
 
-#if CONFIG_IS_ENABLED(NXP_FSPI)
+#if IS_ENABLED(CONFIG_NXP_FSPI)
 	clk_dm(IMX8MM_CLK_QSPI,
 	       imx8m_clk_composite("qspi", imx8mm_qspi_sels, base + 0xab80));
 	clk_dm(IMX8MM_CLK_QSPI_ROOT,
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 115/171] Correct SPL use of OCTEON_SERIAL_BOOTCMD

[Simon Glass]

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;
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 116/171] Correct SPL use of OCTEON_SERIAL_PCIE_CONSOLE

[Simon Glass]

This converts 1 usage of this option to the non-SPL form, since there is
no SPL_OCTEON_SERIAL_PCIE_CONSOLE 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 5adf4ba32c8..c7744e84706 100644
--- a/arch/mips/mach-octeon/cpu.c
+++ b/arch/mips/mach-octeon/cpu.c
@@ -448,7 +448,7 @@ 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 (IS_ENABLED(CONFIG_OCTEON_SERIAL_BOOTCMD))
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 117/171] Correct SPL uses of OF_BOARD

[Simon Glass]

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),
-- 
2.39.1.456.gfc5497dd1b-goog

Re: [PATCH 117/171] Correct SPL uses of OF_BOARD

[Matthias Brugger]

On 30/01/2023 16:15, Simon Glass wrote:
> 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/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),

For bcm283x:
Reviewed-by: Matthias Brugger <mbrugger@suse.com>

[PATCH 118/171] Correct SPL use of OF_EMBED

[Simon Glass]

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
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 119/171] Correct SPL use of PANEL

[Simon Glass]

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

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

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

diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c
index 8b01a1be112..7e60385bcfa 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);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 120/171] Correct SPL use of PARTITION_TYPE_GUID

[Simon Glass]

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);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 121/171] Correct SPL use of PCI_PNP

[Simon Glass]

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

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

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

diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 9343cfc62a9..a0c19987ab1 100644
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -1140,7 +1140,7 @@ static int pci_uclass_post_probe(struct udevice *bus)
 	if (ret)
 		return log_msg_ret("bind", ret);
 
-	if (CONFIG_IS_ENABLED(PCI_PNP) && ll_boot_init() &&
+	if (IS_ENABLED(CONFIG_PCI_PNP) && ll_boot_init() &&
 	    (!hose->skip_auto_config_until_reloc ||
 	     (gd->flags & GD_FLG_RELOC))) {
 		ret = pci_auto_config_devices(bus);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 122/171] Correct SPL uses of PG_WCOM_UBOOT_BOOTPACKAGE

[Simon Glass]

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
-- 
2.39.1.456.gfc5497dd1b-goog

RE: [PATCH 122/171] Correct SPL uses of PG_WCOM_UBOOT_BOOTPACKAGE

[Aleksandar Gerasimovski]

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>
---

Reviewed-by: Aleksandar Gerasimovski <Aleksandar.gerasimovski@hitachienergy.com>

Regards,
Aleksandar

 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
--
2.39.1.456.gfc5497dd1b-goog

[PATCH 123/171] Correct SPL uses of PG_WCOM_UBOOT_UPDATE

[Simon Glass]

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)
-- 
2.39.1.456.gfc5497dd1b-goog

RE: [PATCH 123/171] Correct SPL uses of PG_WCOM_UBOOT_UPDATE

[Aleksandar Gerasimovski]

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>
---
Reviewed-by: Aleksandar Gerasimovski <Aleksandar.gerasimovski@hitachienergy.com>

Regards,
Aleksandar

 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)
--
2.39.1.456.gfc5497dd1b-goog

[PATCH 124/171] Correct SPL use of PG_WCOM_UBOOT_UPDATE_SUPPORTED

[Simon Glass]

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) && \
-- 
2.39.1.456.gfc5497dd1b-goog

RE: [PATCH 124/171] Correct SPL use of PG_WCOM_UBOOT_UPDATE_SUPPORTED

[Aleksandar Gerasimovski]

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>
---

Reviewed-by: Aleksandar Gerasimovski <Aleksandar.gerasimovski@hitachienergy.com>

Regards,
Aleksandar

 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) && \
--
2.39.1.456.gfc5497dd1b-goog

[PATCH 125/171] Correct SPL use of PHY_CADENCE_SIERRA

[Simon Glass]

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
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 126/171] Correct SPL use of PHY_CADENCE_TORRENT

[Simon Glass]

This converts 1 usage of this option to the non-SPL form, since there is
no SPL_PHY_CADENCE_TORRENT 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 c247feb8262..a1cb6868c9e 100644
--- a/drivers/phy/cadence/Makefile
+++ b/drivers/phy/cadence/Makefile
@@ -1,2 +1,2 @@
 obj-$(CONFIG_PHY_CADENCE_SIERRA)	+= phy-cadence-sierra.o
-obj-$(CONFIG_$(SPL_)PHY_CADENCE_TORRENT) += phy-cadence-torrent.o
+obj-$(CONFIG_PHY_CADENCE_TORRENT) += phy-cadence-torrent.o
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 127/171] Correct SPL uses of PHY_FIXED

[Simon Glass]

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;
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 128/171] Correct SPL uses of PMIC_STPMIC1

[Simon Glass]

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

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

 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c b/arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.c
index 9c4ba407ba0..baa156acf9e 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;
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 129/171] Correct SPL use of QFW_PIO

[Simon Glass]

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",
 };
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 130/171] Correct SPL use of REGEX

[Simon Glass]

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

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

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

diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index bed15319934..d071ebfb9cc 100644
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -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;
 
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 131/171] Correct SPL use of RENESAS_SDHI

[Simon Glass]

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;
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 132/171] Correct SPL use of RESV_RAM

[Simon Glass]

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

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

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

diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c
index 13aafb5de76..9e4c84ad2f4 100644
--- a/board/traverse/ten64/ten64.c
+++ b/board/traverse/ten64/ten64.c
@@ -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];
 	}
 
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 133/171] Correct SPL uses of ROCKCHIP_EFUSE

[Simon Glass]

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)
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 134/171] Correct SPL uses of ROCKCHIP_OTP

[Simon Glass]

This converts 2 usages of this option to the non-SPL form, since there is
no SPL_ROCKCHIP_OTP 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 437c7cf896a..b350f18f114 100644
--- a/arch/arm/mach-rockchip/misc.c
+++ b/arch/arm/mach-rockchip/misc.c
@@ -60,7 +60,7 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset,
 			      const u32 cpuid_length,
 			      u8 *cpuid)
 {
-#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) || CONFIG_IS_ENABLED(ROCKCHIP_OTP)
+#if IS_ENABLED(CONFIG_ROCKCHIP_EFUSE) || IS_ENABLED(CONFIG_ROCKCHIP_OTP)
 	struct udevice *dev;
 	int ret;
 
@@ -68,7 +68,7 @@ int rockchip_cpuid_from_efuse(const u32 cpuid_offset,
 #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
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 135/171] Correct SPL use of SANDBOX

[Simon Glass]

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);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 136/171] Correct SPL uses of SANDBOX_CLK_CCF

[Simon Glass]

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

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

 drivers/clk/clk-divider.c    | 4 ++--
 drivers/clk/clk-gate.c       | 6 +++---
 drivers/clk/clk-mux.c        | 8 ++++----
 include/linux/clk-provider.h | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/drivers/clk/clk-divider.c b/drivers/clk/clk-divider.c
index 7e8e62feeee..6ab137a72be 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 aa40daf3d79..a8775c77dc2 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 b49946fbcd5..184d426d0b3 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/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 2d04882d053..b8acacd49ee 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
 };
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 137/171] Correct SPL uses of SAVE_PREV_BL_FDT_ADDR

[Simon Glass]

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
 
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 138/171] Correct SPL uses of SAVE_PREV_BL_INITRAMFS_START_ADDR

[Simon Glass]

This converts 2 usages of this option to the non-SPL form, since there is
no SPL_SAVE_PREV_BL_INITRAMFS_START_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 cd943eefe10..f7b23faf0d6 100644
--- a/arch/arm/lib/save_prev_bl_data.c
+++ b/arch/arm/lib/save_prev_bl_data.c
@@ -62,7 +62,7 @@ int save_prev_bl_data(void)
 
 	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/common/board_r.c b/common/board_r.c
index 56c50f43baf..df88a9dd63b 100644
--- a/common/board_r.c
+++ b/common/board_r.c
@@ -452,7 +452,7 @@ 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) || \
+	#if (IS_ENABLED(CONFIG_SAVE_PREV_BL_INITRAMFS_START_ADDR) || \
 						IS_ENABLED(CONFIG_SAVE_PREV_BL_FDT_ADDR))
 		save_prev_bl_data();
 	#endif
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 139/171] Correct SPL uses of SEC_FIRMWARE_ARMV8_PSCI

[Simon Glass]

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;
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 140/171] Correct SPL uses of SIFIVE_OTP

[Simon Glass]

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

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

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

diff --git a/board/sifive/unleashed/unleashed.c b/board/sifive/unleashed/unleashed.c
index f8aad862c6d..b6ab06a08fb 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;
 
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 141/171] Correct SPL use of SL28CPLD

[Simon Glass]

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;
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 142/171] Correct SPL use of SL28_SPL_LOADS_OPTEE_BL32

[Simon Glass]

This converts 1 usage of this option to the non-SPL form, since there is
no SPL_SL28_SPL_LOADS_OPTEE_BL32 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 257923685a5..e78a0d5dd3c 100644
--- a/board/kontron/sl28/sl28.c
+++ b/board/kontron/sl28/sl28.c
@@ -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);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 143/171] Correct SPL use of SPI_FLASH_BAR

[Simon Glass]

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
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 144/171] Correct SPL uses of SPI_FLASH_MACRONIX

[Simon Glass]

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

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

 drivers/mtd/spi/spi-nor-core.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/spi/spi-nor-core.c b/drivers/mtd/spi/spi-nor-core.c
index d410ae58953..3f97acdb18c 100644
--- a/drivers/mtd/spi/spi-nor-core.c
+++ b/drivers/mtd/spi/spi-nor-core.c
@@ -3645,7 +3645,7 @@ static struct spi_nor_fixups mt35xu512aba_fixups = {
 };
 #endif /* CONFIG_SPI_FLASH_MT35XU */
 
-#if CONFIG_IS_ENABLED(SPI_FLASH_MACRONIX)
+#if IS_ENABLED(CONFIG_SPI_FLASH_MACRONIX)
 /**
  * spi_nor_macronix_octal_dtr_enable() - Enable octal DTR on Macronix flashes.
  * @nor:	pointer to a 'struct spi_nor'
@@ -3904,7 +3904,7 @@ void spi_nor_set_fixups(struct spi_nor *nor)
 		nor->fixups = &mt35xu512aba_fixups;
 #endif
 
-#if CONFIG_IS_ENABLED(SPI_FLASH_MACRONIX)
+#if IS_ENABLED(CONFIG_SPI_FLASH_MACRONIX)
 	nor->fixups = &macronix_octal_fixups;
 #endif /* SPI_FLASH_MACRONIX */
 }
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 145/171] Correct SPL use of SPLASH_SOURCE

[Simon Glass]

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));
 
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 146/171] Correct SPL use of STM32MP15X_STM32IMAGE

[Simon Glass]

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

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

 arch/arm/mach-stm32mp/fdt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-stm32mp/fdt.c b/arch/arm/mach-stm32mp/fdt.c
index 218d9ef282a..c21c5c42fe1 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);
 	}
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 147/171] Correct SPL use of SUPPORT_EMMC_RPMB

[Simon Glass]

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
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 148/171] Correct SPL use of SYS_FSL_ERRATUM_A010539

[Simon Glass]

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

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

 arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c
index b0e86785337..12d31184ad9 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);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 149/171] Correct SPL uses of SYS_LONGHELP

[Simon Glass]

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"
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 150/171] Correct SPL use of SYS_MEM_RSVD_FOR_MMU

[Simon Glass]

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

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

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

diff --git a/board/xilinx/versal-net/board.c b/board/xilinx/versal-net/board.c
index 7ff2c620110..6724c7290f8 100644
--- a/board/xilinx/versal-net/board.c
+++ b/board/xilinx/versal-net/board.c
@@ -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();
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 151/171] Correct SPL uses of TARGET_LX2160ARDB

[Simon Glass]

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);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 152/171] Correct SPL use of TARGET_MX6UL_9X9_EVK

[Simon Glass]

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

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

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

diff --git a/include/configs/mx6ul_14x14_evk.h b/include/configs/mx6ul_14x14_evk.h
index 635ae78abcb..98b743b9364 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
 
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 153/171] Correct SPL use of TARGET_PG_WCOM_EXPU1

[Simon Glass]

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);
 
-- 
2.39.1.456.gfc5497dd1b-goog

RE: [PATCH 153/171] Correct SPL use of TARGET_PG_WCOM_EXPU1

[Aleksandar Gerasimovski]

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>
---

Reviewed-by: Aleksandar Gerasimovski <Aleksandar.gerasimovski@hitachienergy.com>

Regards,
Aleksandar

 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);

--
2.39.1.456.gfc5497dd1b-goog

[PATCH 154/171] Correct SPL use of TARGET_PG_WCOM_SELI8

[Simon Glass]

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);
 
-- 
2.39.1.456.gfc5497dd1b-goog

RE: [PATCH 154/171] Correct SPL use of TARGET_PG_WCOM_SELI8

[Aleksandar Gerasimovski]

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>
---

Reviewed-by: Aleksandar Gerasimovski <Aleksandar.gerasimovski@hitachienergy.com>

Regards,
Aleksandar

 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);

--
2.39.1.456.gfc5497dd1b-goog

[PATCH 155/171] Correct SPL use of TEE

[Simon Glass]

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),
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 156/171] Correct SPL uses of TEN64_CONTROLLER

[Simon Glass]

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

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

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

diff --git a/board/traverse/ten64/ten64.c b/board/traverse/ten64/ten64.c
index 9e4c84ad2f4..5dfb7165c0e 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)) {
@@ -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) {
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 157/171] Correct SPL use of TPM_RNG

[Simon Glass]

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);
 
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 158/171] Correct SPL use of UDP_FUNCTION_FASTBOOT

[Simon Glass]

This converts 1 usage of this option to the non-SPL form, since there is
no SPL_UDP_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 b94dbd54884..17c53bbe277 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;
 	}
-- 
2.39.1.456.gfc5497dd1b-goog

Re: [PATCH 158/171] Correct SPL use of UDP_FUNCTION_FASTBOOT

[Mattijs Korpershoek]

On Mon, Jan 30, 2023 at 08:15, Simon Glass <sjg@chromium.org> wrote:

> This converts 1 usage of this option to the non-SPL form, since there is
> no SPL_UDP_FUNCTION_FASTBOOT defined in Kconfig
>
> Signed-off-by: Simon Glass <sjg@chromium.org>

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

> ---
>
>  cmd/fastboot.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/cmd/fastboot.c b/cmd/fastboot.c
> index b94dbd54884..17c53bbe277 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;
>  	}
> -- 
> 2.39.1.456.gfc5497dd1b-goog

[PATCH 159/171] Correct SPL use of USB_DWC3_MESON_G12A

[Simon Glass]

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

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

 arch/arm/mach-meson/board-g12a.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-meson/board-g12a.c b/arch/arm/mach-meson/board-g12a.c
index 2e59eee8f79..d9f1acdef74 100644
--- a/arch/arm/mach-meson/board-g12a.c
+++ b/arch/arm/mach-meson/board-g12a.c
@@ -97,7 +97,7 @@ static struct mm_region g12a_mem_map[] = {
 
 struct mm_region *mem_map = g12a_mem_map;
 
-#if CONFIG_IS_ENABLED(USB_DWC3_MESON_G12A) && \
+#if IS_ENABLED(CONFIG_USB_DWC3_MESON_G12A) && \
 	CONFIG_IS_ENABLED(USB_GADGET_DWC2_OTG)
 static struct dwc2_plat_otg_data meson_g12a_dwc2_data;
 
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 160/171] Correct SPL uses of USB_DWC3_MESON_GXL

[Simon Glass]

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;
 
-- 
2.39.1.456.gfc5497dd1b-goog

Re: [PATCH 160/171] Correct SPL uses of USB_DWC3_MESON_GXL

[Neil Armstrong]

Hi,

On 30/01/2023 16:16, Simon Glass wrote:
> 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 code is getting removed in the last PR I sent at https://lore.kernel.org/all/ec3802ba-6e79-5370-e41e-cd2487cd618f@linaro.org/

[PATCH 161/171] Correct SPL use of USB_FUNCTION_FASTBOOT

[Simon Glass]

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;
 	}
-- 
2.39.1.456.gfc5497dd1b-goog

Re: [PATCH 161/171] Correct SPL use of USB_FUNCTION_FASTBOOT

[Mattijs Korpershoek]

On Mon, Jan 30, 2023 at 08:16, Simon Glass <sjg@chromium.org> wrote:

> 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>

Reviewed-by: Mattijs Korpershoek <mkorpershoek@baylibre.com>

> ---
>
>  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;
>  	}
> -- 
> 2.39.1.456.gfc5497dd1b-goog

[PATCH 162/171] Correct SPL uses of USB_GADGET_DWC2_OTG

[Simon Glass]

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)
-- 
2.39.1.456.gfc5497dd1b-goog

Re: [PATCH 162/171] Correct SPL uses of USB_GADGET_DWC2_OTG

[Neil Armstrong]

On 30/01/2023 16:16, Simon Glass wrote:
> 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)

Same as 160, this code is getting removed in This code is getting removed in the last PR I sent at https://lore.kernel.org/all/ec3802ba-6e79-5370-e41e-cd2487cd618f@linaro.org/

[PATCH 163/171] Correct SPL uses of USB_KEYBOARD

[Simon Glass]

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;
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 164/171] Correct SPL uses of USB_MUSB_HOST

[Simon Glass]

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

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

 drivers/phy/phy-ab8500-usb.c    | 2 +-
 drivers/usb/musb-new/omap2430.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/phy-ab8500-usb.c b/drivers/phy/phy-ab8500-usb.c
index 0e04595717b..3d3d48c9733 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/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c
index 42e7abddbc2..482dfdc6be6 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);
 
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 165/171] Correct SPL uses of VIDEO

[Simon Glass]

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;
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 166/171] Correct SPL use of VIDEO_ANSI

[Simon Glass]

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

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

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

diff --git a/cmd/cls.c b/cmd/cls.c
index 787c7edbee3..40a32eeab63 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 (IS_ENABLED(CONFIG_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))
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 167/171] Correct SPL use of VIDEO_BPP16

[Simon Glass]

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);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 168/171] Correct SPL use of VIDEO_BPP32

[Simon Glass]

This converts 1 usage of this option to the non-SPL form, since there is
no SPL_VIDEO_BPP32 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 f36970e0420..6aaacff10df 100644
--- a/drivers/video/video-uclass.c
+++ b/drivers/video/video-uclass.c
@@ -203,7 +203,7 @@ u32 video_index_to_colour(struct video_priv *priv, unsigned int idx)
 		}
 		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) |
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 169/171] Correct SPL use of WATCHDOG_AUTOSTART

[Simon Glass]

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;
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 170/171] Correct SPL uses of XEN_SERIAL

[Simon Glass]

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

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

 drivers/xen/events.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 532216fece3..2ebe20dbf26 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);
-- 
2.39.1.456.gfc5497dd1b-goog

[PATCH 171/171] Correct SPL uses of ZYNQMP_FIRMWARE

[Simon Glass]

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);
-- 
2.39.1.456.gfc5497dd1b-goog