Commit 29520e49 authored by Martin Jobst's avatar Martin Jobst Committed by Oliver Horst
Browse files

add support for Yocto thud

parent ab51beca
......@@ -9,5 +9,5 @@ BBFILE_COLLECTIONS += "toki-xilinx-layer"
BBFILE_PATTERN_toki-xilinx-layer = "^${LAYERDIR}/"
BBFILE_PRIORITY_toki-xiinx-layer = "6"
LAYERVERSION_toki-xilinx-layer = "1"
LAYERSERIES_COMPAT_toki-xilinx-layer = "sumo thud"
LAYERSERIES_COMPAT_toki-xilinx-layer = "thud"
LAYERDEPENDS_toki-xilinx-layer = "toki-layer xilinx"
From 9ce212d3fb5379a202652737267416fe6e957b9b Mon Sep 17 00:00:00 2001
From: Martin Jobst <jobst@fortiss.org>
Date: Thu, 18 Oct 2018 16:38:22 +0200
Subject: [PATCH] rename newlib and libgloss recipes to resolve conflicts
---
meta-xilinx-bsp/conf/machine/include/zynqmp-pmu-config.inc | 2 +-
.../recipes-bsp/pmu-firmware/pmu-firmware_2018.1.bb | 2 +-
.../newlib/{libgloss_3.0.0.bb => libgloss-xlnx_3.0.0.bb} | 4 ++--
.../recipes-core/newlib/{newlib.inc => newlib-xlnx.inc} | 0
.../newlib/{newlib_3.0.0.bb => newlib-xlnx_3.0.0.bb} | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
rename meta-xilinx-bsp/recipes-core/newlib/{libgloss_3.0.0.bb => libgloss-xlnx_3.0.0.bb} (91%)
rename meta-xilinx-bsp/recipes-core/newlib/{newlib.inc => newlib-xlnx.inc} (100%)
rename meta-xilinx-bsp/recipes-core/newlib/{newlib_3.0.0.bb => newlib-xlnx_3.0.0.bb} (95%)
diff --git a/meta-xilinx-bsp/conf/machine/include/zynqmp-pmu-config.inc b/meta-xilinx-bsp/conf/machine/include/zynqmp-pmu-config.inc
index fd9e980..b0d767c 100644
--- a/meta-xilinx-bsp/conf/machine/include/zynqmp-pmu-config.inc
+++ b/meta-xilinx-bsp/conf/machine/include/zynqmp-pmu-config.inc
@@ -3,7 +3,7 @@
def zynqmp_pmu_enable_for_bpns(d):
bpn = d.getVar("BPN")
crossbpns = ["binutils", "gcc"]
- targetbpns = ["libgcc", "newlib", "libgloss"]
+ targetbpns = ["libgcc", "newlib-xlnx", "libgloss-xlnx"]
if bpn in targetbpns:
return True
if bpn in crossbpns and bb.data.inherits_class('cross', d):
diff --git a/meta-xilinx-bsp/recipes-bsp/pmu-firmware/pmu-firmware_2018.1.bb b/meta-xilinx-bsp/recipes-bsp/pmu-firmware/pmu-firmware_2018.1.bb
index e54e103..e07b8f8 100644
--- a/meta-xilinx-bsp/recipes-bsp/pmu-firmware/pmu-firmware_2018.1.bb
+++ b/meta-xilinx-bsp/recipes-bsp/pmu-firmware/pmu-firmware_2018.1.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/Xilinx/embeddedsw"
SECTION = "bsp"
INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS = "virtual/${TARGET_PREFIX}gcc newlib libgloss libgcc"
+DEPENDS = "virtual/${TARGET_PREFIX}gcc newlib-xlnx libgloss-xlnx libgcc"
# force this recipe to provide a target virtual/pmu-firmware. this is applied
# after any class extender mapping and results in this recipe always providing
diff --git a/meta-xilinx-bsp/recipes-core/newlib/libgloss_3.0.0.bb b/meta-xilinx-bsp/recipes-core/newlib/libgloss-xlnx_3.0.0.bb
similarity index 91%
rename from meta-xilinx-bsp/recipes-core/newlib/libgloss_3.0.0.bb
rename to meta-xilinx-bsp/recipes-core/newlib/libgloss-xlnx_3.0.0.bb
index cff4a26..c1c8af7 100644
--- a/meta-xilinx-bsp/recipes-core/newlib/libgloss_3.0.0.bb
+++ b/meta-xilinx-bsp/recipes-core/newlib/libgloss-xlnx_3.0.0.bb
@@ -1,7 +1,7 @@
-require newlib.inc
+require newlib-xlnx.inc
-DEPENDS += "newlib"
+DEPENDS += "newlib-xlnx"
do_configure() {
${S}/libgloss/configure ${EXTRA_OECONF}
diff --git a/meta-xilinx-bsp/recipes-core/newlib/newlib.inc b/meta-xilinx-bsp/recipes-core/newlib/newlib-xlnx.inc
similarity index 100%
rename from meta-xilinx-bsp/recipes-core/newlib/newlib.inc
rename to meta-xilinx-bsp/recipes-core/newlib/newlib-xlnx.inc
diff --git a/meta-xilinx-bsp/recipes-core/newlib/newlib_3.0.0.bb b/meta-xilinx-bsp/recipes-core/newlib/newlib-xlnx_3.0.0.bb
similarity index 95%
rename from meta-xilinx-bsp/recipes-core/newlib/newlib_3.0.0.bb
rename to meta-xilinx-bsp/recipes-core/newlib/newlib-xlnx_3.0.0.bb
index 3d31350..a93c1b0 100644
--- a/meta-xilinx-bsp/recipes-core/newlib/newlib_3.0.0.bb
+++ b/meta-xilinx-bsp/recipes-core/newlib/newlib-xlnx_3.0.0.bb
@@ -1,4 +1,4 @@
-require newlib.inc
+require newlib-xlnx.inc
do_configure_prepend_microblaze() {
# hack for microblaze, which needs xilinx.ld to literally do any linking (its hard coded in its LINK_SPEC)
--
2.19.1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment