diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2019-05-10 14:46:26 +1000 |
|---|---|---|
| committer | Stewart Smith <stewart@linux.ibm.com> | 2019-05-20 14:20:29 +1000 |
| commit | bc0a30f0bc58ef1406e595d101b70c067b80ea53 (patch) | |
| tree | 080b45157ce100f52236ebd860ccfa286b585a99 /core | |
| parent | 27d1ef2ebabb07a1958b94049cac3d90a101c3d5 (diff) | |
| download | skiboot-bc0a30f0bc58ef1406e595d101b70c067b80ea53.zip skiboot-bc0a30f0bc58ef1406e595d101b70c067b80ea53.tar.gz skiboot-bc0a30f0bc58ef1406e595d101b70c067b80ea53.tar.bz2 | |
libfdt: upgrade to upstream dtc.git 243176c
Upgrade libfdt/ to github.com/dgibson/dtc.git 243176c ("Fix bogus
error on rebuild")
This copies dtc/libfdt/ to skiboot/libfdt/, with the only change in
that directory being the addition of README.skiboot and Makefile.inc.
This adds about 14kB text, 2.5kB compressed xz. This could be reduced
or mostly eliminated by cutting out fdt version checks and unused
code, but tracking upstream is a bigger benefit at the moment.
This loses commits:
14ed2b842f61 ("libfdt: add basic sanity check to fdt_open_into")
bc7bb3d12bc1 ("sparse: fix declaration of fdt_strerror")
As well as some prehistoric similar kinds of things, which is the
punishment for us not being good downstream citizens and sending
things upstream! Syncing to upstream will make that effort simpler
in future.
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Stewart Smith <stewart@linux.ibm.com>
Diffstat (limited to 'core')
| -rw-r--r-- | core/device.c | 5 | ||||
| -rw-r--r-- | core/test/stubs.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/core/device.c b/core/device.c index 6364a60..251550e 100644 --- a/core/device.c +++ b/core/device.c @@ -14,6 +14,7 @@ * limitations under the License. */ +#include <stdarg.h> #include <device.h> #include <stdlib.h> #include <skiboot.h> @@ -853,7 +854,7 @@ int dt_expand_node(struct dt_node *node, const void *fdt, int fdt_node) uint32_t tag; if (((err = fdt_check_header(fdt)) != 0) - || ((err = _fdt_check_node_offset(fdt, fdt_node)) < 0)) { + || ((err = fdt_check_node_offset_(fdt, fdt_node)) < 0)) { prerror("FDT: Error %d parsing node 0x%x\n", err, fdt_node); return -1; } @@ -865,7 +866,7 @@ int dt_expand_node(struct dt_node *node, const void *fdt, int fdt_node) tag = fdt_next_tag(fdt, offset, &nextoffset); switch (tag) { case FDT_PROP: - prop = _fdt_offset_ptr(fdt, offset); + prop = fdt_offset_ptr_(fdt, offset); name = fdt_string(fdt, fdt32_to_cpu(prop->nameoff)); dt_add_property(node, name, prop->data, fdt32_to_cpu(prop->len)); diff --git a/core/test/stubs.c b/core/test/stubs.c index 3aa1b86..e0f9829 100644 --- a/core/test/stubs.c +++ b/core/test/stubs.c @@ -99,7 +99,7 @@ STUB(fdt_add_reservemap_entry); STUB(fdt_finish_reservemap); STUB(fdt_strerror); STUB(fdt_check_header); -STUB(_fdt_check_node_offset); +STUB(fdt_check_node_offset_); STUB(fdt_next_tag); STUB(fdt_string); STUB(fdt_get_name); |