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 ---
board/xilinx/versal-net/board.c | 2 +- board/xilinx/versal/board.c | 2 +- board/xilinx/zynq/board.c | 2 +- board/xilinx/zynqmp/zynqmp.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/board/xilinx/versal-net/board.c b/board/xilinx/versal-net/board.c index 5fb71107ddc..7ff2c620110 100644 --- 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 4cdc2ecd1d2..81e1b69905e 100644 --- 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 df4c4576723..9a59445b442 100644 --- 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 e3f70c4caf4..39da96bcfb0 100644 --- 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();