diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2020-07-28 13:45:47 +0300 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2020-08-20 10:49:20 +0300 |
| commit | 62b96262b6dad1000b1ed2fec8664c2757585061 (patch) | |
| tree | b42024e0712e75a580fb07005e4acd79213875fa /board | |
| parent | d5c42ec31b004218666b60ab990c1b56d5b09050 (diff) | |
| download | u-boot-62b96262b6dad1000b1ed2fec8664c2757585061.tar.xz | |
xilinx: Add support for ENV_VARS_UBOOT_RUNTIME_CONFIG
Start to use ENV_VARS_UBOOT_RUNTIME_CONFIG to enable/disable updating
variables with run time information.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/xilinx/versal/board.c | 3 | ||||
| -rw-r--r-- | board/xilinx/zynq/board.c | 9 | ||||
| -rw-r--r-- | board/xilinx/zynqmp/zynqmp.c | 3 |
3 files changed, 15 insertions, 0 deletions
diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c index 3dc7044b21..a5ca4ca874 100644 --- a/board/xilinx/versal/board.c +++ b/board/xilinx/versal/board.c @@ -116,6 +116,9 @@ int board_late_init(void) return 0; } + if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + return 0; + bootmode = versal_get_bootmode(); puts("Bootmode: "); diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 2164eac8d5..7ac069aaaf 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -6,6 +6,7 @@ #include <common.h> #include <init.h> +#include <log.h> #include <dm/uclass.h> #include <env.h> #include <fdtdec.h> @@ -33,6 +34,14 @@ int board_late_init(void) char *new_targets; char *env_targets; + if (!(gd->flags & GD_FLG_ENV_DEFAULT)) { + debug("Saved variables - Skipping\n"); + return 0; + } + + if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + return 0; + switch ((zynq_slcr_get_boot_mode()) & ZYNQ_BM_MASK) { case ZYNQ_BM_QSPI: mode = "qspi"; diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index 2a430a9e46..b4e7301d50 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -568,6 +568,9 @@ int board_late_init(void) return 0; } + if (!CONFIG_IS_ENABLED(ENV_VARS_UBOOT_RUNTIME_CONFIG)) + return 0; + ret = set_fdtfile(); if (ret) return ret; |