]> code.ossystems Code Review - meta-freescale.git/commitdiff
dtc-145: Remove class and recipe
authorMihai Lindner <mihai.lindner@nxp.com>
Tue, 14 May 2019 12:43:25 +0000 (15:43 +0300)
committerOtavio Salvador <otavio@ossystems.com.br>
Thu, 2 Apr 2020 18:52:20 +0000 (15:52 -0300)
These were used as workaround for issues with building u-boot 2017.03
and older, after dtc upgrade to 1.4.6 and newer.
We can drop them after upgrading all providers of u-boot.

Signed-off-by: Mihai Lindner <mihai.lindner@nxp.com>
classes/dtc-145.bbclass [deleted file]
recipes-kernel/dtc/dtc-145_git.bb [deleted file]
recipes-kernel/dtc/files/0001-Fix-compiler-warnings-seen-with-musl.patch [deleted file]
recipes-kernel/dtc/files/make_install.patch [deleted file]

diff --git a/classes/dtc-145.bbclass b/classes/dtc-145.bbclass
deleted file mode 100644 (file)
index d4a3071..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-# Use this class for U-Boot 2017.03 or older.
-
-DEPENDS_append = " dtc-145-native"
-
-do_configure_prepend () {
-    sed -i -e 's/^DTC[[:space:]]*=[[:space:]]*dtc[[:space:]]*$/DTC = dtc-145/' ${S}/Makefile
-}
diff --git a/recipes-kernel/dtc/dtc-145_git.bb b/recipes-kernel/dtc/dtc-145_git.bb
deleted file mode 100644 (file)
index 2d4097b..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-require recipes-kernel/dtc/dtc.inc
-
-LIC_FILES_CHKSUM = " \
-    file://GPL;md5=94d55d512a9ba36caa9b7df079bae19f \
-    file://libfdt/libfdt.h;beginline=3;endline=52;md5=fb360963151f8ec2d6c06b055bcbb68c \
-"
-
-SRCREV = "22a65c5331c22979d416738eb756b9541672e00d"
-
-SRC_URI += "file://0001-Fix-compiler-warnings-seen-with-musl.patch \
-           "
-S = "${WORKDIR}/git"
-
-# only install the dtc binary renamed to dtc-145
-do_install () {
-    install -d ${D}/${bindir}
-    install -m 755 dtc ${D}/${bindir}/dtc-145
-}
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/recipes-kernel/dtc/files/0001-Fix-compiler-warnings-seen-with-musl.patch b/recipes-kernel/dtc/files/0001-Fix-compiler-warnings-seen-with-musl.patch
deleted file mode 100644 (file)
index 418a649..0000000
+++ /dev/null
@@ -1,55 +0,0 @@
-From 50034ca2600ae07203f397af6d78e2e9ff16bc02 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 6 Oct 2018 18:12:23 -0700
-Subject: [PATCH] Fix compiler warnings seen with musl
-
-Fixes
-
-checks.c:975:16: error: format '%ld' expects argument of type 'long
-int', but argument 6 has type 'unsigned int' [-Werror=format=]
-   FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple
-of %ld in node %s",
-                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        prop->name, prop->val.len, sizeof(cell_t), node->fullpath);
-                                   ~~~~~~~~~~~~~~
-checks.c:96:23: note: in definition of macro 'FAIL'
-   check_msg((c), dti, __VA_ARGS__);   \
-                       ^~~~~~~~~~~
-checks.c: In function 'check_interrupts_property':
-checks.c:1166:16: error: format '%ld' expects argument of type 'long
-int', but argument 6 has type 'unsigned int' [-Werror=format=]
-   FAIL(c, dti, "property '%s' size (%d) is invalid, expected multiple
-of %ld in node %s",
-                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        irq_prop->name, irq_prop->val.len, sizeof(cell_t),
-                                           ~~~~~~~~~~~~~~
-
-Upstream-Status: Backport [adapted from an upstream fix]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- 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);
diff --git a/recipes-kernel/dtc/files/make_install.patch b/recipes-kernel/dtc/files/make_install.patch
deleted file mode 100644 (file)
index ccf17b3..0000000
+++ /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)