From 65e56b986222b16d18eca54718c56504e9937dbd Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Thu, 16 Feb 2023 16:35:39 +0800 Subject: 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 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- ...01-fdtdump-fix-Werror-int-to-pointer-cast.patch | 40 ---------------------- meta/recipes-kernel/dtc/dtc_1.6.1.bb | 30 ---------------- meta/recipes-kernel/dtc/dtc_1.7.0.bb | 29 ++++++++++++++++ 3 files changed, 29 insertions(+), 70 deletions(-) delete mode 100644 meta/recipes-kernel/dtc/dtc/0001-fdtdump-fix-Werror-int-to-pointer-cast.patch delete mode 100644 meta/recipes-kernel/dtc/dtc_1.6.1.bb create mode 100644 meta/recipes-kernel/dtc/dtc_1.7.0.bb (limited to 'meta/recipes-kernel/dtc') 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 @@ -Fix the build of fdtdump with mingw. - -Upstream-Status: Backport -Signed-off-by: Ross Burton - -From ae0ce1fa7f4d679b5f8df1fc0e797246e43547fe Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Wed, 25 Aug 2021 16:13:50 +0400 -Subject: [PATCH] fdtdump: fix -Werror=int-to-pointer-cast -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -With mingw64-gcc, the compiler complains with various warnings: -error: cast from pointer to integer of different size [-Werror=pointer-to-int-cast] - -Signed-off-by: Marc-André Lureau -Message-Id: <20210825121350.213551-1-marcandre.lureau@redhat.com> -Acked-by: Rob Herring -Signed-off-by: David Gibson ---- - fdtdump.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fdtdump.c b/fdtdump.c -index d9fb374..483f367 100644 ---- a/fdtdump.c -+++ b/fdtdump.c -@@ -21,7 +21,7 @@ - #define MAX_VERSION 17 - - #define ALIGN(x, a) (((x) + ((a) - 1)) & ~((a) - 1)) --#define PALIGN(p, a) ((void *)(ALIGN((unsigned long)(p), (a)))) -+#define PALIGN(p, a) ((void *)(ALIGN((uintptr_t)(p), (a)))) - #define GET_CELL(p) (p += 4, *((const fdt32_t *)(p-4))) - - static const char *tagname(uint32_t tag) --- -2.25.1 - diff --git a/meta/recipes-kernel/dtc/dtc_1.6.1.bb b/meta/recipes-kernel/dtc/dtc_1.6.1.bb deleted file mode 100644 index 2a6ac089a3..0000000000 --- a/meta/recipes-kernel/dtc/dtc_1.6.1.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "Device Tree Compiler" -HOMEPAGE = "https://devicetree.org/" -DESCRIPTION = "The Device Tree Compiler is a tool used to manipulate the Open-Firmware-like device tree used by PowerPC kernels." -SECTION = "bootloader" -LICENSE = "GPL-2.0-only | BSD-2-Clause" - -LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://libfdt/libfdt.h;beginline=4;endline=7;md5=05bb357cfb75cae7d2b01d2ee8d76407" - -SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \ - file://0001-fdtdump-fix-Werror-int-to-pointer-cast.patch" -SRCREV = "b6910bec11614980a21e46fbccc35934b671bd81" - -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig - -EXTRA_OEMESON = "-Dpython=disabled -Dvalgrind=disabled" - -PACKAGECONFIG ??= "tools" -PACKAGECONFIG[tools] = "-Dtools=true,-Dtools=false,flex-native bison-native" -PACKAGECONFIG[yaml] = "-Dyaml=enabled,-Dyaml=disabled,libyaml" - -PACKAGES =+ "${PN}-misc" -FILES:${PN}-misc = "${bindir}/convert-dtsv0 ${bindir}/ftdump ${bindir}/dtdiff" -RDEPENDS:${PN}-misc += "${@bb.utils.contains('PACKAGECONFIG', 'tools', 'bash diffutils', '', d)}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-kernel/dtc/dtc_1.7.0.bb b/meta/recipes-kernel/dtc/dtc_1.7.0.bb new file mode 100644 index 0000000000..0fc3eca002 --- /dev/null +++ b/meta/recipes-kernel/dtc/dtc_1.7.0.bb @@ -0,0 +1,29 @@ +SUMMARY = "Device Tree Compiler" +HOMEPAGE = "https://devicetree.org/" +DESCRIPTION = "The Device Tree Compiler is a tool used to manipulate the Open-Firmware-like device tree used by PowerPC kernels." +SECTION = "bootloader" +LICENSE = "GPL-2.0-only | BSD-2-Clause" + +LIC_FILES_CHKSUM = "file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://libfdt/libfdt.h;beginline=4;endline=7;md5=05bb357cfb75cae7d2b01d2ee8d76407" + +SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=main" +SRCREV = "039a99414e778332d8f9c04cbd3072e1dcc62798" + +UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON = "-Dpython=disabled -Dvalgrind=disabled" + +PACKAGECONFIG ??= "tools" +PACKAGECONFIG[tools] = "-Dtools=true,-Dtools=false,flex-native bison-native" +PACKAGECONFIG[yaml] = "-Dyaml=enabled,-Dyaml=disabled,libyaml" + +PACKAGES =+ "${PN}-misc" +FILES:${PN}-misc = "${bindir}/convert-dtsv0 ${bindir}/ftdump ${bindir}/dtdiff" +RDEPENDS:${PN}-misc += "${@bb.utils.contains('PACKAGECONFIG', 'tools', 'bash diffutils', '', d)}" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf