qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support setting FDT properties with optional values. 

Fix a bug found and documented by Bartlomiej Sieka where the optional
value on "fdt set <path> <prop> [<val>]" wasn't optional.

=> fdt mknode / testnode
=> fdt print /testnode
testnode {
};
=> fdt set /testnode testprop
=> fdt print /testnode
testnode {
        testprop;
};

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
This commit is contained in:
Gerald Van Baren 2008-01-05 14:52:04 -05:00
parent 22fb2246df
commit ea6d8be153
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/cmd_fdt.c
View File

@ -184,23 +184,28 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
} else if (argv[1][0] == 's') { } else if (argv[1][0] == 's') {
char *pathp; /* path */ char *pathp; /* path */
char *prop; /* property */ char *prop; /* property */
char *newval; /* value from the user (as a string) */
int nodeoffset; /* node offset from libfdt */ int nodeoffset; /* node offset from libfdt */
static char data[SCRATCHPAD]; /* storage for the property */ static char data[SCRATCHPAD]; /* storage for the property */
int len; /* new length of the property */ int len; /* new length of the property */
int ret; /* return value */ int ret; /* return value */
/* /*
* Parameters: Node path, property, value. * Parameters: Node path, property, optional value.
*/ */
if (argc < 5) { if (argc < 4) {
printf ("Usage:\n%s\n", cmdtp->usage); printf ("Usage:\n%s\n", cmdtp->usage);
return 1; return 1;
} }
pathp = argv[2]; pathp = argv[2];
prop = argv[3]; prop = argv[3];
newval = argv[4]; if (argc == 4) {
len = 0;
} else {
ret = fdt_parse_prop(pathp, prop, argv[4], data, &len);
if (ret != 0)
return ret;
}
nodeoffset = fdt_path_offset (fdt, pathp); nodeoffset = fdt_path_offset (fdt, pathp);
if (nodeoffset < 0) { if (nodeoffset < 0) {
@ -211,9 +216,6 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[])
fdt_strerror(nodeoffset)); fdt_strerror(nodeoffset));
return 1; return 1;
} }
ret = fdt_parse_prop(pathp, prop, newval, data, &len);
if (ret != 0)
return ret;
ret = fdt_setprop(fdt, nodeoffset, prop, data, len); ret = fdt_setprop(fdt, nodeoffset, prop, data, len);
if (ret < 0) { if (ret < 0) {