diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-13 00:29:51 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
| commit | aaf90cd0e100b42993db670cf30b21cfa48be72a (patch) | |
| tree | 6f6c9758d921216d8a3a5d8e1c13fb533a10b612 /meta-xilinx/meta-xilinx-standalone | |
| parent | d793c994c8b704f43761d3cb717153d1f766fe4b (diff) | |
| download | openbmc-aaf90cd0e100b42993db670cf30b21cfa48be72a.tar.xz | |
meta-xilinx: subtree update:eb4ba06eb1..96f122efe4
Mark Hatle (4):
meta-xilinx-standalone: Prevent user error, when meta-microblaze is required
meta-microblaze gdb: Backport gdb 9.2 from master YP, and lock down version
qemu-xilinx: lock down on YP 5.1.0 integration
newlib/libgloss: YP has moved to version 4.1.0, adjust accordingly
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ied7be0ecf17a377bbbf1366d1961bb77c68bf2d4
Diffstat (limited to 'meta-xilinx/meta-xilinx-standalone')
| -rw-r--r-- | meta-xilinx/meta-xilinx-standalone/conf/layer.conf | 1 | ||||
| -rw-r--r-- | meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend (renamed from meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend) | 0 | ||||
| -rw-r--r-- | meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend (renamed from meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend) | 0 | ||||
| -rw-r--r-- | meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend | 8 |
4 files changed, 9 insertions, 0 deletions
diff --git a/meta-xilinx/meta-xilinx-standalone/conf/layer.conf b/meta-xilinx/meta-xilinx-standalone/conf/layer.conf index cef1039ef..de1acee80 100644 --- a/meta-xilinx/meta-xilinx-standalone/conf/layer.conf +++ b/meta-xilinx/meta-xilinx-standalone/conf/layer.conf @@ -13,6 +13,7 @@ BBFILE_PATTERN_xilinx-standalone = "^${LAYERDIR}/" BBFILE_PRIORITY_xilinx-standalone = "7" LAYERDEPENDS_xilinx-standalone = "core xilinx" +LAYERRECOMMENDS_xilinx-standalone = "xilinx-microblaze" LAYERSERIES_COMPAT_xilinx-standalone = "dunfell gatesgarth" XILINX_RELEASE_VERSION = "v2020.2" diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend index 646d0e9a9..646d0e9a9 100644 --- a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend +++ b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend index 90522cfbc..90522cfbc 100644 --- a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend +++ b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend b/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend index e1876700f..d3abc611b 100644 --- a/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend +++ b/meta-xilinx/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend @@ -5,3 +5,11 @@ FILESEXTRAPATHS_append_microblaze_xilinx-standalone := ":${THISDIR}/gcc-10" SRC_URI_append_microblaze_xilinx-standalone = " \ file://additional-microblaze-multilibs.patch \ " + +CHECK_FOR_MICROBLAZE_microblaze = "1" + +python() { + if d.getVar('CHECK_FOR_MICROBLAZE') == '1': + if 'xilinx-microblaze' not in d.getVar('BBFILE_COLLECTIONS').split(): + bb.fatal('You must include the meta-microblaze layer to build for this configuration.') +} |