diff options
| author |   Mark Hatle <mark.hatle@kernel.crashing.org> | 2021-02-03 09:55:32 -0600 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@kernel.crashing.org> | 2021-02-03 09:55:32 -0600 |
| commit | 626d11fc1c8dfeaf67ef4db55280ef13cc0cab28 (patch) | |
| tree | 2573a519984257b655cee400af2b93c81b6f4faa | |
| parent | eb4ba06eb1bc7743dba2412b0c903ec5d5628cae (diff) | |
| download | meta-xilinx-626d11fc1c8dfeaf67ef4db55280ef13cc0cab28.tar.gz meta-xilinx-626d11fc1c8dfeaf67ef4db55280ef13cc0cab28.tar.bz2 meta-xilinx-626d11fc1c8dfeaf67ef4db55280ef13cc0cab28.zip | |
meta-xilinx-standalone: Prevent user error, when meta-microblaze is required
When the user chooses to build a microblaze target, the compiler can fail
to patch properly as a symptom. Users may think it's a simple patch failure,
but really they forgot to include the meta-microblaze layer itself.
Declare the meta-microblaze layer as a recommended layer, and verify in the
gcc-source bbappend that it has been included, if a microblaze target is being
built.
Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>
| -rw-r--r-- | meta-xilinx-standalone/conf/layer.conf | 1 | ||||
| -rw-r--r-- | meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/meta-xilinx-standalone/conf/layer.conf b/meta-xilinx-standalone/conf/layer.conf index cef1039e..de1acee8 100644 --- a/meta-xilinx-standalone/conf/layer.conf +++ b/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-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend index e1876700..d3abc611 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend +++ b/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.') +} |