minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-13 22:16:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

fdt: Allow fdt command to check and update control FDT

Browse Source 
There is an existing fdt command to deal with the working FDT. Enhance this
to support the control FDT also (CONFIG_OF_CONTROL).

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2013-04-20 08:42:44 +00:00 committed by Tom Rini
parent 76b8f79c29
commit 4b5786550d
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
common/cmd_fdt.c
View File

@ -100,38 +100,59 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
*/ */
if (argv[1][0] == 'a') { if (argv[1][0] == 'a') {
unsigned long addr; unsigned long addr;
int control = 0;
struct fdt_header *blob;
/* /*
* Set the address [and length] of the fdt. * Set the address [and length] of the fdt.
*/ */
if (argc == 2) { argc -= 2;
if (!fdt_valid(&working_fdt)) argv += 2;
/* Temporary #ifdef - some archs don't have fdt_blob yet */
#ifdef CONFIG_OF_CONTROL
if (argc && !strcmp(*argv, "-c")) {
control = 1;
argc--;
argv++;
}
#endif
if (argc == 0) {
if (control)
blob = (struct fdt_header *)gd->fdt_blob;
else
blob = working_fdt;
if (!blob || !fdt_valid(&blob))
return 1; return 1;
printf("The address of the fdt is %p\n", working_fdt); printf("The address of the fdt is %#08lx\n",
control ? (ulong)blob :
getenv_hex("fdtaddr", 0));
return 0; return 0;
} }
addr = simple_strtoul(argv[2], NULL, 16); addr = simple_strtoul(argv[0], NULL, 16);
set_working_fdt_addr((void *)addr); blob = (struct fdt_header *)addr;
if (!fdt_valid(&blob))
if (!fdt_valid(&working_fdt))
return 1; return 1;
if (control)
gd->fdt_blob = blob;
else
set_working_fdt_addr((void *)addr);
if (argc >= 4) { if (argc >= 2) {
int len; int len;
int err; int err;
/* /*
* Optional new length * Optional new length
*/ */
len = simple_strtoul(argv[3], NULL, 16); len = simple_strtoul(argv[1], NULL, 16);
if (len < fdt_totalsize(working_fdt)) { if (len < fdt_totalsize(blob)) {
printf ("New length %d < existing length %d, " printf ("New length %d < existing length %d, "
"ignoring.\n", "ignoring.\n",
len, fdt_totalsize(working_fdt)); len, fdt_totalsize(blob));
} else { } else {
/* /*
* Open in place with a new length. * Open in place with a new length.
*/ */
err = fdt_open_into(working_fdt, working_fdt, len); err = fdt_open_into(blob, blob, len);
if (err != 0) { if (err != 0) {
printf ("libfdt fdt_open_into(): %s\n", printf ("libfdt fdt_open_into(): %s\n",
fdt_strerror(err)); fdt_strerror(err));
@ -960,7 +981,7 @@ static int fdt_print(const char *pathp, char *prop, int depth)
/********************************************************************/ /********************************************************************/
#ifdef CONFIG_SYS_LONGHELP #ifdef CONFIG_SYS_LONGHELP
static char fdt_help_text[] = static char fdt_help_text[] =
"addr <addr> [<length>] - Set the fdt location to <addr>\n" "addr [-c] <addr> [<length>] - Set the [control] fdt location to <addr>\n"
#ifdef CONFIG_OF_BOARD_SETUP #ifdef CONFIG_OF_BOARD_SETUP
"fdt boardsetup - Do board-specific set up\n" "fdt boardsetup - Do board-specific set up\n"
#endif #endif