summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2023-02-16 16:35:39 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-19 07:47:53 +0000
commit65e56b986222b16d18eca54718c56504e9937dbd (patch)
tree88167d95c5b0aa7722bb51dfcaaef6435cd03b94 /meta
parentceb95cf9c2c6948645bf798e4e9554d955a8c8fb (diff)
downloadpoky-65e56b986222b16d18eca54718c56504e9937dbd.tar.gz
dtc: upgrade 1.6.1 -> 1.7.0
0001-fdtdump-fix-Werror-int-to-pointer-cast.patch removed sinct it's included in 1.7.0 (From OE-Core rev: 3007669c903eecf8aa057add51c469bdb1337a38) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/dtc/dtc/0001-fdtdump-fix-Werror-int-to-pointer-cast.patch40
-rw-r--r--meta/recipes-kernel/dtc/dtc_1.7.0.bb (renamed from meta/recipes-kernel/dtc/dtc_1.6.1.bb)5
2 files changed, 2 insertions, 43 deletions
diff --git a/meta/recipes-kernel/dtc/dtc/0001-fdtdump-fix-Werror-int-to-pointer-cast.patch b/meta/recipes-kernel/dtc/dtc/0001-fdtdump-fix-Werror-int-to-pointer-cast.patch
deleted file mode 100644
index 4c3e34b1ff..0000000000
--- a/meta/recipes-kernel/dtc/dtc/0001-fdtdump-fix-Werror-int-to-pointer-cast.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1Fix the build of fdtdump with mingw.
2
3Upstream-Status: Backport
4Signed-off-by: Ross Burton <ross.burton@arm.com>
5
6From ae0ce1fa7f4d679b5f8df1fc0e797246e43547fe Mon Sep 17 00:00:00 2001
7From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
8Date: Wed, 25 Aug 2021 16:13:50 +0400
9Subject: [PATCH] fdtdump: fix -Werror=int-to-pointer-cast
10MIME-Version: 1.0
11Content-Type: text/plain; charset=UTF-8
12Content-Transfer-Encoding: 8bit
13
14With mingw64-gcc, the compiler complains with various warnings:
15error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast]
16
17Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
18Message-Id: <20210825121350.213551-1-marcandre.lureau@redhat.com>
19Acked-by: Rob Herring <robh@kernel.org>
20Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
21---
22 fdtdump.c | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/fdtdump.c b/fdtdump.c
26index d9fb374..483f367 100644
27--- a/fdtdump.c
28+++ b/fdtdump.c
29@@ -21,7 +21,7 @@
30 #define MAX_VERSION 17
31
32 #define ALIGN(x, a) (((x) + ((a) - 1)) & ~((a) - 1))
33-#define PALIGN(p, a) ((void *)(ALIGN((unsigned long)(p), (a))))
34+#define PALIGN(p, a) ((void *)(ALIGN((uintptr_t)(p), (a))))
35 #define GET_CELL(p) (p += 4, *((const fdt32_t *)(p-4)))
36
37 static const char *tagname(uint32_t tag)
38--
392.25.1
40
diff --git a/meta/recipes-kernel/dtc/dtc_1.6.1.bb b/meta/recipes-kernel/dtc/dtc_1.7.0.bb
index 2a6ac089a3..0fc3eca002 100644
--- a/meta/recipes-kernel/dtc/dtc_1.6.1.bb
+++ b/meta/recipes-kernel/dtc/dtc_1.7.0.bb
@@ -7,9 +7,8 @@ LICENSE = "GPL-2.0-only | BSD-2-Clause"
7LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 7LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://libfdt/libfdt.h;beginline=4;endline=7;md5=05bb357cfb75cae7d2b01d2ee8d76407" 8 file://libfdt/libfdt.h;beginline=4;endline=7;md5=05bb357cfb75cae7d2b01d2ee8d76407"
9 9
10SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \ 10SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=main"
11 file://0001-fdtdump-fix-Werror-int-to-pointer-cast.patch" 11SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798"
12SRCREV = "b6910bec11614980a21e46fbccc35934b671bd81"
13 12
14UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" 13UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
15 14