diff --git a/meta-digi-arm/recipes-kernel/dtc/dtc.inc b/meta-digi-arm/recipes-kernel/dtc/dtc.inc deleted file mode 100644 index 5269f94a3..000000000 --- a/meta-digi-arm/recipes-kernel/dtc/dtc.inc +++ /dev/null @@ -1,25 +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" -DEPENDS = "flex-native bison-native" - -SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git;branch=master \ - file://make_install.patch \ - file://0001-checks-Use-proper-format-modifier-for-size_t.patch \ - " -UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" - -EXTRA_OEMAKE='NO_PYTHON=1 PREFIX="${prefix}" LIBDIR="${libdir}" DESTDIR="${D}"' - -S = "${WORKDIR}/git" - -do_install () { - oe_runmake install -} - -PACKAGES =+ "${PN}-misc" -FILES:${PN}-misc = "${bindir}/convert-dtsv0 ${bindir}/ftdump ${bindir}/dtdiff" - -RDEPENDS:${PN}-misc += "bash diffutils" diff --git a/meta-digi-arm/recipes-kernel/dtc/dtc/0001-Remove-redundant-YYLOC-global-declaration.patch b/meta-digi-arm/recipes-kernel/dtc/dtc/0001-Remove-redundant-YYLOC-global-declaration.patch deleted file mode 100644 index 2c5e9ba0c..000000000 --- a/meta-digi-arm/recipes-kernel/dtc/dtc/0001-Remove-redundant-YYLOC-global-declaration.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Dirk Mueller -Date: Tue, 14 Jan 2020 18:53:41 +0100 -Subject: [PATCH] Remove redundant YYLOC global declaration - -gcc 10 will default to -fno-common, which causes this error at link -time: - - (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here - -This is because both dtc-lexer as well as dtc-parser define the same -global symbol yyloc. Before with -fcommon those were merged into one -defintion. The proper solution would be to to mark this as "extern", -however that leads to: - - dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls] - 26 | extern YYLTYPE yylloc; - | ^~~~~~ -In file included from dtc-lexer.l:24: -dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here - 127 | extern YYLTYPE yylloc; - | ^~~~~~ -cc1: all warnings being treated as errors - -which means the declaration is completely redundant and can just be -dropped. - -Upstream-Status: Inappropriate [DEY specific] - -Signed-off-by: Dirk Mueller -Message-Id: <20200114175341.2994-1-dmueller@suse.com> -Signed-off-by: David Gibson ---- - dtc-lexer.l | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/dtc-lexer.l b/dtc-lexer.l -index 5c6c3fd..b3b7270 100644 ---- a/dtc-lexer.l -+++ b/dtc-lexer.l -@@ -21,11 +21,10 @@ LINECOMMENT "//".*\n - %{ - #include "dtc.h" - #include "srcpos.h" - #include "dtc-parser.tab.h" - --YYLTYPE yylloc; - extern bool treesource_error; - - /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ - #define YY_USER_ACTION \ - { \ diff --git a/meta-digi-arm/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch b/meta-digi-arm/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch deleted file mode 100644 index cab384dd9..000000000 --- a/meta-digi-arm/recipes-kernel/dtc/dtc/0001-checks-Use-proper-format-modifier-for-size_t.patch +++ /dev/null @@ -1,43 +0,0 @@ -From c7a4c3817796107bb824a1f173faf90fae45396b Mon Sep 17 00:00:00 2001 -From: Thierry Reding -Date: Wed, 27 Sep 2017 15:04:09 +0200 -Subject: [PATCH] checks: Use proper format modifier for size_t - -The size of size_t can vary between architectures, so using %ld isn't -going to work on 32-bit builds. Use the %zu modifier to make sure it is -always correct. - -Upstream-Status: Backport -Signed-off-by: Thierry Reding -Acked-by: Rob Herring -Signed-off-by: David Gibson -Signed-off-by: Alexander Kanavin ---- - checks.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/checks.c b/checks.c -index 902f2e3..08a3a29 100644 ---- a/checks.c -+++ b/checks.c -@@ -972,7 +972,7 @@ static void check_property_phandle_args(struct check *c, - int cell, cellsize = 0; - - if (prop->val.len % sizeof(cell_t)) { -- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s", -+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s", - prop->name, prop->val.len, sizeof(cell_t), node->fullpath); - return; - } -@@ -1163,7 +1163,7 @@ static void check_interrupts_property(struct check *c, - return; - - if (irq_prop->val.len % sizeof(cell_t)) -- FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %ld in node %s", -+ FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple of %zu in node %s", - irq_prop->name, irq_prop->val.len, sizeof(cell_t), - node->fullpath); - --- -2.15.0 - diff --git a/meta-digi-arm/recipes-kernel/dtc/dtc/0001-fdtdump-Fix-gcc11-warning.patch b/meta-digi-arm/recipes-kernel/dtc/dtc/0001-fdtdump-Fix-gcc11-warning.patch deleted file mode 100644 index 8a5e50b8f..000000000 --- a/meta-digi-arm/recipes-kernel/dtc/dtc/0001-fdtdump-Fix-gcc11-warning.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: David Gibson -Date: Wed, 6 Jan 2021 14:52:26 +1100 -Subject: [PATCH] fdtdump: Fix gcc11 warning - -In one place, fdtdump abuses fdt_set_magic(), passing it just a small char -array instead of the full fdt header it expects. That's relying on the -fact that in fact fdt_set_magic() will only actually access the first 4 -bytes of the buffer. - -This trips a new warning in GCC 11 - and it's entirely possible it was -always UB. So, don't do that. - -Upstream-Status: Inappropriate [DEY specific] - -Signed-off-by: David Gibson -(cherry picked from commit ca16a723fa9dde9c5da80dba567f48715000e77c) ---- - fdtdump.c | 2 +- - libfdt/libfdt.h | 10 ++++++++++ - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/fdtdump.c b/fdtdump.c -index fa3b561..072c0af 100644 ---- a/fdtdump.c -+++ b/fdtdump.c -@@ -214,7 +214,7 @@ int main(int argc, char *argv[]) - char *p = buf; - char *endp = buf + len; - -- fdt_set_magic(smagic, FDT_MAGIC); -+ fdt32_st(smagic, FDT_MAGIC); - - /* poor man's memmem */ - while ((endp - p) >= FDT_MAGIC_SIZE) { -diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h -index 313c72a..8795f10 100644 ---- a/libfdt/libfdt.h -+++ b/libfdt/libfdt.h -@@ -153,6 +153,16 @@ static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen) - - uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset); - -+static inline void fdt32_st(void *property, uint32_t value) -+{ -+ uint8_t *bp = (uint8_t *)property; -+ -+ bp[0] = value >> 24; -+ bp[1] = (value >> 16) & 0xff; -+ bp[2] = (value >> 8) & 0xff; -+ bp[3] = value & 0xff; -+} -+ - /**********************************************************************/ - /* Traversal functions */ - /**********************************************************************/ diff --git a/meta-digi-arm/recipes-kernel/dtc/dtc/make_install.patch b/meta-digi-arm/recipes-kernel/dtc/dtc/make_install.patch deleted file mode 100644 index ccf17b38f..000000000 --- a/meta-digi-arm/recipes-kernel/dtc/dtc/make_install.patch +++ /dev/null @@ -1,17 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile -@@ -168,8 +168,8 @@ install-bin: all $(SCRIPTS) - install-lib: all - @$(VECHO) INSTALL-LIB - $(INSTALL) -d $(DESTDIR)$(LIBDIR) -- $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR) -- ln -sf $(notdir $(LIBFDT_lib)) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname) -+ $(INSTALL) $(LIBFDT_lib) $(DESTDIR)$(LIBDIR)/$(LIBFDT_soname) -+ ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/$(notdir $(LIBFDT_lib)) - ln -sf $(LIBFDT_soname) $(DESTDIR)$(LIBDIR)/libfdt.$(SHAREDLIB_EXT) - $(INSTALL) -m 644 $(LIBFDT_archive) $(DESTDIR)$(LIBDIR) - diff --git a/meta-digi-arm/recipes-kernel/dtc/dtc_1.4.5.bb b/meta-digi-arm/recipes-kernel/dtc/dtc_1.4.5.bb deleted file mode 100644 index 7c6400c5f..000000000 --- a/meta-digi-arm/recipes-kernel/dtc/dtc_1.4.5.bb +++ /dev/null @@ -1,17 +0,0 @@ -require dtc.inc - -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - -LIC_FILES_CHKSUM = "file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c" - -SRCREV = "22a65c5331c22979d416738eb756b9541672e00d" - -SRC_URI:append = " \ - file://0001-Remove-redundant-YYLOC-global-declaration.patch \ - file://0001-fdtdump-Fix-gcc11-warning.patch \ -" - -S = "${WORKDIR}/git" - -BBCLASSEXTEND = "native nativesdk"