diff options
author | Tom Rini <trini@konsulko.com> | 2015-06-05 12:14:01 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2015-06-05 12:14:01 -0400 |
commit | f1737152c01734749c3694d30e1aa86ab28f374e (patch) | |
tree | f8c0cd6cf17ddfdd2410e7528a27f3c8e3c17877 /common | |
parent | d85cd291331b07df57fd4ada84d2c7b9b76ac1b8 (diff) | |
parent | 3c4c142e5deed2a9362e65e45372044652ac57b5 (diff) |
Merge git://git.denx.de/u-boot-fdt
Diffstat (limited to 'common')
-rw-r--r-- | common/fdt_support.c | 25 | ||||
-rw-r--r-- | common/image-fdt.c | 4 |
2 files changed, 29 insertions, 0 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index 9e50148462..10648b5a4a 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -194,6 +194,31 @@ static inline int fdt_setprop_uxx(void *fdt, int nodeoffset, const char *name, return fdt_setprop_u32(fdt, nodeoffset, name, (uint32_t)val); } +int fdt_root(void *fdt) +{ + char *serial; + int err; + + err = fdt_check_header(fdt); + if (err < 0) { + printf("fdt_root: %s\n", fdt_strerror(err)); + return err; + } + + serial = getenv("serial#"); + if (serial) { + err = fdt_setprop(fdt, 0, "serial-number", serial, + strlen(serial) + 1); + + if (err < 0) { + printf("WARNING: could not set serial-number %s.\n", + fdt_strerror(err)); + return err; + } + } + + return 0; +} int fdt_initrd(void *fdt, ulong initrd_start, ulong initrd_end) { diff --git a/common/image-fdt.c b/common/image-fdt.c index 7e2da7b3b7..80e3e63805 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -471,6 +471,10 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, int ret = -EPERM; int fdt_ret; + if (fdt_root(blob) < 0) { + printf("ERROR: root node setup failed\n"); + goto err; + } if (fdt_chosen(blob) < 0) { printf("ERROR: /chosen node create failed\n"); goto err; |