Correct SPL uses of ENV_VARS_UBOOT_RUNTIME_CONFIG

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

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

diff --git a/board/xilinx/versal-net/board.c b/board/xilinx/versal-net/board.c
index 5fb7110..7ff2c62 100644 (file)
--- a/board/xilinx/versal-net/board.c
+++ b/board/xilinx/versal-net/board.c
@@ -172,7 +172,7 @@ int board_late_init(void)
                return 0;
        }
 
-       if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG))
+       if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG))
                return 0;
 
        return board_late_init_xilinx();

diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index 4cdc2ec..81e1b69 100644 (file)
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -142,7 +142,7 @@ int board_late_init(void)
                return 0;
        }
 
-       if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG))
+       if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG))
                return 0;
 
        bootmode = versal_get_bootmode();

diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c
index df4c457..9a59445 100644 (file)
--- a/board/xilinx/zynq/board.c
+++ b/board/xilinx/zynq/board.c
@@ -55,7 +55,7 @@ int board_late_init(void)
                return 0;
        }
 
-       if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG))
+       if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG))
                return 0;
 
        switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) {

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index e3f70c4..39da96b 100644 (file)
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -405,7 +405,7 @@ int board_late_init(void)
                return 0;
        }
 
-       if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG))
+       if (!IS_ENABLED(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG))
                return 0;
 
        ret = set_fdtfile();