diff options
| author | Simon Glass <sjg@chromium.org> | 2021-08-07 07:24:01 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2021-09-25 09:46:15 -0600 |
| commit | 7de8bd03c37af6120cf5bba9bf1adb492ed56868 (patch) | |
| tree | 03d977384b888feedf77e0d274f7682d732d6be9 /common/cli.c | |
| parent | bb38d77ca779cc8bdad3d4ceb6cecc687f4987c2 (diff) | |
| download | u-boot-7de8bd03c37af6120cf5bba9bf1adb492ed56868.zip u-boot-7de8bd03c37af6120cf5bba9bf1adb492ed56868.tar.gz u-boot-7de8bd03c37af6120cf5bba9bf1adb492ed56868.tar.bz2 | |
treewide: fdt: Move fdt_get_config_... to ofnode_conf_read...
The current API is outdated as it requires a devicetree pointer.
Move these functions to use the ofnode API and update this globally. Add
some tests while we are here.
Correct the call in exynos_dsim_config_parse_dt() which is obviously
wrong.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/cli.c')
| -rw-r--r-- | common/cli.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/common/cli.c b/common/cli.c index 048eacb..d86046a 100644 --- a/common/cli.c +++ b/common/cli.c @@ -19,8 +19,7 @@ #include <hang.h> #include <malloc.h> #include <asm/global_data.h> - -DECLARE_GLOBAL_DATA_PTR; +#include <dm/ofnode.h> #ifdef CONFIG_CMDLINE /* @@ -157,7 +156,7 @@ int do_run(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) bool cli_process_fdt(const char **cmdp) { /* Allow the fdt to override the boot command */ - char *env = fdtdec_get_config_string(gd->fdt_blob, "bootcmd"); + const char *env = ofnode_conf_read_str("bootcmd"); if (env) *cmdp = env; /* @@ -165,7 +164,7 @@ bool cli_process_fdt(const char **cmdp) * Always use 'env' in this case, since bootsecure requres that the * bootcmd was specified in the FDT too. */ - return fdtdec_get_config_int(gd->fdt_blob, "bootsecure", 0) != 0; + return ofnode_conf_read_int("bootsecure", 0); } /* |