diff options
author | Simon Glass <sjg@chromium.org> | 2017-08-29 14:15:46 -0600 |
---|---|---|
committer | Simon Glass <sjg@chromium.org> | 2017-09-15 05:24:39 -0600 |
commit | 93c94b889b3aa7e21e0f90f0c5a6dc7034b371aa (patch) | |
tree | 3ff27de14cfe84fac4a45247b72d57573aa7df4a /lib/libfdt/fdt_rw.c | |
parent | ae1c0a38c8b163d685121e3109161da7ac1caacd (diff) | |
download | u-boot-93c94b889b3aa7e21e0f90f0c5a6dc7034b371aa.tar.gz |
fdt: Sync libfdt up to upstream
Add upstream changes to U-Boot:
- new pylibfdt functions
- fdt_setprop_placeholder()
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'lib/libfdt/fdt_rw.c')
-rw-r--r-- | lib/libfdt/fdt_rw.c | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/lib/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c index 80a3212141..3dc775261f 100644 --- a/lib/libfdt/fdt_rw.c +++ b/lib/libfdt/fdt_rw.c @@ -228,8 +228,8 @@ int fdt_set_name(void *fdt, int nodeoffset, const char *name) return 0; } -int fdt_setprop(void *fdt, int nodeoffset, const char *name, - const void *val, int len) +int fdt_setprop_placeholder(void *fdt, int nodeoffset, const char *name, + int len, void **prop_data) { struct fdt_property *prop; int err; @@ -242,8 +242,22 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name, if (err) return err; + *prop_data = prop->data; + return 0; +} + +int fdt_setprop(void *fdt, int nodeoffset, const char *name, + const void *val, int len) +{ + void *prop_data; + int err; + + err = fdt_setprop_placeholder(fdt, nodeoffset, name, len, &prop_data); + if (err) + return err; + if (len) - memcpy(prop->data, val, len); + memcpy(prop_data, val, len); return 0; } |