Commit ec340077 authored by Rob Herring's avatar Rob Herring

scripts/dtc: Update to upstream version v1.6.1-66-gabbd523bae6e

This adds the following commits from upstream:

abbd523bae6e pylibfdt: Work-around SWIG limitations with flexible arrays
a41509bea3e7 libfdt: Replace deprecated 0-length arrays with proper flexible arrays
2cd89f862cdb dtc: Warning rather than error on possible truncation of cell values
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Link: https://lore.kernel.org/all/20230203172430.474431-1-robh@kernel.org/Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 20f6d4f2
...@@ -404,9 +404,14 @@ arrayprefix: ...@@ -404,9 +404,14 @@ arrayprefix:
* within the mask to one (i.e. | in the * within the mask to one (i.e. | in the
* mask), all bits are one. * mask), all bits are one.
*/ */
if (($2 > mask) && (($2 | mask) != -1ULL)) if (($2 > mask) && (($2 | mask) != -1ULL)) {
ERROR(&@2, "Value out of range for" char *loc = srcpos_string(&@2);
" %d-bit array element", $1.bits); fprintf(stderr,
"WARNING: %s: Value 0x%016" PRIx64
" truncated to 0x%0*" PRIx64 "\n",
loc, $2, $1.bits / 4, ($2 & mask));
free(loc);
}
} }
$$.data = data_append_integer($1.data, $2, $1.bits); $$.data = data_append_integer($1.data, $2, $1.bits);
......
...@@ -35,14 +35,14 @@ struct fdt_reserve_entry { ...@@ -35,14 +35,14 @@ struct fdt_reserve_entry {
struct fdt_node_header { struct fdt_node_header {
fdt32_t tag; fdt32_t tag;
char name[0]; char name[];
}; };
struct fdt_property { struct fdt_property {
fdt32_t tag; fdt32_t tag;
fdt32_t len; fdt32_t len;
fdt32_t nameoff; fdt32_t nameoff;
char data[0]; char data[];
}; };
#endif /* !__ASSEMBLY */ #endif /* !__ASSEMBLY */
......
#define DTC_VERSION "DTC 1.6.1-g55778a03" #define DTC_VERSION "DTC 1.6.1-gabbd523b"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment