diff options
| author | Breno Leitao <breno.leitao@gmail.com> | 2017-03-27 20:00:41 +0000 |
|---|---|---|
| committer | William Pitcock <nenolod@dereferenced.org> | 2017-03-28 05:39:17 +0000 |
| commit | feac8738a6d320e3f3abfc163bc860ad1575ba37 (patch) | |
| tree | 830fb8a6a5eca6eb570fbe2d972939635b20812c /main/dtc/use-tx-as-the-type-specifier-instead-of-zx.patch | |
| parent | 495054ea63175c24594a681043a16da07c08bbd2 (diff) | |
| download | aports-feac8738a6d320e3f3abfc163bc860ad1575ba37.tar.bz2 aports-feac8738a6d320e3f3abfc163bc860ad1575ba37.tar.xz | |
main/dtc: Bump to version 1.4.4
Upgrade dtc package to version 1.4.4 and rebasing the patch to
fit this new version.
Diffstat (limited to 'main/dtc/use-tx-as-the-type-specifier-instead-of-zx.patch')
| -rw-r--r-- | main/dtc/use-tx-as-the-type-specifier-instead-of-zx.patch | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/main/dtc/use-tx-as-the-type-specifier-instead-of-zx.patch b/main/dtc/use-tx-as-the-type-specifier-instead-of-zx.patch index 9c31575bbc..25349444e8 100644 --- a/main/dtc/use-tx-as-the-type-specifier-instead-of-zx.patch +++ b/main/dtc/use-tx-as-the-type-specifier-instead-of-zx.patch @@ -7,15 +7,14 @@ A couple of printf() commands use "zx" as a type specifier for printing a difference of 2 pointers. "z" means a size_t, but using "t" which is ptrdiff_t is correct. The issue was found on s390 (32-bit) where size_t is defined as "unsigned long" as opposed to the usual "unsigned int". ---- - fdtdump.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) +Rebased-by: Breno Leitao <breno.leitao@gmail.com> +--- diff --git a/fdtdump.c b/fdtdump.c -index 723770d..c5811f0 100644 +index 4eaade9..4dcac19 100644 --- a/fdtdump.c +++ b/fdtdump.c -@@ -95,7 +95,7 @@ static void dump_blob(void *blob, bool debug) +@@ -98,7 +98,7 @@ static void dump_blob(void *blob, bool debug) p = p_struct; while ((tag = fdt32_to_cpu(GET_CELL(p))) != FDT_END) { @@ -24,7 +23,7 @@ index 723770d..c5811f0 100644 (uintptr_t)p - blob_off - 4, tag, tagname(tag)); if (tag == FDT_BEGIN_NODE) { -@@ -135,8 +135,8 @@ static void dump_blob(void *blob, bool debug) +@@ -138,8 +138,8 @@ static void dump_blob(void *blob, bool debug) p = PALIGN(p + sz, 4); @@ -35,8 +34,8 @@ index 723770d..c5811f0 100644 printf("%*s%s", depth * shift, "", s); utilfdt_print_data(t, sz); printf(";\n"); -@@ -210,14 +210,14 @@ int main(int argc, char *argv[]) - fdt_off_dt_strings(p) < this_len) +@@ -222,14 +222,14 @@ int main(int argc, char *argv[]) + if (valid_header(p, this_len)) break; if (debug) - printf("%s: skipping fdt magic at offset %#zx\n", @@ -45,13 +44,10 @@ index 723770d..c5811f0 100644 } ++p; } - if (!p) + if (!p || endp - p < sizeof(struct fdt_header)) die("%s: could not locate fdt magic\n", file); - printf("%s: found fdt at offset %#zx\n", file, p - buf); + printf("%s: found fdt at offset %#tx\n", file, p - buf); buf = p; - } - --- -1.8.1.4 - + } else if (!valid_header(buf, len)) + die("%s: header is not valid\n", file); |