diff options
author | gonzo <gonzo@FreeBSD.org> | 2017-05-09 00:29:29 +0000 |
---|---|---|
committer | gonzo <gonzo@FreeBSD.org> | 2017-05-09 00:29:29 +0000 |
commit | 3781416358fe182f8fbe4a41e9acaeb476998fea (patch) | |
tree | 490355c8721675545529efd10d0974216c15d500 | |
parent | 43119403e36b05aeacb71b8adf8d1868d2144cd6 (diff) | |
download | FreeBSD-src-3781416358fe182f8fbe4a41e9acaeb476998fea.zip FreeBSD-src-3781416358fe182f8fbe4a41e9acaeb476998fea.tar.gz |
MFC r315019:
[loader][fdt] Fix applying overlays without __local_fixups__ node
Do not return error if __local_fixups__ node is missing in DTB overlay
because local fixup data is optional.
Reported by: Manuel Stuhn
-rw-r--r-- | sys/boot/fdt/fdt_overlay.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/sys/boot/fdt/fdt_overlay.c b/sys/boot/fdt/fdt_overlay.c index 0d9b367..9f77e86 100644 --- a/sys/boot/fdt/fdt_overlay.c +++ b/sys/boot/fdt/fdt_overlay.c @@ -358,21 +358,26 @@ static int fdt_overlay_do_local_fixups(void *main_fdtp, void *overlay_fdtp) { int overlay_local_fixups_o; - int len; + int len, rv; const char *fixups; uint32_t phandle_offset; overlay_local_fixups_o = fdt_path_offset(overlay_fdtp, "/__local_fixups__"); - if (overlay_local_fixups_o < 0) - return (-1); + if (overlay_local_fixups_o < 0) { + /* If not local fixups - do nothing */ + if (overlay_local_fixups_o == -FDT_ERR_NOTFOUND) + return (0); + return (overlay_local_fixups_o); + } phandle_offset = fdt_max_phandle(main_fdtp); fdt_increase_phandles(overlay_fdtp, phandle_offset); fixups = fdt_getprop_w(overlay_fdtp, overlay_local_fixups_o, "fixup", &len); if (fixups) { - if (fdt_do_local_fixup(overlay_fdtp, fixups, len, phandle_offset) < 0) - return (-1); + rv = fdt_do_local_fixup(overlay_fdtp, fixups, len, phandle_offset); + if (rv < 0) + return (rv); } return (0); |