summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-bsp
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2020-02-07 18:31:37 -0800
committerMark Hatle <mark.hatle@xilinx.com>2020-02-10 20:21:09 -0800
commit06d46fd55343516fc079bec688c993a5382cd0d3 (patch)
treed0d5902fa78653923474ab3d1de6b346eb046d81 /meta-xilinx-bsp
parentfb62f071f94fc45444357865665fec6d4b11d1ca (diff)
downloadmeta-xilinx-06d46fd55343516fc079bec688c993a5382cd0d3.tar.gz
microblaze-tc: Minor update and corrections
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp')
-rw-r--r--meta-xilinx-bsp/conf/machine/microblaze-tc.conf67
1 files changed, 32 insertions, 35 deletions
diff --git a/meta-xilinx-bsp/conf/machine/microblaze-tc.conf b/meta-xilinx-bsp/conf/machine/microblaze-tc.conf
index ce1c81a8..081dd4e8 100644
--- a/meta-xilinx-bsp/conf/machine/microblaze-tc.conf
+++ b/meta-xilinx-bsp/conf/machine/microblaze-tc.conf
@@ -12,25 +12,24 @@ TARGET_LINK_HASH_STYLE = ""
12# Define all of the multilibs supproted by this configuration 12# Define all of the multilibs supproted by this configuration
13MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" 13MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}"
14 14
15MULTILIBS += "multilib:libbs" 15MULTILIBS += "multilib:libmbbs"
16MULTILIBS += "multilib:lible" 16MULTILIBS += "multilib:libmble"
17# Can't be 'libm...' or failures happen
18MULTILIBS += "multilib:libmbm" 17MULTILIBS += "multilib:libmbm"
19MULTILIBS += "multilib:libmbmmh" 18MULTILIBS += "multilib:libmbmmh"
19MULTILIBS += "multilib:libmblem"
20MULTILIBS += "multilib:libmblemmh"
21MULTILIBS += "multilib:libmbbsle"
22MULTILIBS += "multilib:libmbbsm"
23MULTILIBS += "multilib:libmbbsmmh"
24MULTILIBS += "multilib:libmbbslem"
25MULTILIBS += "multilib:libmbbslemmh"
26MULTILIBS += "multilib:libmbm64le"
27MULTILIBS += "multilib:libmbm64lem"
28MULTILIBS += "multilib:libmbm64lemmh"
29MULTILIBS += "multilib:libmbm64bsle"
30MULTILIBS += "multilib:libmbm64bslem"
31MULTILIBS += "multilib:libmbm64bslemmh"
20 32
21MULTILIBS += "multilib:liblem"
22MULTILIBS += "multilib:liblemmh"
23MULTILIBS += "multilib:libbsle"
24MULTILIBS += "multilib:libbsm"
25MULTILIBS += "multilib:libbsmmh"
26MULTILIBS += "multilib:libbslem"
27MULTILIBS += "multilib:libbslemmh"
28MULTILIBS += "multilib:lib64le"
29MULTILIBS += "multilib:lib64lem"
30MULTILIBS += "multilib:lib64lemmh"
31MULTILIBS += "multilib:lib64bsle"
32MULTILIBS += "multilib:lib64bslem"
33MULTILIBS += "multilib:lib64bslemmh"
34 33
35# Base configuration 34# Base configuration
36# CFLAGS: 35# CFLAGS:
@@ -44,7 +43,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
44 43
45# bs 44# bs
46# CFLAGS: -mxl-barrel-shift 45# CFLAGS: -mxl-barrel-shift
47DEFAULTTUNE_virtclass-multilib-libbs = "microblazebs" 46DEFAULTTUNE_virtclass-multilib-libmbbs = "microblazebs"
48 47
49AVAILTUNES += "microblazebs" 48AVAILTUNES += "microblazebs"
50BASE_LIB_tune-microblazebs = "lib/bs" 49BASE_LIB_tune-microblazebs = "lib/bs"
@@ -54,7 +53,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazebs = "${TUNE_PKGARCH}"
54 53
55# le 54# le
56# CFLAGS: -mlittle-endian 55# CFLAGS: -mlittle-endian
57DEFAULTTUNE_virtclass-multilib-lible = "microblazele" 56DEFAULTTUNE_virtclass-multilib-libmble = "microblazele"
58 57
59AVAILTUNES += "microblazele" 58AVAILTUNES += "microblazele"
60BASE_LIB_tune-microblazele = "lib/le" 59BASE_LIB_tune-microblazele = "lib/le"
@@ -64,7 +63,6 @@ PACKAGE_EXTRA_ARCHS_tune-microblazele = "${TUNE_PKGARCH}"
64 63
65# m 64# m
66# CFLAGS: -mno-xl-soft-mul 65# CFLAGS: -mno-xl-soft-mul
67# Can't be 'libm...' or failures happen
68DEFAULTTUNE_virtclass-multilib-libmbm = "microblazem" 66DEFAULTTUNE_virtclass-multilib-libmbm = "microblazem"
69 67
70AVAILTUNES += "microblazem" 68AVAILTUNES += "microblazem"
@@ -75,7 +73,6 @@ PACKAGE_EXTRA_ARCHS_tune-microblazem = "${TUNE_PKGARCH}"
75 73
76# m/mh 74# m/mh
77# CFLAGS: -mno-xl-soft-mul -mxl-multiply-high 75# CFLAGS: -mno-xl-soft-mul -mxl-multiply-high
78# Can't be 'libm...' or failures happen
79DEFAULTTUNE_virtclass-multilib-libmbmmh = "microblazemmh" 76DEFAULTTUNE_virtclass-multilib-libmbmmh = "microblazemmh"
80 77
81AVAILTUNES += "microblazemmh" 78AVAILTUNES += "microblazemmh"
@@ -86,7 +83,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazemmh = "${TUNE_PKGARCH}"
86 83
87# le/m 84# le/m
88# CFLAGS: -mlittle-endian -mno-xl-soft-mul 85# CFLAGS: -mlittle-endian -mno-xl-soft-mul
89DEFAULTTUNE_virtclass-multilib-liblem = "microblazelem" 86DEFAULTTUNE_virtclass-multilib-libmblem = "microblazelem"
90 87
91AVAILTUNES += "microblazelem" 88AVAILTUNES += "microblazelem"
92BASE_LIB_tune-microblazelem = "lib/le/m" 89BASE_LIB_tune-microblazelem = "lib/le/m"
@@ -96,7 +93,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazelem = "${TUNE_PKGARCH}"
96 93
97# le/m/mh 94# le/m/mh
98# CFLAGS: -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high 95# CFLAGS: -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high
99DEFAULTTUNE_virtclass-multilib-liblemmh = "microblazelemmh" 96DEFAULTTUNE_virtclass-multilib-libmblemmh = "microblazelemmh"
100 97
101AVAILTUNES += "microblazelemmh" 98AVAILTUNES += "microblazelemmh"
102BASE_LIB_tune-microblazelemmh = "lib/le/m/mh" 99BASE_LIB_tune-microblazelemmh = "lib/le/m/mh"
@@ -106,16 +103,17 @@ PACKAGE_EXTRA_ARCHS_tune-microblazelemmh = "${TUNE_PKGARCH}"
106 103
107# bs/le 104# bs/le
108# CFLAGS: -mxl-barrel-shift -mlittle-endian 105# CFLAGS: -mxl-barrel-shift -mlittle-endian
109DEFAULTTUNE_virtclass-multilib-libbsle = "microblazebsle" 106DEFAULTTUNE_virtclass-multilib-libmbbsle = "microblazebsle"
110 107
111AVAILTUNES += "microblazebsle" 108AVAILTUNES += "microblazebsle"
112BASE_LIB_tune-microblazebsle = "lib/bs/le" 109BASE_LIB_tune-microblazebsle = "lib/bs/le"
113TUNE_FEATURES_tune-microblazebsle = "microblaze bigendian barrel-shift" 110TUNE_FEATURES_tune-microblazebsle = "microblaze barrel-shift"
114PACKAGE_EXTRA_ARCHS_tune-microblazebsle = "${TUNE_PKGARCH}" 111PACKAGE_EXTRA_ARCHS_tune-microblazebsle = "${TUNE_PKGARCH}"
115 112
113
116# bs/m 114# bs/m
117# CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul 115# CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul
118DEFAULTTUNE_virtclass-multilib-libbsm = "microblazebsm" 116DEFAULTTUNE_virtclass-multilib-libmbbsm = "microblazebsm"
119 117
120AVAILTUNES += "microblazebsm" 118AVAILTUNES += "microblazebsm"
121BASE_LIB_tune-microblazebsm = "lib/bs/m" 119BASE_LIB_tune-microblazebsm = "lib/bs/m"
@@ -125,7 +123,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazebsm = "${TUNE_PKGARCH}"
125 123
126# bs/m/mh 124# bs/m/mh
127# CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul -mxl-multiply-high 125# CFLAGS: -mxl-barrel-shift -mno-xl-soft-mul -mxl-multiply-high
128DEFAULTTUNE_virtclass-multilib-libbsmmh = "microblazebsmmh" 126DEFAULTTUNE_virtclass-multilib-libmbbsmmh = "microblazebsmmh"
129 127
130AVAILTUNES += "microblazebsmmh" 128AVAILTUNES += "microblazebsmmh"
131BASE_LIB_tune-microblazebsmmh = "lib/bs/m/mh" 129BASE_LIB_tune-microblazebsmmh = "lib/bs/m/mh"
@@ -135,7 +133,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazebsmmh = "${TUNE_PKGARCH}"
135 133
136# bs/le/m 134# bs/le/m
137# CFLAGS: -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul 135# CFLAGS: -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul
138DEFAULTTUNE_virtclass-multilib-libbslem = "microblazebslem" 136DEFAULTTUNE_virtclass-multilib-libmbbslem = "microblazebslem"
139 137
140AVAILTUNES += "microblazebslem" 138AVAILTUNES += "microblazebslem"
141BASE_LIB_tune-microblazebslem = "lib/bs/le/m" 139BASE_LIB_tune-microblazebslem = "lib/bs/le/m"
@@ -145,7 +143,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazebslem = "${TUNE_PKGARCH}"
145 143
146# bs/le/m/mh 144# bs/le/m/mh
147# CFLAGS: -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high 145# CFLAGS: -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high
148DEFAULTTUNE_virtclass-multilib-libbslemmh = "microblazebslemmh" 146DEFAULTTUNE_virtclass-multilib-libmbbslemmh = "microblazebslemmh"
149 147
150AVAILTUNES += "microblazebslemmh" 148AVAILTUNES += "microblazebslemmh"
151BASE_LIB_tune-microblazebslemmh = "lib/bs/le/m/mh" 149BASE_LIB_tune-microblazebslemmh = "lib/bs/le/m/mh"
@@ -155,7 +153,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblazebslemmh = "${TUNE_PKGARCH}"
155 153
156# m64/le 154# m64/le
157# CFLAGS: -m64 -mlittle-endian 155# CFLAGS: -m64 -mlittle-endian
158DEFAULTTUNE_virtclass-multilib-lib64le = "microblaze64le" 156DEFAULTTUNE_virtclass-multilib-libmbm64le = "microblaze64le"
159 157
160AVAILTUNES += "microblaze64le" 158AVAILTUNES += "microblaze64le"
161BASE_LIB_tune-microblaze64le = "lib/m64/le" 159BASE_LIB_tune-microblaze64le = "lib/m64/le"
@@ -165,7 +163,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblaze64le = "${TUNE_PKGARCH}"
165 163
166# m64/le/m 164# m64/le/m
167# CFLAGS: -m64 -mlittle-endian -mno-xl-soft-mul 165# CFLAGS: -m64 -mlittle-endian -mno-xl-soft-mul
168DEFAULTTUNE_virtclass-multilib-lib64lem = "microblaze64lem" 166DEFAULTTUNE_virtclass-multilib-libmbm64lem = "microblaze64lem"
169 167
170AVAILTUNES += "microblaze64lem" 168AVAILTUNES += "microblaze64lem"
171BASE_LIB_tune-microblaze64lem = "lib/m64/le/m" 169BASE_LIB_tune-microblaze64lem = "lib/m64/le/m"
@@ -175,7 +173,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblaze64lem = "${TUNE_PKGARCH}"
175 173
176# m64/le/m/mh 174# m64/le/m/mh
177# CFLAGS: -m64 -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high 175# CFLAGS: -m64 -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high
178DEFAULTTUNE_virtclass-multilib-lib64lemmh = "microblaze64lemmh" 176DEFAULTTUNE_virtclass-multilib-libmbm64lemmh = "microblaze64lemmh"
179 177
180AVAILTUNES += "microblaze64lemmh" 178AVAILTUNES += "microblaze64lemmh"
181BASE_LIB_tune-microblaze64lemmh = "lib/m64/le/m/mh" 179BASE_LIB_tune-microblaze64lemmh = "lib/m64/le/m/mh"
@@ -185,7 +183,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblaze64lemmh = "${TUNE_PKGARCH}"
185 183
186# m64/bs/le 184# m64/bs/le
187# CFLAGS: -m64 -mxl-barrel-shift -mlittle-endian 185# CFLAGS: -m64 -mxl-barrel-shift -mlittle-endian
188DEFAULTTUNE_virtclass-multilib-lib64bsle = "microblaze64bsle" 186DEFAULTTUNE_virtclass-multilib-libmbm64bsle = "microblaze64bsle"
189 187
190AVAILTUNES += "microblaze64bsle" 188AVAILTUNES += "microblaze64bsle"
191BASE_LIB_tune-microblaze64bsle = "lib/m64/bs/le" 189BASE_LIB_tune-microblaze64bsle = "lib/m64/bs/le"
@@ -195,7 +193,7 @@ PACKAGE_EXTRA_ARCHS_tune-microblaze64bsle = "${TUNE_PKGARCH}"
195 193
196# m64/bs/le/m 194# m64/bs/le/m
197# CFLAGS: -m64 -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul 195# CFLAGS: -m64 -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul
198DEFAULTTUNE_virtclass-multilib-lib64bslem = "microblaze64bslem" 196DEFAULTTUNE_virtclass-multilib-libmbm64bslem = "microblaze64bslem"
199 197
200AVAILTUNES += "microblaze64bslem" 198AVAILTUNES += "microblaze64bslem"
201BASE_LIB_tune-microblaze64bslem = "lib/m64/bs/le/m" 199BASE_LIB_tune-microblaze64bslem = "lib/m64/bs/le/m"
@@ -205,10 +203,9 @@ PACKAGE_EXTRA_ARCHS_tune-microblaze64bslem = "${TUNE_PKGARCH}"
205 203
206# m64/bs/le/m/mh 204# m64/bs/le/m/mh
207# CFLAGS: -m64 -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high 205# CFLAGS: -m64 -mxl-barrel-shift -mlittle-endian -mno-xl-soft-mul -mxl-multiply-high
208DEFAULTTUNE_virtclass-multilib-lib64bslemmh = "microblaze64bslemmh" 206DEFAULTTUNE_virtclass-multilib-libmbm64bslemmh = "microblaze64bslemmh"
209 207
210AVAILTUNES += "microblaze64bslemmh" 208AVAILTUNES += "microblaze64bslemmh"
211BASE_LIB_tune-microblaze64bslemmh = "lib/m64/bs/le/m/mh" 209BASE_LIB_tune-microblaze64bslemmh = "lib/m64/bs/le/m/mh"
212TUNE_FEATURES_tune-microblaze64bslemmh = "microblaze 64-bit barrel-shift multiply-high" 210TUNE_FEATURES_tune-microblaze64bslemmh = "microblaze 64-bit barrel-shift multiply-high"
213PACKAGE_EXTRA_ARCHS_tune-microblaze64bslemmh = "${TUNE_PKGARCH}" 211PACKAGE_EXTRA_ARCHS_tune-microblaze64bslemmh = "${TUNE_PKGARCH}"
214