summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-bsp
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2020-02-05 07:31:42 -0800
committerMark Hatle <mark.hatle@xilinx.com>2020-02-05 07:31:47 -0800
commit31d30af45d9ff86e557139a1123238524ddacf33 (patch)
tree034bcb834d101e0589865dcf185d97ca7289b675 /meta-xilinx-bsp
parent669b0410a23d61417d52ba50bf24a751436c0a21 (diff)
downloadmeta-xilinx-31d30af45d9ff86e557139a1123238524ddacf33.tar.gz
Fix arm cortex r/m profiles
As part of the merge of the code bases, changes were introduced that changed the way the cortexr5 was defined. To sync this between the baremetal compilation and the baremetal toolchain compilation we create a new armrm tune file, define a new tune feature of 'armrm', define 'armrm' as a new machine override based on the feature 'armrm', and move the cortexr5 tuning to a common file. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp')
-rw-r--r--meta-xilinx-bsp/conf/machine/arm-rm-tc.conf42
-rw-r--r--meta-xilinx-bsp/conf/machine/cortexr5-versal.conf13
-rw-r--r--meta-xilinx-bsp/conf/machine/cortexr5-zynqmp.conf13
-rw-r--r--meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc14
4 files changed, 37 insertions, 45 deletions
diff --git a/meta-xilinx-bsp/conf/machine/arm-rm-tc.conf b/meta-xilinx-bsp/conf/machine/arm-rm-tc.conf
index c9b7480e..c1313339 100644
--- a/meta-xilinx-bsp/conf/machine/arm-rm-tc.conf
+++ b/meta-xilinx-bsp/conf/machine/arm-rm-tc.conf
@@ -1,5 +1,5 @@
1require conf/multilib.conf 1require conf/multilib.conf
2require conf/machine/include/arm/arch-armv8a.inc 2require conf/machine/include/tune-cortexrm.inc
3require conf/machine/include/baremetal-tc.conf 3require conf/machine/include/baremetal-tc.conf
4 4
5# Define all of the multilibs supproted by this configuration 5# Define all of the multilibs supproted by this configuration
@@ -26,7 +26,7 @@ DEFAULTTUNE = "armrm"
26AVAILTUNES += "armrm" 26AVAILTUNES += "armrm"
27PACKAGE_EXTRA_ARCHS_tune-armrm = "${TUNE_PKGARCH_tune-armrm}" 27PACKAGE_EXTRA_ARCHS_tune-armrm = "${TUNE_PKGARCH_tune-armrm}"
28BASE_LIB_tune-armrm = "lib" 28BASE_LIB_tune-armrm = "lib"
29TUNE_FEATURES_tune-armrm = "arm" 29TUNE_FEATURES_tune-armrm = "arm armrm"
30TUNE_CCARGS_tune-armrm = "" 30TUNE_CCARGS_tune-armrm = ""
31TUNE_PKGARCH_tune-armrm = "armrm" 31TUNE_PKGARCH_tune-armrm = "armrm"
32 32
@@ -38,7 +38,7 @@ DEFAULTTUNE_virtclass-multilib-libarmv5tesoftfp = "armv5tesoftfp"
38AVAILTUNES += "armv5tesoftfp" 38AVAILTUNES += "armv5tesoftfp"
39PACKAGE_EXTRA_ARCHS_tune-armv5tesoftfp = "${TUNE_PKGARCH_tune-armv5tesoftfp}" 39PACKAGE_EXTRA_ARCHS_tune-armv5tesoftfp = "${TUNE_PKGARCH_tune-armv5tesoftfp}"
40BASE_LIB_tune-armv5tesoftfp = "lib/arm/v5te/softfp" 40BASE_LIB_tune-armv5tesoftfp = "lib/arm/v5te/softfp"
41TUNE_FEATURES_tune-armv5tesoftfp = "arm" 41TUNE_FEATURES_tune-armv5tesoftfp = "arm armrm"
42TUNE_CCARGS_tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp" 42TUNE_CCARGS_tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp"
43TUNE_PKGARCH_tune-armv5tesoftfp = "armv5tefp" 43TUNE_PKGARCH_tune-armv5tesoftfp = "armv5tefp"
44 44
@@ -50,7 +50,7 @@ DEFAULTTUNE_virtclass-multilib-libarmv5tehard = "armv5tehard"
50AVAILTUNES += "armv5tehard" 50AVAILTUNES += "armv5tehard"
51PACKAGE_EXTRA_ARCHS_tune-armv5tehard = "${TUNE_PKGARCH_tune-armv5tehard}" 51PACKAGE_EXTRA_ARCHS_tune-armv5tehard = "${TUNE_PKGARCH_tune-armv5tehard}"
52BASE_LIB_tune-armv5tehard = "lib/arm/v5te/hard" 52BASE_LIB_tune-armv5tehard = "lib/arm/v5te/hard"
53TUNE_FEATURES_tune-armv5tehard = "arm" 53TUNE_FEATURES_tune-armv5tehard = "arm armrm"
54TUNE_CCARGS_tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard" 54TUNE_CCARGS_tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard"
55TUNE_PKGARCH_tune-armv5tehard = "armv5tefphf" 55TUNE_PKGARCH_tune-armv5tehard = "armv5tefphf"
56 56
@@ -62,7 +62,7 @@ DEFAULTTUNE_virtclass-multilib-libnofp = "armnofp"
62AVAILTUNES += "armnofp" 62AVAILTUNES += "armnofp"
63PACKAGE_EXTRA_ARCHS_tune-armnofp = "${TUNE_PKGARCH_tune-armnofp}" 63PACKAGE_EXTRA_ARCHS_tune-armnofp = "${TUNE_PKGARCH_tune-armnofp}"
64BASE_LIB_tune-armnofp = "lib/thumb/nofp" 64BASE_LIB_tune-armnofp = "lib/thumb/nofp"
65TUNE_FEATURES_tune-armnofp = "arm" 65TUNE_FEATURES_tune-armnofp = "arm armrm"
66TUNE_CCARGS_tune-armnofp = "-mthumb -mfloat-abi=soft" 66TUNE_CCARGS_tune-armnofp = "-mthumb -mfloat-abi=soft"
67TUNE_PKGARCH_tune-armnofp = "armt" 67TUNE_PKGARCH_tune-armnofp = "armt"
68 68
@@ -74,7 +74,7 @@ DEFAULTTUNE_virtclass-multilib-libv7nofp = "armv7nofp"
74AVAILTUNES += "armv7nofp" 74AVAILTUNES += "armv7nofp"
75PACKAGE_EXTRA_ARCHS_tune-armv7nofp = "${TUNE_PKGARCH_tune-armv7nofp}" 75PACKAGE_EXTRA_ARCHS_tune-armv7nofp = "${TUNE_PKGARCH_tune-armv7nofp}"
76BASE_LIB_tune-armv7nofp = "lib/thumb/v7/nofp" 76BASE_LIB_tune-armv7nofp = "lib/thumb/v7/nofp"
77TUNE_FEATURES_tune-armv7nofp = "arm" 77TUNE_FEATURES_tune-armv7nofp ="arm armrm"
78TUNE_CCARGS_tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft" 78TUNE_CCARGS_tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft"
79TUNE_PKGARCH_tune-armv7nofp = "armv7t" 79TUNE_PKGARCH_tune-armv7nofp = "armv7t"
80 80
@@ -86,7 +86,7 @@ DEFAULTTUNE_virtclass-multilib-libv7fpsoftfp = "armv7fpsoftfp"
86AVAILTUNES += "armv7fpsoftfp" 86AVAILTUNES += "armv7fpsoftfp"
87PACKAGE_EXTRA_ARCHS_tune-armv7fpsoftfp = "${TUNE_PKGARCH_tune-armv7fpsoftfp}" 87PACKAGE_EXTRA_ARCHS_tune-armv7fpsoftfp = "${TUNE_PKGARCH_tune-armv7fpsoftfp}"
88BASE_LIB_tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp" 88BASE_LIB_tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp"
89TUNE_FEATURES_tune-armv7fpsoftfp = "arm" 89TUNE_FEATURES_tune-armv7fpsoftfp ="arm armrm"
90TUNE_CCARGS_tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp" 90TUNE_CCARGS_tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp"
91TUNE_PKGARCH_tune-armv7fpsoftfp = "armv7fpt" 91TUNE_PKGARCH_tune-armv7fpsoftfp = "armv7fpt"
92 92
@@ -98,7 +98,7 @@ DEFAULTTUNE_virtclass-multilib-libv7fphard = "armv7fphard"
98AVAILTUNES += "armv7fphard" 98AVAILTUNES += "armv7fphard"
99PACKAGE_EXTRA_ARCHS_tune-armv7fphard = "${TUNE_PKGARCH_tune-armv7fphard}" 99PACKAGE_EXTRA_ARCHS_tune-armv7fphard = "${TUNE_PKGARCH_tune-armv7fphard}"
100BASE_LIB_tune-armv7fphard = "lib/thumb/v7+fp/hard" 100BASE_LIB_tune-armv7fphard = "lib/thumb/v7+fp/hard"
101TUNE_FEATURES_tune-armv7fphard = "arm" 101TUNE_FEATURES_tune-armv7fphard ="arm armrm"
102TUNE_CCARGS_tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard" 102TUNE_CCARGS_tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard"
103TUNE_PKGARCH_tune-armv7fphard = "armv7fpthf" 103TUNE_PKGARCH_tune-armv7fphard = "armv7fpthf"
104 104
@@ -114,7 +114,7 @@ EXTRA_OECONF_append_pn-libv6mnofp-newlib = " --disable-newlib-supplied-sysca
114AVAILTUNES += "armv6mnofp" 114AVAILTUNES += "armv6mnofp"
115PACKAGE_EXTRA_ARCHS_tune-armv6mnofp = "${TUNE_PKGARCH_tune-armv6mnofp}" 115PACKAGE_EXTRA_ARCHS_tune-armv6mnofp = "${TUNE_PKGARCH_tune-armv6mnofp}"
116BASE_LIB_tune-armv6mnofp = "lib/thumb/v6-m/nofp" 116BASE_LIB_tune-armv6mnofp = "lib/thumb/v6-m/nofp"
117TUNE_FEATURES_tune-armv6mnofp = "arm" 117TUNE_FEATURES_tune-armv6mnofp ="arm armrm"
118TUNE_CCARGS_tune-armv6mnofp = "-mthumb -march=armv6s-m -mfloat-abi=soft" 118TUNE_CCARGS_tune-armv6mnofp = "-mthumb -march=armv6s-m -mfloat-abi=soft"
119TUNE_PKGARCH_tune-armv6mnofp = "armv6smt" 119TUNE_PKGARCH_tune-armv6mnofp = "armv6smt"
120 120
@@ -126,7 +126,7 @@ DEFAULTTUNE_virtclass-multilib-libv7mnofp = "armv7mnofp"
126AVAILTUNES += "armv7mnofp" 126AVAILTUNES += "armv7mnofp"
127PACKAGE_EXTRA_ARCHS_tune-armv7mnofp = "${TUNE_PKGARCH_tune-armv7mnofp}" 127PACKAGE_EXTRA_ARCHS_tune-armv7mnofp = "${TUNE_PKGARCH_tune-armv7mnofp}"
128BASE_LIB_tune-armv7mnofp = "lib/thumb/v7-m/nofp" 128BASE_LIB_tune-armv7mnofp = "lib/thumb/v7-m/nofp"
129TUNE_FEATURES_tune-armv7mnofp = "arm" 129TUNE_FEATURES_tune-armv7mnofp ="arm armrm"
130TUNE_CCARGS_tune-armv7mnofp = "-mthumb -march=armv7-m -mfloat-abi=soft" 130TUNE_CCARGS_tune-armv7mnofp = "-mthumb -march=armv7-m -mfloat-abi=soft"
131TUNE_PKGARCH_tune-armv7mnofp = "armv7mt" 131TUNE_PKGARCH_tune-armv7mnofp = "armv7mt"
132 132
@@ -138,7 +138,7 @@ DEFAULTTUNE_virtclass-multilib-libv7emnofp = "armv7emnofp"
138AVAILTUNES += "armv7emnofp" 138AVAILTUNES += "armv7emnofp"
139PACKAGE_EXTRA_ARCHS_tune-armv7emnofp = "${TUNE_PKGARCH_tune-armv7emnofp}" 139PACKAGE_EXTRA_ARCHS_tune-armv7emnofp = "${TUNE_PKGARCH_tune-armv7emnofp}"
140BASE_LIB_tune-armv7emnofp = "lib/thumb/v7e-m/nofp" 140BASE_LIB_tune-armv7emnofp = "lib/thumb/v7e-m/nofp"
141TUNE_FEATURES_tune-armv7emnofp = "arm" 141TUNE_FEATURES_tune-armv7emnofp ="arm armrm"
142TUNE_CCARGS_tune-armv7emnofp = "-mthumb -march=armv7e-m -mfloat-abi=soft" 142TUNE_CCARGS_tune-armv7emnofp = "-mthumb -march=armv7e-m -mfloat-abi=soft"
143TUNE_PKGARCH_tune-armv7emnofp = "armv7emt" 143TUNE_PKGARCH_tune-armv7emnofp = "armv7emt"
144 144
@@ -150,7 +150,7 @@ DEFAULTTUNE_virtclass-multilib-libv7emfpsoftfp = "armv7emfpsoftfp"
150AVAILTUNES += "armv7emfpsoftfp" 150AVAILTUNES += "armv7emfpsoftfp"
151PACKAGE_EXTRA_ARCHS_tune-armv7emfpsoftfp = "${TUNE_PKGARCH_tune-armv7emfpsoftfp}" 151PACKAGE_EXTRA_ARCHS_tune-armv7emfpsoftfp = "${TUNE_PKGARCH_tune-armv7emfpsoftfp}"
152BASE_LIB_tune-armv7emfpsoftfp = "lib/thumb/v7e-m+fp/softfp" 152BASE_LIB_tune-armv7emfpsoftfp = "lib/thumb/v7e-m+fp/softfp"
153TUNE_FEATURES_tune-armv7emfpsoftfp = "arm" 153TUNE_FEATURES_tune-armv7emfpsoftfp ="arm armrm"
154TUNE_CCARGS_tune-armv7emfpsoftfp = "-mthumb -march=armv7e-m+fp -mfloat-abi=softfp" 154TUNE_CCARGS_tune-armv7emfpsoftfp = "-mthumb -march=armv7e-m+fp -mfloat-abi=softfp"
155TUNE_PKGARCH_tune-armv7emfpsoftfp = "armv7emfpt" 155TUNE_PKGARCH_tune-armv7emfpsoftfp = "armv7emfpt"
156 156
@@ -162,7 +162,7 @@ DEFAULTTUNE_virtclass-multilib-libv7emfphard = "armv7emfphard"
162AVAILTUNES += "armv7emfphard" 162AVAILTUNES += "armv7emfphard"
163PACKAGE_EXTRA_ARCHS_tune-armv7emfphard = "${TUNE_PKGARCH_tune-armv7emfphard}" 163PACKAGE_EXTRA_ARCHS_tune-armv7emfphard = "${TUNE_PKGARCH_tune-armv7emfphard}"
164BASE_LIB_tune-armv7emfphard = "lib/thumb/v7e-m+fp/hard" 164BASE_LIB_tune-armv7emfphard = "lib/thumb/v7e-m+fp/hard"
165TUNE_FEATURES_tune-armv7emfphard = "arm" 165TUNE_FEATURES_tune-armv7emfphard ="arm armrm"
166TUNE_CCARGS_tune-armv7emfphard = "-mthumb -march=armv7e-m+fp -mfloat-abi=hard" 166TUNE_CCARGS_tune-armv7emfphard = "-mthumb -march=armv7e-m+fp -mfloat-abi=hard"
167TUNE_PKGARCH_tune-armv7emfphard = "armv7emfpthf" 167TUNE_PKGARCH_tune-armv7emfphard = "armv7emfpthf"
168 168
@@ -174,7 +174,7 @@ DEFAULTTUNE_virtclass-multilib-libv7emdpsoftfp = "armv7emdpsoftfp"
174AVAILTUNES += "armv7emdpsoftfp" 174AVAILTUNES += "armv7emdpsoftfp"
175PACKAGE_EXTRA_ARCHS_tune-armv7emdpsoftfp = "${TUNE_PKGARCH_tune-armv7emdpsoftfp}" 175PACKAGE_EXTRA_ARCHS_tune-armv7emdpsoftfp = "${TUNE_PKGARCH_tune-armv7emdpsoftfp}"
176BASE_LIB_tune-armv7emdpsoftfp = "lib/thumb/v7e-m+dp/softfp" 176BASE_LIB_tune-armv7emdpsoftfp = "lib/thumb/v7e-m+dp/softfp"
177TUNE_FEATURES_tune-armv7emdpsoftfp = "arm" 177TUNE_FEATURES_tune-armv7emdpsoftfp ="arm armrm"
178TUNE_CCARGS_tune-armv7emdpsoftfp = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=softfp" 178TUNE_CCARGS_tune-armv7emdpsoftfp = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=softfp"
179TUNE_PKGARCH_tune-armv7emdpsoftfp = "armv7emdp" 179TUNE_PKGARCH_tune-armv7emdpsoftfp = "armv7emdp"
180 180
@@ -185,7 +185,7 @@ DEFAULTTUNE_virtclass-multilib-libv7emdphard = "armv7emdphard"
185AVAILTUNES += "armv7emdphard" 185AVAILTUNES += "armv7emdphard"
186PACKAGE_EXTRA_ARCHS_tune-armv7emdphard = "${TUNE_PKGARCH_tune-armv7emdphard}" 186PACKAGE_EXTRA_ARCHS_tune-armv7emdphard = "${TUNE_PKGARCH_tune-armv7emdphard}"
187BASE_LIB_tune-armv7emdphard = "lib/thumb/v7e-m+dp/hard" 187BASE_LIB_tune-armv7emdphard = "lib/thumb/v7e-m+dp/hard"
188TUNE_FEATURES_tune-armv7emdphard = "arm" 188TUNE_FEATURES_tune-armv7emdphard ="arm armrm"
189TUNE_CCARGS_tune-armv7emdphard = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=hard" 189TUNE_CCARGS_tune-armv7emdphard = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=hard"
190TUNE_PKGARCH_tune-armv7emdphard = "armv7emdpthf" 190TUNE_PKGARCH_tune-armv7emdphard = "armv7emdpthf"
191 191
@@ -201,7 +201,7 @@ EXTRA_OECONF_append_pn-libv8mbasenofp-newlib = " --disable-newlib-supplied-sysca
201AVAILTUNES += "armv8mbasenofp" 201AVAILTUNES += "armv8mbasenofp"
202PACKAGE_EXTRA_ARCHS_tune-armv8mbasenofp = "${TUNE_PKGARCH_tune-armv8mbasenofp}" 202PACKAGE_EXTRA_ARCHS_tune-armv8mbasenofp = "${TUNE_PKGARCH_tune-armv8mbasenofp}"
203BASE_LIB_tune-armv8mbasenofp = "lib/thumb/v8-m.base/nofp" 203BASE_LIB_tune-armv8mbasenofp = "lib/thumb/v8-m.base/nofp"
204TUNE_FEATURES_tune-armv8mbasenofp = "arm" 204TUNE_FEATURES_tune-armv8mbasenofp ="arm armrm"
205TUNE_CCARGS_tune-armv8mbasenofp = "-mthumb -march=armv8-m.base -mfloat-abi=soft" 205TUNE_CCARGS_tune-armv8mbasenofp = "-mthumb -march=armv8-m.base -mfloat-abi=soft"
206TUNE_PKGARCH_tune-armv8mbasenofp = "armv8mbaset" 206TUNE_PKGARCH_tune-armv8mbasenofp = "armv8mbaset"
207 207
@@ -212,7 +212,7 @@ DEFAULTTUNE_virtclass-multilib-libv8mmainnofp = "armv8mmainnofp"
212AVAILTUNES += "armv8mmainnofp" 212AVAILTUNES += "armv8mmainnofp"
213PACKAGE_EXTRA_ARCHS_tune-armv8mmainnofp = "${TUNE_PKGARCH_tune-armv8mmainnofp}" 213PACKAGE_EXTRA_ARCHS_tune-armv8mmainnofp = "${TUNE_PKGARCH_tune-armv8mmainnofp}"
214BASE_LIB_tune-armv8mmainnofp = "lib/thumb/v8-m.main/nofp" 214BASE_LIB_tune-armv8mmainnofp = "lib/thumb/v8-m.main/nofp"
215TUNE_FEATURES_tune-armv8mmainnofp = "arm" 215TUNE_FEATURES_tune-armv8mmainnofp ="arm armrm"
216TUNE_CCARGS_tune-armv8mmainnofp = "-mthumb -march=armv8-m.main -mfloat-abi=soft" 216TUNE_CCARGS_tune-armv8mmainnofp = "-mthumb -march=armv8-m.main -mfloat-abi=soft"
217TUNE_PKGARCH_tune-armv8mmainnofp = "armv8mmaint" 217TUNE_PKGARCH_tune-armv8mmainnofp = "armv8mmaint"
218 218
@@ -224,7 +224,7 @@ DEFAULTTUNE_virtclass-multilib-libv8mmainfpsoftfp = "armv8mmainfpsoftfp"
224AVAILTUNES += "armv8mmainfpsoftfp" 224AVAILTUNES += "armv8mmainfpsoftfp"
225PACKAGE_EXTRA_ARCHS_tune-armv8mmainfpsoftfp = "${TUNE_PKGARCH_tune-armv8mmainfpsoftfp}" 225PACKAGE_EXTRA_ARCHS_tune-armv8mmainfpsoftfp = "${TUNE_PKGARCH_tune-armv8mmainfpsoftfp}"
226BASE_LIB_tune-armv8mmainfpsoftfp = "lib/thumb/v8-m.main+fp/softfp" 226BASE_LIB_tune-armv8mmainfpsoftfp = "lib/thumb/v8-m.main+fp/softfp"
227TUNE_FEATURES_tune-armv8mmainfpsoftfp = "arm" 227TUNE_FEATURES_tune-armv8mmainfpsoftfp ="arm armrm"
228TUNE_CCARGS_tune-armv8mmainfpsoftfp = "-mthumb -march=armv8-m.main+fp -mfloat-abi=softfp" 228TUNE_CCARGS_tune-armv8mmainfpsoftfp = "-mthumb -march=armv8-m.main+fp -mfloat-abi=softfp"
229TUNE_PKGARCH_tune-armv8mmainfpsoftfp = "armv8mmainfpt" 229TUNE_PKGARCH_tune-armv8mmainfpsoftfp = "armv8mmainfpt"
230 230
@@ -235,7 +235,7 @@ DEFAULTTUNE_virtclass-multilib-libv8mmainfphard = "armv8mmainfphard"
235AVAILTUNES += "armv8mmainfphard" 235AVAILTUNES += "armv8mmainfphard"
236PACKAGE_EXTRA_ARCHS_tune-armv8mmainfphard = "${TUNE_PKGARCH_tune-armv8mmainfphard}" 236PACKAGE_EXTRA_ARCHS_tune-armv8mmainfphard = "${TUNE_PKGARCH_tune-armv8mmainfphard}"
237BASE_LIB_tune-armv8mmainfphard = "lib/thumb/v8-m.main+fp/hard" 237BASE_LIB_tune-armv8mmainfphard = "lib/thumb/v8-m.main+fp/hard"
238TUNE_FEATURES_tune-armv8mmainfphard = "arm" 238TUNE_FEATURES_tune-armv8mmainfphard ="arm armrm"
239TUNE_CCARGS_tune-armv8mmainfphard = "-mthumb -march=armv8-m.main+fp -mfloat-abi=hard" 239TUNE_CCARGS_tune-armv8mmainfphard = "-mthumb -march=armv8-m.main+fp -mfloat-abi=hard"
240TUNE_PKGARCH_tune-armv8mmainfphard = "armv8mmainfpthf" 240TUNE_PKGARCH_tune-armv8mmainfphard = "armv8mmainfpthf"
241 241
@@ -247,7 +247,7 @@ DEFAULTTUNE_virtclass-multilib-libv8mmaindpsoftfp = "armv8mmaindpsoftfp"
247AVAILTUNES += "armv8mmaindpsoftfp" 247AVAILTUNES += "armv8mmaindpsoftfp"
248PACKAGE_EXTRA_ARCHS_tune-armv8mmaindpsoftfp = "${TUNE_PKGARCH_tune-armv8mmaindpsoftfp}" 248PACKAGE_EXTRA_ARCHS_tune-armv8mmaindpsoftfp = "${TUNE_PKGARCH_tune-armv8mmaindpsoftfp}"
249BASE_LIB_tune-armv8mmaindpsoftfp = "lib/thumb/v8-m.main+dp/softfp" 249BASE_LIB_tune-armv8mmaindpsoftfp = "lib/thumb/v8-m.main+dp/softfp"
250TUNE_FEATURES_tune-armv8mmaindpsoftfp = "arm" 250TUNE_FEATURES_tune-armv8mmaindpsoftfp ="arm armrm"
251TUNE_CCARGS_tune-armv8mmaindpsoftfp = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=softfp" 251TUNE_CCARGS_tune-armv8mmaindpsoftfp = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=softfp"
252TUNE_PKGARCH_tune-armv8mmaindpsoftfp = "armv8mmainfpdpt" 252TUNE_PKGARCH_tune-armv8mmaindpsoftfp = "armv8mmainfpdpt"
253 253
@@ -259,6 +259,6 @@ DEFAULTTUNE_virtclass-multilib-libv8mmaindphard = "armv8mmaindphard"
259AVAILTUNES += "armv8mmaindphard" 259AVAILTUNES += "armv8mmaindphard"
260PACKAGE_EXTRA_ARCHS_tune-armv8mmaindphard = "${TUNE_PKGARCH_tune-armv8mmaindphard}" 260PACKAGE_EXTRA_ARCHS_tune-armv8mmaindphard = "${TUNE_PKGARCH_tune-armv8mmaindphard}"
261BASE_LIB_tune-armv8mmaindphard = "lib/thumb/v8-m.main+dp/hard" 261BASE_LIB_tune-armv8mmaindphard = "lib/thumb/v8-m.main+dp/hard"
262TUNE_FEATURES_tune-armv8mmaindphard = "arm" 262TUNE_FEATURES_tune-armv8mmaindphard ="arm armrm"
263TUNE_CCARGS_tune-armv8mmaindphard = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=hard" 263TUNE_CCARGS_tune-armv8mmaindphard = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=hard"
264TUNE_PKGARCH_tune-armv8mmaindphard = "armv8mmainfpdpthf" 264TUNE_PKGARCH_tune-armv8mmaindphard = "armv8mmainfpdpthf"
diff --git a/meta-xilinx-bsp/conf/machine/cortexr5-versal.conf b/meta-xilinx-bsp/conf/machine/cortexr5-versal.conf
index 05bc28fd..132db5f7 100644
--- a/meta-xilinx-bsp/conf/machine/cortexr5-versal.conf
+++ b/meta-xilinx-bsp/conf/machine/cortexr5-versal.conf
@@ -1,17 +1,6 @@
1DEFAULTTUNE ?= "cortexr5" 1DEFAULTTUNE ?= "cortexr5"
2 2
3require conf/machine/include/arm/arch-arm.inc 3require tune-cortexrm.inc
4
5TUNEVALID[cortexr5] = "Enable Cortex-r5 specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -mcpu=cortex-r5', '', d)}"
7
8AVAILTUNES += "cortexr5"
9
10ARMPKGARCH_tune-cortexr5 = "cortexr5"
11
12TUNE_FEATURES_tune-cortexr5 = "cortexr5"
13
14#PACKAGE_EXTRA_ARCHS_tune-cortexr5 = "cortexr5"
15 4
16SOC_FAMILY = "versal" 5SOC_FAMILY = "versal"
17 6
diff --git a/meta-xilinx-bsp/conf/machine/cortexr5-zynqmp.conf b/meta-xilinx-bsp/conf/machine/cortexr5-zynqmp.conf
index 58804bfe..ccc80e90 100644
--- a/meta-xilinx-bsp/conf/machine/cortexr5-zynqmp.conf
+++ b/meta-xilinx-bsp/conf/machine/cortexr5-zynqmp.conf
@@ -1,17 +1,6 @@
1DEFAULTTUNE ?= "cortexr5" 1DEFAULTTUNE ?= "cortexr5"
2 2
3require conf/machine/include/arm/arch-arm.inc 3require tune-cortexrm.inc
4
5TUNEVALID[cortexr5] = "Enable Cortex-r5 specific processor optimizations"
6TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -mcpu=cortex-r5', '', d)}"
7
8AVAILTUNES += "cortexr5"
9
10ARMPKGARCH_tune-cortexr5 = "cortexr5"
11
12TUNE_FEATURES_tune-cortexr5 = "cortexr5"
13
14#PACKAGE_EXTRA_ARCHS_tune-cortexr5 = "cortexr5"
15 4
16SOC_FAMILY = "zynqmp" 5SOC_FAMILY = "zynqmp"
17 6
diff --git a/meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc b/meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc
new file mode 100644
index 00000000..b1826210
--- /dev/null
+++ b/meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc
@@ -0,0 +1,14 @@
1DEFAULTTUNE ?= "cortexr5"
2
3require conf/machine/include/arm/arch-armv8a.inc
4
5TUNEVALID[armrm] = "Enable ARM Cortex-R/M Family"
6MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armrm', 'armrm:', '' ,d)}"
7
8TUNEVALID[cortexr5] = "Enable Cortex-r5 specific processor optimizations"
9TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -mcpu=cortex-r5', '', d)}"
10
11AVAILTUNES += "cortexr5"
12TUNE_FEATURES_tune-cortexr5 = "armrm cortexr5"
13ARMPKGARCH_tune-cortexr5 = "cortexr5"
14
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2026-07-29 22:13:43 +0000