3 files changed, 19 insertions, 9 deletions

diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf b/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
index dfc8fa08..8e1d6edf 100644
--- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
@@ -2,12 +2,6 @@ require conf/distro/xilinx-standalone.inc
 
 DISTRO_NAME:append = " (lto)"
 
-# By default we want to optimize for size.
-FULL_OPTIMIZATION = "-O2 -pipe ${DEBUG_FLAGS}"
-
-# Workaround for microblaze -Os bug
-FULL_OPTIMIZATION:microblaze = "-O2 -pipe ${DEBUG_FLAGS}"
-
 # We also need to use Link Time Optimization for many items, make this the
 # default.
 ESW_CFLAGS += " -Os -flto -ffat-lto-objects"
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
index 4d591707..17b9430d 100644
--- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
@@ -49,3 +49,19 @@ BB_SIGNATURE_HANDLER ?= "OEEquivHash"
 BB_HASHSERVE ??= "auto"
 
 MACHINE_FEATURES_BACKFILL_CONSIDERED += "rtc qemu-usermode"
+
+# Prevent warnings about 'buildpaths'
+# After investigation it appears a debuginfo directory path to the build
+# directory is being inserted into the objects.  This path is not actually
+# being referred to by any components.  Why this is happening is unknown,
+# so we avoid the warning as we know this is not an actual issue.
+WARN_QA:remove = "buildpaths"
+
+# By default PetaLinux uses the own-mirror class to access cached version of
+# the software.  While this distribution configuration is not PetaLinux, nor
+# should it require PetaLinux to operating properly, including the same mirror
+# configuration will unify the Linux and non-Linux (baremetal) configurations.
+# Do this via include so if meta-petalinux is not part of the build this will
+# not error.  This also allows the user to choose to handle the download
+# mirroring in their own way for non-PetaLinux like configs.
+include conf/distro/include/petalinux-mirrors.conf
diff --git a/meta-xilinx-standalone/conf/layer.conf b/meta-xilinx-standalone/conf/layer.conf
index 8087d5a6..17289851 100644
--- a/meta-xilinx-standalone/conf/layer.conf
+++ b/meta-xilinx-standalone/conf/layer.conf
@@ -17,9 +17,6 @@ LAYERRECOMMENDS_xilinx-standalone = "xilinx-microblaze"
 
 LAYERSERIES_COMPAT_xilinx-standalone = "scarthgap"
 
-# Set this to enable this layer
-#XILINX_WITH_ESW = "generic"
-
 # Sanity check for meta-xilinx-standalone layer.
 # Setting SKIP_META_XILINX_STANDALONE_SANITY_CHECK to "1" would skip the bbappend files check.
 INHERIT += "sanity-meta-xilinx-standalone"
@@ -31,3 +28,6 @@ INHERIT += "sanity-meta-xilinx-standalone"
 META_XILINX_STANDALONE_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-xilinx-standalone-default-versions.inc"
 
 USER_CLASSES:append = " meta-xilinx-standalone-cfg"
+
+# Allow other layers to find the root of this layer if necessary
+LAYERBASE_xilinx-standalone = "${LAYERDIR}"