Move microblaze arch settings to xilinx-microblaze.inc

No reason to set any microblaze defaults, unless we're actually building
for microblaze.

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

2 files changed, 10 insertions, 8 deletions

diff --git a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
index 7c13bfce..d8b1e2d9 100644
--- a/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc
@@ -28,14 +28,6 @@ PREFERRED_PROVIDER_virtual/egl:mali400 = "libmali-xlnx"
 PREFERRED_PROVIDER_virtual/libgl:mali400 = "mesa-gl"
 PREFERRED_PROVIDER_virtual/mesa:mali400 = "mesa-gl"
 
-# microblaze does not get on with pie for reasons not looked into as yet
-GCCPIE:microblaze = ""
-GLIBCPIE:microblaze = ""
-SECURITY_CFLAGS:microblaze = ""
-SECURITY_LDFLAGS:microblaze = ""
-# Microblaze does not support gnu hash style
-LINKER_HASH_STYLE:microblaze = "sysv"
-
 XSERVER ?= " \
         xserver-xorg \
         xf86-input-evdev \
diff --git a/meta-xilinx-bsp/conf/machine/include/xilinx-microblaze.inc b/meta-xilinx-bsp/conf/machine/include/xilinx-microblaze.inc
index d0252e79..76d77cd1 100644
--- a/meta-xilinx-bsp/conf/machine/include/xilinx-microblaze.inc
+++ b/meta-xilinx-bsp/conf/machine/include/xilinx-microblaze.inc
@@ -5,3 +5,13 @@ require conf/machine/include/microblaze/tune-microblaze.inc
 
 # Reset the default value back to what it was previously set to...
 TUNE_FEATURES:tune-microblaze := "${TUNE_FEATURES_save}"
+
+# Various microblaze architecture defaults
+
+# microblaze does not get on with pie for reasons not looked into as yet
+GCCPIE:microblaze = ""
+GLIBCPIE:microblaze = ""
+SECURITY_CFLAGS:microblaze = ""
+SECURITY_LDFLAGS:microblaze = ""
+# Microblaze does not support gnu hash style
+LINKER_HASH_STYLE:microblaze = "sysv"