thud migration: dtc: use version 1.4.5 to maintain compatibility with U-Boot 2017.X
https://jira.digi.com/browse/DEL-6412 Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
parent
e7a63452ef
commit
673398c0d5
|
|
@ -0,0 +1,25 @@
|
||||||
|
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 = "GPLv2 | BSD"
|
||||||
|
DEPENDS = "flex-native bison-native"
|
||||||
|
|
||||||
|
SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \
|
||||||
|
file://make_install.patch \
|
||||||
|
file://0001-checks-Use-proper-format-modifier-for-size_t.patch \
|
||||||
|
"
|
||||||
|
UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\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"
|
||||||
|
|
@ -0,0 +1,43 @@
|
||||||
|
From c7a4c3817796107bb824a1f173faf90fae45396b Mon Sep 17 00:00:00 2001
|
||||||
|
From: Thierry Reding <treding@nvidia.com>
|
||||||
|
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 <treding@nvidia.com>
|
||||||
|
Acked-by: Rob Herring <robh@kernel.org>
|
||||||
|
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
|
||||||
|
Signed-off-by: Alexander Kanavin <alex.kanavin@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);
|
||||||
|
|
||||||
|
--
|
||||||
|
2.15.0
|
||||||
|
|
||||||
|
|
@ -0,0 +1,17 @@
|
||||||
|
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)
|
||||||
|
|
||||||
|
|
@ -0,0 +1,12 @@
|
||||||
|
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"
|
||||||
|
|
||||||
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
BBCLASSEXTEND = "native nativesdk"
|
||||||
|
|
@ -66,6 +66,10 @@ PREFERRED_VERSION_linux-yocto ?= "4.18%"
|
||||||
PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-fw-utils"
|
PREFERRED_PROVIDER_u-boot-fw-utils ?= "u-boot-fw-utils"
|
||||||
PREFERRED_VERSION_u-boot-fw-utils ?= "2017.09"
|
PREFERRED_VERSION_u-boot-fw-utils ?= "2017.09"
|
||||||
|
|
||||||
|
# U-Boot 2017.X requires a specific dtc version.
|
||||||
|
PREFERRED_VERSION_dtc-native ?= "1.4.5"
|
||||||
|
PREFERRED_VERSION_nativesdk-dtc ?= "1.4.5"
|
||||||
|
|
||||||
# Use git recipe for libsoc
|
# Use git recipe for libsoc
|
||||||
PREFERRED_VERSION_libsoc = "git"
|
PREFERRED_VERSION_libsoc = "git"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue