From 33f451ebae9b35a59e31bc3d17633f83bd2f2e94 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 14 Oct 2021 07:46:38 -0700 Subject: meta-xilinx-standalone: gcc-source bbappend changes The regular (all version) bbappend will work with both gcc 10 and gcc 11. It only needs to tell the system it is compatible with baremetal builds. The special gcc-source_10 version works with the unique microblaze gcc only. This verifies, and configures the microblaze toolchain for the large multiconfig SDK build. Signed-off-by: Mark Hatle --- .../recipes-devtools/gcc/gcc-source_%.bbappend | 14 -------------- .../recipes-devtools/gcc/gcc-source_10.%.bbappend | 13 +++++++++++++ 2 files changed, 13 insertions(+), 14 deletions(-) create mode 100644 meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_%.bbappend index f2c9051d..0d824324 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_%.bbappend @@ -1,15 +1 @@ COMPATIBLE_HOST = "${HOST_SYS}" - -# Add MicroBlaze Patches (only when using MicroBlaze) -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.') -} diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend new file mode 100644 index 00000000..c0ffbe40 --- /dev/null +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-source_10.%.bbappend @@ -0,0 +1,13 @@ +# Add MicroBlaze Patches (only when using MicroBlaze) +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.') +} -- cgit v1.2.3-54-g00ecf