]> git.baikalelectronics.ru Git - uboot.git/commitdiff
Correct SPL uses of ZYNQMP_FIRMWARE
authorSimon Glass <sjg@chromium.org>
Sun, 5 Feb 2023 22:44:33 +0000 (15:44 -0700)
committerTom Rini <trini@konsulko.com>
Fri, 10 Feb 2023 12:41:41 +0000 (07:41 -0500)
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
drivers/spi/cadence_qspi.c

index e0d5e6b9e6937816d51ac8a41afa6f3dfe00f8e1..434c6038f3b29240289891006fcc1b92c1cac714 100644 (file)
@@ -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,
index 328dfb0a38800ed0e34c6c1d74326463c05ac08d..a42493592fe7de1d42c1f5d715f07e0e21e03d5c 100644 (file)
@@ -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);