| Message ID | 20220705171350.1765454-3-andre.przywara@arm.com |
|---|---|
| State | Accepted |
| Delegated to: | Simon Glass |
| Headers | show |
| Series | fdt: introduce "apply-all" command | expand |
On Tue, 5 Jul 2022 at 11:14, Andre Przywara <andre.przywara@arm.com> wrote: > > At the moment every subcommand of "fdt", except "addr" itself, requires > the DT address to be set first. We explicitly check for that before even > comparing against the subcommands' string. > This early bailout also affects the "move" subcommand, even though that > does not require or rely on a previous call to "fdt addr". In fact it > even sets the FDT address to the target of the move command, so is a > perfect beginning for a sequence of fdt commands. > > Move the check for a previously set FDT address to after we handle the > "move" command also, so we don't need a dummy call to "fdt addr" first, > before being able to move the devicetree. > > This skips one pointless "fdt addr" call in scripts which aim to alter > the control DT, but need to copy it to a safe location first (for > instance to $fdt_addr_r). > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > cmd/fdt.c | 28 +++++++++++++++++----------- > 1 file changed, 17 insertions(+), 11 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Tue, 5 Jul 2022 at 11:14, Andre Przywara <andre.przywara@arm.com> wrote: > > At the moment every subcommand of "fdt", except "addr" itself, requires > the DT address to be set first. We explicitly check for that before even > comparing against the subcommands' string. > This early bailout also affects the "move" subcommand, even though that > does not require or rely on a previous call to "fdt addr". In fact it > even sets the FDT address to the target of the move command, so is a > perfect beginning for a sequence of fdt commands. > > Move the check for a previously set FDT address to after we handle the > "move" command also, so we don't need a dummy call to "fdt addr" first, > before being able to move the devicetree. > > This skips one pointless "fdt addr" call in scripts which aim to alter > the control DT, but need to copy it to a safe location first (for > instance to $fdt_addr_r). > > Signed-off-by: Andre Przywara <andre.przywara@arm.com> > --- > cmd/fdt.c | 28 +++++++++++++++++----------- > 1 file changed, 17 insertions(+), 11 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org> Applied to u-boot-dm, thanks!
diff --git a/cmd/fdt.c b/cmd/fdt.c index abdc553b2b..d6878c96f1 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -188,19 +188,11 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) } return CMD_RET_SUCCESS; - } - - if (!working_fdt) { - puts("No FDT memory address configured. Please configure\n" - "the FDT address via \"fdt addr <address>\" command.\n" - "Aborting!\n"); - return CMD_RET_FAILURE; - } /* * Move the working_fdt */ - if (strncmp(argv[1], "mo", 2) == 0) { + } else if (strncmp(argv[1], "mo", 2) == 0) { struct fdt_header *newaddr; int len; int err; @@ -243,9 +235,20 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) return 1; } set_working_fdt_addr(map_to_sysmem(newaddr)); + + return CMD_RET_SUCCESS; + } + + if (!working_fdt) { + puts("No FDT memory address configured. Please configure\n" + "the FDT address via \"fdt addr <address>\" command.\n" + "Aborting!\n"); + return CMD_RET_FAILURE; + } + #ifdef CONFIG_OF_SYSTEM_SETUP /* Call the board-specific fixup routine */ - } else if (strncmp(argv[1], "sys", 3) == 0) { + if (strncmp(argv[1], "sys", 3) == 0) { int err = ft_system_setup(working_fdt, gd->bd); if (err) { @@ -253,11 +256,14 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) fdt_strerror(err)); return CMD_RET_FAILURE; } + + return CMD_RET_SUCCESS; + } #endif /* * Make a new node */ - } else if (strncmp(argv[1], "mk", 2) == 0) { + if (strncmp(argv[1], "mk", 2) == 0) { char *pathp; /* path */ char *nodep; /* new node to add */ int nodeoffset; /* node offset from libfdt */
At the moment every subcommand of "fdt", except "addr" itself, requires the DT address to be set first. We explicitly check for that before even comparing against the subcommands' string. This early bailout also affects the "move" subcommand, even though that does not require or rely on a previous call to "fdt addr". In fact it even sets the FDT address to the target of the move command, so is a perfect beginning for a sequence of fdt commands. Move the check for a previously set FDT address to after we handle the "move" command also, so we don't need a dummy call to "fdt addr" first, before being able to move the devicetree. This skips one pointless "fdt addr" call in scripts which aim to alter the control DT, but need to copy it to a safe location first (for instance to $fdt_addr_r). Signed-off-by: Andre Przywara <andre.przywara@arm.com> --- cmd/fdt.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-)