xilinx-standalone: sync distros

Both xilinx-standalone (w/ lto) and xilinx-standalone-nolto need to use
a common set of system settings.  A few settings were missed in the
merge of the decoupling work.  Move these to the common settings file.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>

2 files changed, 8 insertions, 8 deletions

diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf b/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
index 7bb352d0..0ea74a3d 100644
--- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.conf
@@ -2,14 +2,6 @@ require conf/distro/xilinx-standalone.inc
 
 DISTRO_NAME_append = " (lto)"
 
-# Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian
-LIBC_DEPENDENCIES_append = " newlib-staticdev libgloss-staticdev"
-
-# No cached configsite files
-TOOLCHAIN_NEED_CONFIGSITE_CACHE = ""
-
-TOOLCHAIN_HOST_TASK_append = " nativesdk-qemu-xilinx"
-
 # By default we want to optimize for size.
 FULL_OPTIMIZATION = "-Os -pipe ${DEBUG_FLAGS}"
 
diff --git a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
index 1be2b647..71d7a9ca 100644
--- a/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
+++ b/meta-xilinx-standalone/conf/distro/xilinx-standalone.inc
@@ -31,3 +31,11 @@ DISTRO_FEATURES_BACKFILL_xilinx-standalone = ""
 VIRTUAL-RUNTIME_init_manager_xilinx-standalone = ""
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-dummy"
+
+# Hold this until it gets merged in core, we need libc.a and libgloss.a for cross-canadian
+LIBC_DEPENDENCIES_append = " newlib-staticdev libgloss-staticdev"
+
+# No cached configsite files
+TOOLCHAIN_NEED_CONFIGSITE_CACHE = ""
+
+TOOLCHAIN_HOST_TASK_append = " nativesdk-qemu-xilinx"