diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2021-12-18 16:06:55 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2021-12-20 10:28:42 -0800 |
commit | 4884060e76bdec34fe4ea527cd85c06c8590843b (patch) | |
tree | abb72b1dd3d33120d190673cd0d41a785562ad88 /meta-xilinx-bsp | |
parent | 519b8f6681a40b6330e8955557d900851a9025c3 (diff) | |
download | meta-xilinx-4884060e76bdec34fe4ea527cd85c06c8590843b.tar.gz |
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>
Diffstat (limited to 'meta-xilinx-bsp')
-rw-r--r-- | meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc | 8 | ||||
-rw-r--r-- | meta-xilinx-bsp/conf/machine/include/xilinx-microblaze.inc | 10 |
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" | |||
28 | PREFERRED_PROVIDER_virtual/libgl:mali400 = "mesa-gl" | 28 | PREFERRED_PROVIDER_virtual/libgl:mali400 = "mesa-gl" |
29 | PREFERRED_PROVIDER_virtual/mesa:mali400 = "mesa-gl" | 29 | PREFERRED_PROVIDER_virtual/mesa:mali400 = "mesa-gl" |
30 | 30 | ||
31 | # microblaze does not get on with pie for reasons not looked into as yet | ||
32 | GCCPIE:microblaze = "" | ||
33 | GLIBCPIE:microblaze = "" | ||
34 | SECURITY_CFLAGS:microblaze = "" | ||
35 | SECURITY_LDFLAGS:microblaze = "" | ||
36 | # Microblaze does not support gnu hash style | ||
37 | LINKER_HASH_STYLE:microblaze = "sysv" | ||
38 | |||
39 | XSERVER ?= " \ | 31 | XSERVER ?= " \ |
40 | xserver-xorg \ | 32 | xserver-xorg \ |
41 | xf86-input-evdev \ | 33 | 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 | |||
5 | 5 | ||
6 | # Reset the default value back to what it was previously set to... | 6 | # Reset the default value back to what it was previously set to... |
7 | TUNE_FEATURES:tune-microblaze := "${TUNE_FEATURES_save}" | 7 | TUNE_FEATURES:tune-microblaze := "${TUNE_FEATURES_save}" |
8 | |||
9 | # Various microblaze architecture defaults | ||
10 | |||
11 | # microblaze does not get on with pie for reasons not looked into as yet | ||
12 | GCCPIE:microblaze = "" | ||
13 | GLIBCPIE:microblaze = "" | ||
14 | SECURITY_CFLAGS:microblaze = "" | ||
15 | SECURITY_LDFLAGS:microblaze = "" | ||
16 | # Microblaze does not support gnu hash style | ||
17 | LINKER_HASH_STYLE:microblaze = "sysv" | ||