From aaf90cd0e100b42993db670cf30b21cfa48be72a Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 12 Feb 2021 15:29:51 -0600 Subject: 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 Change-Id: Ied7be0ecf17a377bbbf1366d1961bb77c68bf2d4 --- meta-xilinx/meta-xilinx-standalone/conf/layer.conf | 1 + .../recipes-core/newlib/libgloss_3.%.bbappend | 12 ------------ .../recipes-core/newlib/libgloss_4.%.bbappend | 12 ++++++++++++ .../recipes-core/newlib/newlib_3.%.bbappend | 20 -------------------- .../recipes-core/newlib/newlib_4.%.bbappend | 20 ++++++++++++++++++++ .../recipes-devtools/gcc/gcc-source_10.%.bbappend | 8 ++++++++ 6 files changed, 41 insertions(+), 32 deletions(-) delete mode 100644 meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend create mode 100644 meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend delete mode 100644 meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend create mode 100644 meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend (limited to 'meta-xilinx/meta-xilinx-standalone') 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_3.%.bbappend deleted file mode 100644 index 646d0e9a9..000000000 --- a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_3.%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -COMPATIBLE_HOST = ".*-elf" -COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi" - -# When building multiple, we need to depend on the multilib newlib -DEPENDS_append_xilinx-standalone = " ${MLPREFIX}newlib" - -EXTRA_OECONF_append_xilinx-standalone = " \ - --enable-newlib-io-c99-formats \ - --enable-newlib-io-long-long \ - --enable-newlib-io-float \ - --enable-newlib-io-long-double \ -" diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend new file mode 100644 index 000000000..646d0e9a9 --- /dev/null +++ b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/libgloss_4.%.bbappend @@ -0,0 +1,12 @@ +COMPATIBLE_HOST = ".*-elf" +COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi" + +# When building multiple, we need to depend on the multilib newlib +DEPENDS_append_xilinx-standalone = " ${MLPREFIX}newlib" + +EXTRA_OECONF_append_xilinx-standalone = " \ + --enable-newlib-io-c99-formats \ + --enable-newlib-io-long-long \ + --enable-newlib-io-float \ + --enable-newlib-io-long-double \ +" diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend deleted file mode 100644 index 90522cfbc..000000000 --- a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_3.%.bbappend +++ /dev/null @@ -1,20 +0,0 @@ -COMPATIBLE_HOST = ".*-elf" -COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi" - -EXTRA_OECONF_append_xilinx-standalone = " \ - --enable-newlib-io-c99-formats \ - --enable-newlib-io-long-long \ - --enable-newlib-io-float \ - --enable-newlib-io-long-double \ -" - -# Avoid trimmping CCARGS from CC by newlib configure -do_configure_prepend_xilinx-standalone(){ - export CC_FOR_TARGET="${CC}" -} - -# Fix for multilib newlib installations -do_install_prepend_xilinx-standalone() { - mkdir -p $(dirname ${D}${libdir}) - mkdir -p $(dirname ${D}${includedir}) -} diff --git a/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend new file mode 100644 index 000000000..90522cfbc --- /dev/null +++ b/meta-xilinx/meta-xilinx-standalone/recipes-core/newlib/newlib_4.%.bbappend @@ -0,0 +1,20 @@ +COMPATIBLE_HOST = ".*-elf" +COMPATIBLE_HOST_arm = "[^-]*-[^-]*-eabi" + +EXTRA_OECONF_append_xilinx-standalone = " \ + --enable-newlib-io-c99-formats \ + --enable-newlib-io-long-long \ + --enable-newlib-io-float \ + --enable-newlib-io-long-double \ +" + +# Avoid trimmping CCARGS from CC by newlib configure +do_configure_prepend_xilinx-standalone(){ + export CC_FOR_TARGET="${CC}" +} + +# Fix for multilib newlib installations +do_install_prepend_xilinx-standalone() { + mkdir -p $(dirname ${D}${libdir}) + mkdir -p $(dirname ${D}${includedir}) +} 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.') +} -- cgit v1.2.3