aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/dtc/libfdt/fdt_rw.c
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2020-06-29 12:15:13 -0600
committerRob Herring <robh@kernel.org>2020-06-30 08:42:26 -0600
commit3eb619b2f7d8a98a86a48de8dfa613a205c0eaab (patch)
tree4cc3a0316d09b53d8497c94bd6c0bcb96d7e8e07 /scripts/dtc/libfdt/fdt_rw.c
parentdoc: devicetree: bindings: fix spelling mistake (diff)
downloadlinux-dev-3eb619b2f7d8a98a86a48de8dfa613a205c0eaab.tar.xz
linux-dev-3eb619b2f7d8a98a86a48de8dfa613a205c0eaab.zip
scripts/dtc: Update to upstream version v1.6.0-11-g9d7888cbf19c
Sync with upstream dtc primarily to pickup the I2C bus check fixes. The interrupt_provider check is noisy, so turn it off for now. This adds the following commits from upstream: 9d7888cbf19c dtc: Consider one-character strings as strings 8259d59f59de checks: Improve i2c reg property checking fdabcf2980a4 checks: Remove warning for I2C_OWN_SLAVE_ADDRESS 2478b1652c8d libfdt: add extern "C" for C++ f68bfc2668b2 libfdt: trivial typo fix 7be250b4d059 libfdt: Correct condition for reordering blocks 81e0919a3e21 checks: Add interrupt provider test 85e5d839847a Makefile: when building libfdt only, do not add unneeded deps b28464a550c5 Fix some potential unaligned accesses in dtc Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'scripts/dtc/libfdt/fdt_rw.c')
-rw-r--r--scripts/dtc/libfdt/fdt_rw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/dtc/libfdt/fdt_rw.c b/scripts/dtc/libfdt/fdt_rw.c
index 524b520c8486..93e4a2b56348 100644
--- a/scripts/dtc/libfdt/fdt_rw.c
+++ b/scripts/dtc/libfdt/fdt_rw.c
@@ -436,7 +436,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
return struct_size;
}
- if (can_assume(LIBFDT_ORDER) |
+ if (can_assume(LIBFDT_ORDER) ||
!fdt_blocks_misordered_(fdt, mem_rsv_size, struct_size)) {
/* no further work necessary */
err = fdt_move(fdt, buf, bufsize);