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 5fb71107ddceeed6d8b2412b811d7e23882f1ad3..7ff2c6201101b53102545e2d6a142b03d3b774a6 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 4cdc2ecd1d2390f8aabd5ad52be122d8ef17696e..81e1b69905e97eeeeba75f03636e55dc5af97ebb 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 df4c457672389e06fec13b7352a4753f44ffc83b..9a59445b442951785c3887cf0bbb6d4f9eb3ee4f 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 e3f70c4caf4a11ee7e0e3af93581c85be31dfd1e..39da96bcfb08bbaaaf358c607df2cb0dcec7fea9 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();