summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-05-17 14:38:28 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-29 21:07:13 +0100
commit50e22b7b31100fb717862e0033f65447b9e0e2a1 (patch)
treec83210f624f45e352c379e0d0fce36a927ec90f3 /meta/recipes-kernel
parentcc8f888018f55e6227b846429186307000d76a27 (diff)
downloadpoky-50e22b7b31100fb717862e0033f65447b9e0e2a1.tar.gz
dtc: upgrade to 1.4.6
Drop upstreamed patch. (From OE-Core rev: e1b5a1dffeb6d9373b823285912c1220076010cb) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/dtc/dtc.inc1
-rw-r--r--meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch43
-rw-r--r--meta/recipes-kernel/dtc/dtc_1.4.6.bb (renamed from meta/recipes-kernel/dtc/dtc_1.4.5.bb)2
3 files changed, 1 insertions, 45 deletions
diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index 9a90d44041..7a923bf520 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -7,7 +7,6 @@ DEPENDS = "flex-native bison-native"
7 7
8SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \ 8SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \
9 file://make_install.patch \ 9 file://make_install.patch \
10 file://0001-checks-Use-proper-format-modifier-for-size_t.patch \
11 " 10 "
12UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" 11UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
13 12
diff --git a/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch b/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
deleted file mode 100644
index cab384dd99..0000000000
--- a/meta/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From c7a4c3817796107bb824a1f173faf90fae45396b Mon Sep 17 00:00:00 2001
2From: Thierry Reding <treding@nvidia.com>
3Date: Wed, 27 Sep 2017 15:04:09 +0200
4Subject: [PATCH] checks: Use proper format modifier for size_t
5
6The size of size_t can vary between architectures, so using %ld isn't
7going to work on 32-bit builds. Use the %zu modifier to make sure it is
8always correct.
9
10Upstream-Status: Backport
11Signed-off-by: Thierry Reding <treding@nvidia.com>
12Acked-by: Rob Herring <robh@kernel.org>
13Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
14Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
15---
16 checks.c | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/checks.c b/checks.c
20index 902f2e3..08a3a29 100644
21--- a/checks.c
22+++ b/checks.c
23@@ -972,7 +972,7 @@ static void check_property_phandle_args(struct check *c,
24 int cell, cellsize = 0;
25
26 if (prop->val.len % sizeof(cell_t)) {
27- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",
28+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",
29 prop->name, prop->val.len, sizeof(cell_t), node->fullpath);
30 return;
31 }
32@@ -1163,7 +1163,7 @@ static void check_interrupts_property(struct check *c,
33 return;
34
35 if (irq_prop->val.len % sizeof(cell_t))
36- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s",
37+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s",
38 irq_prop->name, irq_prop->val.len, sizeof(cell_t),
39 node->fullpath);
40
41--
422.15.0
43
diff --git a/meta/recipes-kernel/dtc/dtc_1.4.5.bb b/meta/recipes-kernel/dtc/dtc_1.4.6.bb
index 0e46cfbeb4..78c5736392 100644
--- a/meta/recipes-kernel/dtc/dtc_1.4.5.bb
+++ b/meta/recipes-kernel/dtc/dtc_1.4.6.bb
@@ -3,7 +3,7 @@ require dtc.inc
3LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ 3LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
4 file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c" 4 file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c"
5 5
6SRCREV = "22a65c5331c22979d416738eb756b9541672e00d" 6SRCREV = "e54388015af1fb4bf04d0bca99caba1074d9cc42"
7 7
8S = "${WORKDIR}/git" 8S = "${WORKDIR}/git"
9 9