mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-25 06:00:43 +00:00
Improve fdt move length handling.
Make the length parameter optional: if not specified, do the move using the current size unchanged. Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
This commit is contained in:
parent
bb930e76fe
commit
6be07cc1ca
1 changed files with 15 additions and 6 deletions
|
@ -115,7 +115,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||||
int len;
|
int len;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
if (argc != 5) {
|
if (argc < 4) {
|
||||||
printf ("Usage:\n%s\n", cmdtp->usage);
|
printf ("Usage:\n%s\n", cmdtp->usage);
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -129,11 +129,20 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
|
||||||
}
|
}
|
||||||
|
|
||||||
newaddr = (struct fdt_header *)simple_strtoul(argv[3], NULL, 16);
|
newaddr = (struct fdt_header *)simple_strtoul(argv[3], NULL, 16);
|
||||||
len = simple_strtoul(argv[4], NULL, 16);
|
|
||||||
if (len < fdt_totalsize(fdt)) {
|
/*
|
||||||
printf ("New length %d < existing length %d, aborting.\n",
|
* If the user specifies a length, use that. Otherwise use the
|
||||||
len, fdt_totalsize(fdt));
|
* current length.
|
||||||
return 1;
|
*/
|
||||||
|
if (argc <= 4) {
|
||||||
|
len = fdt_totalsize(fdt);
|
||||||
|
} else {
|
||||||
|
len = simple_strtoul(argv[4], NULL, 16);
|
||||||
|
if (len < fdt_totalsize(fdt)) {
|
||||||
|
printf ("New length 0x%X < existing length 0x%X, aborting.\n",
|
||||||
|
len, fdt_totalsize(fdt));
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue