[PATCH v2 169/169] 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 <s...@chromium.org>
---

Changes in v2:
- Rebase to previous series
- Drop patch to add a Kconfig for SPL_EFI_LOADER et al
- Drop patch to add a Kconfig for SPL_GENERATE_ACPI_TABLE

 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.519.gcb327c4b5f-goog