diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2021-12-18 10:20:35 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2021-12-20 10:28:42 -0800 |
commit | 6a1c662f40c11fcd26bafb53aaf190c0791d8ce2 (patch) | |
tree | c664d5d610f0e6b15b80929491a5c5b74977189c | |
parent | 655838703ddaf610dce8e1e61ee61bd6defb03bf (diff) | |
download | meta-xilinx-6a1c662f40c11fcd26bafb53aaf190c0791d8ce2.tar.gz |
Remove cortexrm tune, as Yocto Project now has cortex-r tunes
armrm override is now replaced by armv7r and armv8r overrides. Adjust
recipes to match the new usage.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
6 files changed, 59 insertions, 59 deletions
diff --git a/meta-xilinx-bsp/conf/machine/include/soc-tune-include.inc b/meta-xilinx-bsp/conf/machine/include/soc-tune-include.inc index 66ab6158..810ad9e9 100644 --- a/meta-xilinx-bsp/conf/machine/include/soc-tune-include.inc +++ b/meta-xilinx-bsp/conf/machine/include/soc-tune-include.inc | |||
@@ -1,7 +1,6 @@ | |||
1 | # Unfortunately various tunefiles don't include each other, so create | 1 | # Unfortunately various tunefiles don't include each other, so create |
2 | # a list of things to require based on the DEFAULTTUNE setting. | 2 | # a list of things to require based on the DEFAULTTUNE setting. |
3 | TUNEFILE[cortexr5] = "conf/machine/include/tune-cortexrm.inc" | 3 | TUNEFILE[cortexr5] = "conf/machine/include/arm/armv7r/tune-cortexr5.inc" |
4 | TUNEFILE[cortexr5f] = "conf/machine/include/tune-cortexrm.inc" | ||
5 | TUNEFILE[cortexa9thf-neon] = "conf/machine/include/arm/armv7a/tune-cortexa9.inc" | 4 | TUNEFILE[cortexa9thf-neon] = "conf/machine/include/arm/armv7a/tune-cortexa9.inc" |
6 | TUNEFILE[cortexa53] = "conf/machine/include/arm/armv8a/tune-cortexa53.inc" | 5 | TUNEFILE[cortexa53] = "conf/machine/include/arm/armv8a/tune-cortexa53.inc" |
7 | TUNEFILE[cortexa72] = "conf/machine/include/arm/armv8a/tune-cortexa72.inc" | 6 | TUNEFILE[cortexa72] = "conf/machine/include/arm/armv8a/tune-cortexa72.inc" |
diff --git a/meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc b/meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc deleted file mode 100644 index e415209b..00000000 --- a/meta-xilinx-bsp/conf/machine/include/tune-cortexrm.inc +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | DEFAULTTUNE ?= "cortexr5" | ||
2 | |||
3 | require conf/machine/include/arm/arch-armv8a.inc | ||
4 | |||
5 | TUNEVALID[armrm] = "Enable ARM Cortex-R/M Family" | ||
6 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armrm', 'armrm:', '' ,d)}" | ||
7 | |||
8 | TUNEVALID[cortexr5] = "Enable Cortex-r5 specific processor optimizations" | ||
9 | TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -mcpu=cortex-r5', '', d)}" | ||
10 | |||
11 | AVAILTUNES += "cortexr5" | ||
12 | ARMPKGARCH:tune-cortexr5 = "cortexr5" | ||
13 | |||
14 | TUNE_FEATURES:tune-cortexr5 = "armrm cortexr5" | ||
15 | PACKAGE_EXTRA_ARCHS:tune-cortexr5 = "${TUNE_PKGARCH}" | ||
16 | |||
17 | AVAILTUNES += "cortexr5f" | ||
18 | ARMPKGARCH:tune-cortexr5f = "cortexr5f" | ||
19 | |||
20 | TUNE_FEATURES:tune-cortexr5f = "armrm cortexr5 vfpv3d16 callconvention-hard" | ||
21 | PACKAGE_EXTRA_ARCHS:tune-cortexr5f = "${TUNE_PKGARCH}" | ||
diff --git a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend index 9912b020..32174711 100644 --- a/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend +++ b/meta-xilinx-standalone-experimental/recipes-bsp/embeddedsw/fsbl-firmware_git.bbappend | |||
@@ -44,4 +44,4 @@ ESW_COMPONENT:zynq = "zynq_fsbl.elf" | |||
44 | ESW_COMPONENT:zynqmp = "zynqmp_fsbl.elf" | 44 | ESW_COMPONENT:zynqmp = "zynqmp_fsbl.elf" |
45 | 45 | ||
46 | CFLAGS:append:aarch64 = " -DARMA53_64" | 46 | CFLAGS:append:aarch64 = " -DARMA53_64" |
47 | CFLAGS:append:armrm = " -DARMR5" | 47 | CFLAGS:append:armv7r = " -DARMR5" |
diff --git a/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf b/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf index d8e68e4f..a3a07768 100644 --- a/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf +++ b/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf | |||
@@ -1,7 +1,17 @@ | |||
1 | require conf/multilib.conf | 1 | require conf/multilib.conf |
2 | require conf/machine/include/tune-cortexrm.inc | 2 | require conf/machine/include/arm/arch-armv8r.inc |
3 | require conf/machine/include/baremetal-tc.conf | 3 | require conf/machine/include/baremetal-tc.conf |
4 | 4 | ||
5 | # Since we're combining armv7r and armv8r into a single set of multilibs, | ||
6 | # copy the following machine setting to make sure it's available | ||
7 | # From conf/machine/include/arm/arch-armv7r.inc | ||
8 | |||
9 | TUNEVALID[armv7r] = "Enable instructions for ARMv7-r" | ||
10 | TUNE_CCARGS_MARCH = "${@bb.utils.contains('TUNE_FEATURES', 'armv7r', ' -march=armv7-r', '', d)}" | ||
11 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv7r', 'armv7r:', '', d)}" | ||
12 | TUNECONFLICTS[armv7r] = "armv4 armv5 armv6 armv7a" | ||
13 | |||
14 | |||
5 | # Define all of the multilibs supproted by this configuration | 15 | # Define all of the multilibs supproted by this configuration |
6 | MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" | 16 | MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" |
7 | 17 | ||
@@ -21,14 +31,14 @@ TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}" | |||
21 | 31 | ||
22 | # Base configuration | 32 | # Base configuration |
23 | # CFLAGS: | 33 | # CFLAGS: |
24 | DEFAULTTUNE = "armrm" | 34 | DEFAULTTUNE = "armv7r" |
25 | 35 | ||
26 | AVAILTUNES += "armrm" | 36 | AVAILTUNES += "armv7r" |
27 | PACKAGE_EXTRA_ARCHS:tune-armrm = "${TUNE_PKGARCH:tune-armrm}" | 37 | PACKAGE_EXTRA_ARCHS:tune-armv7r = "${TUNE_PKGARCH:tune-armv7r}" |
28 | BASE_LIB:tune-armrm = "lib" | 38 | BASE_LIB:tune-armv7r = "lib" |
29 | TUNE_FEATURES:tune-armrm = "arm armrm" | 39 | TUNE_FEATURES:tune-armv7r = "arm armv7r" |
30 | TUNE_CCARGS:tune-armrm = "" | 40 | TUNE_CCARGS:tune-armv7r = "" |
31 | TUNE_PKGARCH:tune-armrm = "armrm" | 41 | TUNE_PKGARCH:tune-armv7r = "armv7r" |
32 | 42 | ||
33 | 43 | ||
34 | # arm/v5te/softfp | 44 | # arm/v5te/softfp |
@@ -38,7 +48,7 @@ DEFAULTTUNE:virtclass-multilib-libarmv5tesoftfp = "armv5tesoftfp" | |||
38 | AVAILTUNES += "armv5tesoftfp" | 48 | AVAILTUNES += "armv5tesoftfp" |
39 | PACKAGE_EXTRA_ARCHS:tune-armv5tesoftfp = "${TUNE_PKGARCH:tune-armv5tesoftfp}" | 49 | PACKAGE_EXTRA_ARCHS:tune-armv5tesoftfp = "${TUNE_PKGARCH:tune-armv5tesoftfp}" |
40 | BASE_LIB:tune-armv5tesoftfp = "lib/arm/v5te/softfp" | 50 | BASE_LIB:tune-armv5tesoftfp = "lib/arm/v5te/softfp" |
41 | TUNE_FEATURES:tune-armv5tesoftfp = "arm armrm" | 51 | TUNE_FEATURES:tune-armv5tesoftfp = "arm armv7r" |
42 | TUNE_CCARGS:tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp" | 52 | TUNE_CCARGS:tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp" |
43 | TUNE_PKGARCH:tune-armv5tesoftfp = "armv5tefp" | 53 | TUNE_PKGARCH:tune-armv5tesoftfp = "armv5tefp" |
44 | 54 | ||
@@ -50,7 +60,7 @@ DEFAULTTUNE:virtclass-multilib-libarmv5tehard = "armv5tehard" | |||
50 | AVAILTUNES += "armv5tehard" | 60 | AVAILTUNES += "armv5tehard" |
51 | PACKAGE_EXTRA_ARCHS:tune-armv5tehard = "${TUNE_PKGARCH:tune-armv5tehard}" | 61 | PACKAGE_EXTRA_ARCHS:tune-armv5tehard = "${TUNE_PKGARCH:tune-armv5tehard}" |
52 | BASE_LIB:tune-armv5tehard = "lib/arm/v5te/hard" | 62 | BASE_LIB:tune-armv5tehard = "lib/arm/v5te/hard" |
53 | TUNE_FEATURES:tune-armv5tehard = "arm armrm" | 63 | TUNE_FEATURES:tune-armv5tehard = "arm armv7r" |
54 | TUNE_CCARGS:tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard" | 64 | TUNE_CCARGS:tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard" |
55 | TUNE_PKGARCH:tune-armv5tehard = "armv5tefphf" | 65 | TUNE_PKGARCH:tune-armv5tehard = "armv5tefphf" |
56 | 66 | ||
@@ -62,7 +72,7 @@ DEFAULTTUNE:virtclass-multilib-libnofp = "armnofp" | |||
62 | AVAILTUNES += "armnofp" | 72 | AVAILTUNES += "armnofp" |
63 | PACKAGE_EXTRA_ARCHS:tune-armnofp = "${TUNE_PKGARCH:tune-armnofp}" | 73 | PACKAGE_EXTRA_ARCHS:tune-armnofp = "${TUNE_PKGARCH:tune-armnofp}" |
64 | BASE_LIB:tune-armnofp = "lib/thumb/nofp" | 74 | BASE_LIB:tune-armnofp = "lib/thumb/nofp" |
65 | TUNE_FEATURES:tune-armnofp = "arm armrm" | 75 | TUNE_FEATURES:tune-armnofp = "arm armv7r" |
66 | TUNE_CCARGS:tune-armnofp = "-mthumb -mfloat-abi=soft" | 76 | TUNE_CCARGS:tune-armnofp = "-mthumb -mfloat-abi=soft" |
67 | TUNE_PKGARCH:tune-armnofp = "armt" | 77 | TUNE_PKGARCH:tune-armnofp = "armt" |
68 | 78 | ||
@@ -74,7 +84,7 @@ DEFAULTTUNE:virtclass-multilib-libv7nofp = "armv7nofp" | |||
74 | AVAILTUNES += "armv7nofp" | 84 | AVAILTUNES += "armv7nofp" |
75 | PACKAGE_EXTRA_ARCHS:tune-armv7nofp = "${TUNE_PKGARCH:tune-armv7nofp}" | 85 | PACKAGE_EXTRA_ARCHS:tune-armv7nofp = "${TUNE_PKGARCH:tune-armv7nofp}" |
76 | BASE_LIB:tune-armv7nofp = "lib/thumb/v7/nofp" | 86 | BASE_LIB:tune-armv7nofp = "lib/thumb/v7/nofp" |
77 | TUNE_FEATURES:tune-armv7nofp ="arm armrm" | 87 | TUNE_FEATURES:tune-armv7nofp ="arm armv7r" |
78 | TUNE_CCARGS:tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft" | 88 | TUNE_CCARGS:tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft" |
79 | TUNE_PKGARCH:tune-armv7nofp = "armv7t" | 89 | TUNE_PKGARCH:tune-armv7nofp = "armv7t" |
80 | 90 | ||
@@ -86,7 +96,7 @@ DEFAULTTUNE:virtclass-multilib-libv7fpsoftfp = "armv7fpsoftfp" | |||
86 | AVAILTUNES += "armv7fpsoftfp" | 96 | AVAILTUNES += "armv7fpsoftfp" |
87 | PACKAGE_EXTRA_ARCHS:tune-armv7fpsoftfp = "${TUNE_PKGARCH:tune-armv7fpsoftfp}" | 97 | PACKAGE_EXTRA_ARCHS:tune-armv7fpsoftfp = "${TUNE_PKGARCH:tune-armv7fpsoftfp}" |
88 | BASE_LIB:tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp" | 98 | BASE_LIB:tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp" |
89 | TUNE_FEATURES:tune-armv7fpsoftfp ="arm armrm" | 99 | TUNE_FEATURES:tune-armv7fpsoftfp ="arm armv7r" |
90 | TUNE_CCARGS:tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp" | 100 | TUNE_CCARGS:tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp" |
91 | TUNE_PKGARCH:tune-armv7fpsoftfp = "armv7fpt" | 101 | TUNE_PKGARCH:tune-armv7fpsoftfp = "armv7fpt" |
92 | 102 | ||
@@ -98,7 +108,7 @@ DEFAULTTUNE:virtclass-multilib-libv7fphard = "armv7fphard" | |||
98 | AVAILTUNES += "armv7fphard" | 108 | AVAILTUNES += "armv7fphard" |
99 | PACKAGE_EXTRA_ARCHS:tune-armv7fphard = "${TUNE_PKGARCH:tune-armv7fphard}" | 109 | PACKAGE_EXTRA_ARCHS:tune-armv7fphard = "${TUNE_PKGARCH:tune-armv7fphard}" |
100 | BASE_LIB:tune-armv7fphard = "lib/thumb/v7+fp/hard" | 110 | BASE_LIB:tune-armv7fphard = "lib/thumb/v7+fp/hard" |
101 | TUNE_FEATURES:tune-armv7fphard ="arm armrm" | 111 | TUNE_FEATURES:tune-armv7fphard ="arm armv7r" |
102 | TUNE_CCARGS:tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard" | 112 | TUNE_CCARGS:tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard" |
103 | TUNE_PKGARCH:tune-armv7fphard = "armv7fpthf" | 113 | TUNE_PKGARCH:tune-armv7fphard = "armv7fpthf" |
104 | 114 | ||
@@ -114,7 +124,7 @@ EXTRA_OECONF:append:pn-libv6mnofp-newlib = " --disable-newlib-supplied-sysca | |||
114 | AVAILTUNES += "armv6mnofp" | 124 | AVAILTUNES += "armv6mnofp" |
115 | PACKAGE_EXTRA_ARCHS:tune-armv6mnofp = "${TUNE_PKGARCH:tune-armv6mnofp}" | 125 | PACKAGE_EXTRA_ARCHS:tune-armv6mnofp = "${TUNE_PKGARCH:tune-armv6mnofp}" |
116 | BASE_LIB:tune-armv6mnofp = "lib/thumb/v6-m/nofp" | 126 | BASE_LIB:tune-armv6mnofp = "lib/thumb/v6-m/nofp" |
117 | TUNE_FEATURES:tune-armv6mnofp ="arm armrm" | 127 | TUNE_FEATURES:tune-armv6mnofp ="arm armv7r" |
118 | TUNE_CCARGS:tune-armv6mnofp = "-mthumb -march=armv6s-m -mfloat-abi=soft" | 128 | TUNE_CCARGS:tune-armv6mnofp = "-mthumb -march=armv6s-m -mfloat-abi=soft" |
119 | TUNE_PKGARCH:tune-armv6mnofp = "armv6smt" | 129 | TUNE_PKGARCH:tune-armv6mnofp = "armv6smt" |
120 | 130 | ||
@@ -126,7 +136,7 @@ DEFAULTTUNE:virtclass-multilib-libv7mnofp = "armv7mnofp" | |||
126 | AVAILTUNES += "armv7mnofp" | 136 | AVAILTUNES += "armv7mnofp" |
127 | PACKAGE_EXTRA_ARCHS:tune-armv7mnofp = "${TUNE_PKGARCH:tune-armv7mnofp}" | 137 | PACKAGE_EXTRA_ARCHS:tune-armv7mnofp = "${TUNE_PKGARCH:tune-armv7mnofp}" |
128 | BASE_LIB:tune-armv7mnofp = "lib/thumb/v7-m/nofp" | 138 | BASE_LIB:tune-armv7mnofp = "lib/thumb/v7-m/nofp" |
129 | TUNE_FEATURES:tune-armv7mnofp ="arm armrm" | 139 | TUNE_FEATURES:tune-armv7mnofp ="arm armv7r" |
130 | TUNE_CCARGS:tune-armv7mnofp = "-mthumb -march=armv7-m -mfloat-abi=soft" | 140 | TUNE_CCARGS:tune-armv7mnofp = "-mthumb -march=armv7-m -mfloat-abi=soft" |
131 | TUNE_PKGARCH:tune-armv7mnofp = "armv7mt" | 141 | TUNE_PKGARCH:tune-armv7mnofp = "armv7mt" |
132 | 142 | ||
@@ -138,7 +148,7 @@ DEFAULTTUNE:virtclass-multilib-libv7emnofp = "armv7emnofp" | |||
138 | AVAILTUNES += "armv7emnofp" | 148 | AVAILTUNES += "armv7emnofp" |
139 | PACKAGE_EXTRA_ARCHS:tune-armv7emnofp = "${TUNE_PKGARCH:tune-armv7emnofp}" | 149 | PACKAGE_EXTRA_ARCHS:tune-armv7emnofp = "${TUNE_PKGARCH:tune-armv7emnofp}" |
140 | BASE_LIB:tune-armv7emnofp = "lib/thumb/v7e-m/nofp" | 150 | BASE_LIB:tune-armv7emnofp = "lib/thumb/v7e-m/nofp" |
141 | TUNE_FEATURES:tune-armv7emnofp ="arm armrm" | 151 | TUNE_FEATURES:tune-armv7emnofp ="arm armv7r" |
142 | TUNE_CCARGS:tune-armv7emnofp = "-mthumb -march=armv7e-m -mfloat-abi=soft" | 152 | TUNE_CCARGS:tune-armv7emnofp = "-mthumb -march=armv7e-m -mfloat-abi=soft" |
143 | TUNE_PKGARCH:tune-armv7emnofp = "armv7emt" | 153 | TUNE_PKGARCH:tune-armv7emnofp = "armv7emt" |
144 | 154 | ||
@@ -150,7 +160,7 @@ DEFAULTTUNE:virtclass-multilib-libv7emfpsoftfp = "armv7emfpsoftfp" | |||
150 | AVAILTUNES += "armv7emfpsoftfp" | 160 | AVAILTUNES += "armv7emfpsoftfp" |
151 | PACKAGE_EXTRA_ARCHS:tune-armv7emfpsoftfp = "${TUNE_PKGARCH:tune-armv7emfpsoftfp}" | 161 | PACKAGE_EXTRA_ARCHS:tune-armv7emfpsoftfp = "${TUNE_PKGARCH:tune-armv7emfpsoftfp}" |
152 | BASE_LIB:tune-armv7emfpsoftfp = "lib/thumb/v7e-m+fp/softfp" | 162 | BASE_LIB:tune-armv7emfpsoftfp = "lib/thumb/v7e-m+fp/softfp" |
153 | TUNE_FEATURES:tune-armv7emfpsoftfp ="arm armrm" | 163 | TUNE_FEATURES:tune-armv7emfpsoftfp ="arm armv7r" |
154 | TUNE_CCARGS:tune-armv7emfpsoftfp = "-mthumb -march=armv7e-m+fp -mfloat-abi=softfp" | 164 | TUNE_CCARGS:tune-armv7emfpsoftfp = "-mthumb -march=armv7e-m+fp -mfloat-abi=softfp" |
155 | TUNE_PKGARCH:tune-armv7emfpsoftfp = "armv7emfpt" | 165 | TUNE_PKGARCH:tune-armv7emfpsoftfp = "armv7emfpt" |
156 | 166 | ||
@@ -162,7 +172,7 @@ DEFAULTTUNE:virtclass-multilib-libv7emfphard = "armv7emfphard" | |||
162 | AVAILTUNES += "armv7emfphard" | 172 | AVAILTUNES += "armv7emfphard" |
163 | PACKAGE_EXTRA_ARCHS:tune-armv7emfphard = "${TUNE_PKGARCH:tune-armv7emfphard}" | 173 | PACKAGE_EXTRA_ARCHS:tune-armv7emfphard = "${TUNE_PKGARCH:tune-armv7emfphard}" |
164 | BASE_LIB:tune-armv7emfphard = "lib/thumb/v7e-m+fp/hard" | 174 | BASE_LIB:tune-armv7emfphard = "lib/thumb/v7e-m+fp/hard" |
165 | TUNE_FEATURES:tune-armv7emfphard ="arm armrm" | 175 | TUNE_FEATURES:tune-armv7emfphard ="arm armv7r" |
166 | TUNE_CCARGS:tune-armv7emfphard = "-mthumb -march=armv7e-m+fp -mfloat-abi=hard" | 176 | TUNE_CCARGS:tune-armv7emfphard = "-mthumb -march=armv7e-m+fp -mfloat-abi=hard" |
167 | TUNE_PKGARCH:tune-armv7emfphard = "armv7emfpthf" | 177 | TUNE_PKGARCH:tune-armv7emfphard = "armv7emfpthf" |
168 | 178 | ||
@@ -174,7 +184,7 @@ DEFAULTTUNE:virtclass-multilib-libv7emdpsoftfp = "armv7emdpsoftfp" | |||
174 | AVAILTUNES += "armv7emdpsoftfp" | 184 | AVAILTUNES += "armv7emdpsoftfp" |
175 | PACKAGE_EXTRA_ARCHS:tune-armv7emdpsoftfp = "${TUNE_PKGARCH:tune-armv7emdpsoftfp}" | 185 | PACKAGE_EXTRA_ARCHS:tune-armv7emdpsoftfp = "${TUNE_PKGARCH:tune-armv7emdpsoftfp}" |
176 | BASE_LIB:tune-armv7emdpsoftfp = "lib/thumb/v7e-m+dp/softfp" | 186 | BASE_LIB:tune-armv7emdpsoftfp = "lib/thumb/v7e-m+dp/softfp" |
177 | TUNE_FEATURES:tune-armv7emdpsoftfp ="arm armrm" | 187 | TUNE_FEATURES:tune-armv7emdpsoftfp ="arm armv7r" |
178 | TUNE_CCARGS:tune-armv7emdpsoftfp = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=softfp" | 188 | TUNE_CCARGS:tune-armv7emdpsoftfp = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=softfp" |
179 | TUNE_PKGARCH:tune-armv7emdpsoftfp = "armv7emdp" | 189 | TUNE_PKGARCH:tune-armv7emdpsoftfp = "armv7emdp" |
180 | 190 | ||
@@ -185,7 +195,7 @@ DEFAULTTUNE:virtclass-multilib-libv7emdphard = "armv7emdphard" | |||
185 | AVAILTUNES += "armv7emdphard" | 195 | AVAILTUNES += "armv7emdphard" |
186 | PACKAGE_EXTRA_ARCHS:tune-armv7emdphard = "${TUNE_PKGARCH:tune-armv7emdphard}" | 196 | PACKAGE_EXTRA_ARCHS:tune-armv7emdphard = "${TUNE_PKGARCH:tune-armv7emdphard}" |
187 | BASE_LIB:tune-armv7emdphard = "lib/thumb/v7e-m+dp/hard" | 197 | BASE_LIB:tune-armv7emdphard = "lib/thumb/v7e-m+dp/hard" |
188 | TUNE_FEATURES:tune-armv7emdphard ="arm armrm" | 198 | TUNE_FEATURES:tune-armv7emdphard ="arm armv7r" |
189 | TUNE_CCARGS:tune-armv7emdphard = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=hard" | 199 | TUNE_CCARGS:tune-armv7emdphard = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=hard" |
190 | TUNE_PKGARCH:tune-armv7emdphard = "armv7emdpthf" | 200 | TUNE_PKGARCH:tune-armv7emdphard = "armv7emdpthf" |
191 | 201 | ||
@@ -201,7 +211,7 @@ EXTRA_OECONF:append:pn-libv8mbasenofp-newlib = " --disable-newlib-supplied-sysca | |||
201 | AVAILTUNES += "armv8mbasenofp" | 211 | AVAILTUNES += "armv8mbasenofp" |
202 | PACKAGE_EXTRA_ARCHS:tune-armv8mbasenofp = "${TUNE_PKGARCH:tune-armv8mbasenofp}" | 212 | PACKAGE_EXTRA_ARCHS:tune-armv8mbasenofp = "${TUNE_PKGARCH:tune-armv8mbasenofp}" |
203 | BASE_LIB:tune-armv8mbasenofp = "lib/thumb/v8-m.base/nofp" | 213 | BASE_LIB:tune-armv8mbasenofp = "lib/thumb/v8-m.base/nofp" |
204 | TUNE_FEATURES:tune-armv8mbasenofp ="arm armrm" | 214 | TUNE_FEATURES:tune-armv8mbasenofp ="arm armv8r" |
205 | TUNE_CCARGS:tune-armv8mbasenofp = "-mthumb -march=armv8-m.base -mfloat-abi=soft" | 215 | TUNE_CCARGS:tune-armv8mbasenofp = "-mthumb -march=armv8-m.base -mfloat-abi=soft" |
206 | TUNE_PKGARCH:tune-armv8mbasenofp = "armv8mbaset" | 216 | TUNE_PKGARCH:tune-armv8mbasenofp = "armv8mbaset" |
207 | 217 | ||
@@ -212,7 +222,7 @@ DEFAULTTUNE:virtclass-multilib-libv8mmainnofp = "armv8mmainnofp" | |||
212 | AVAILTUNES += "armv8mmainnofp" | 222 | AVAILTUNES += "armv8mmainnofp" |
213 | PACKAGE_EXTRA_ARCHS:tune-armv8mmainnofp = "${TUNE_PKGARCH:tune-armv8mmainnofp}" | 223 | PACKAGE_EXTRA_ARCHS:tune-armv8mmainnofp = "${TUNE_PKGARCH:tune-armv8mmainnofp}" |
214 | BASE_LIB:tune-armv8mmainnofp = "lib/thumb/v8-m.main/nofp" | 224 | BASE_LIB:tune-armv8mmainnofp = "lib/thumb/v8-m.main/nofp" |
215 | TUNE_FEATURES:tune-armv8mmainnofp ="arm armrm" | 225 | TUNE_FEATURES:tune-armv8mmainnofp ="arm armv8r" |
216 | TUNE_CCARGS:tune-armv8mmainnofp = "-mthumb -march=armv8-m.main -mfloat-abi=soft" | 226 | TUNE_CCARGS:tune-armv8mmainnofp = "-mthumb -march=armv8-m.main -mfloat-abi=soft" |
217 | TUNE_PKGARCH:tune-armv8mmainnofp = "armv8mmaint" | 227 | TUNE_PKGARCH:tune-armv8mmainnofp = "armv8mmaint" |
218 | 228 | ||
@@ -224,7 +234,7 @@ DEFAULTTUNE:virtclass-multilib-libv8mmainfpsoftfp = "armv8mmainfpsoftfp" | |||
224 | AVAILTUNES += "armv8mmainfpsoftfp" | 234 | AVAILTUNES += "armv8mmainfpsoftfp" |
225 | PACKAGE_EXTRA_ARCHS:tune-armv8mmainfpsoftfp = "${TUNE_PKGARCH:tune-armv8mmainfpsoftfp}" | 235 | PACKAGE_EXTRA_ARCHS:tune-armv8mmainfpsoftfp = "${TUNE_PKGARCH:tune-armv8mmainfpsoftfp}" |
226 | BASE_LIB:tune-armv8mmainfpsoftfp = "lib/thumb/v8-m.main+fp/softfp" | 236 | BASE_LIB:tune-armv8mmainfpsoftfp = "lib/thumb/v8-m.main+fp/softfp" |
227 | TUNE_FEATURES:tune-armv8mmainfpsoftfp ="arm armrm" | 237 | TUNE_FEATURES:tune-armv8mmainfpsoftfp ="arm armv8r" |
228 | TUNE_CCARGS:tune-armv8mmainfpsoftfp = "-mthumb -march=armv8-m.main+fp -mfloat-abi=softfp" | 238 | TUNE_CCARGS:tune-armv8mmainfpsoftfp = "-mthumb -march=armv8-m.main+fp -mfloat-abi=softfp" |
229 | TUNE_PKGARCH:tune-armv8mmainfpsoftfp = "armv8mmainfpt" | 239 | TUNE_PKGARCH:tune-armv8mmainfpsoftfp = "armv8mmainfpt" |
230 | 240 | ||
@@ -235,7 +245,7 @@ DEFAULTTUNE:virtclass-multilib-libv8mmainfphard = "armv8mmainfphard" | |||
235 | AVAILTUNES += "armv8mmainfphard" | 245 | AVAILTUNES += "armv8mmainfphard" |
236 | PACKAGE_EXTRA_ARCHS:tune-armv8mmainfphard = "${TUNE_PKGARCH:tune-armv8mmainfphard}" | 246 | PACKAGE_EXTRA_ARCHS:tune-armv8mmainfphard = "${TUNE_PKGARCH:tune-armv8mmainfphard}" |
237 | BASE_LIB:tune-armv8mmainfphard = "lib/thumb/v8-m.main+fp/hard" | 247 | BASE_LIB:tune-armv8mmainfphard = "lib/thumb/v8-m.main+fp/hard" |
238 | TUNE_FEATURES:tune-armv8mmainfphard ="arm armrm" | 248 | TUNE_FEATURES:tune-armv8mmainfphard ="arm armv8r" |
239 | TUNE_CCARGS:tune-armv8mmainfphard = "-mthumb -march=armv8-m.main+fp -mfloat-abi=hard" | 249 | TUNE_CCARGS:tune-armv8mmainfphard = "-mthumb -march=armv8-m.main+fp -mfloat-abi=hard" |
240 | TUNE_PKGARCH:tune-armv8mmainfphard = "armv8mmainfpthf" | 250 | TUNE_PKGARCH:tune-armv8mmainfphard = "armv8mmainfpthf" |
241 | 251 | ||
@@ -247,7 +257,7 @@ DEFAULTTUNE:virtclass-multilib-libv8mmaindpsoftfp = "armv8mmaindpsoftfp" | |||
247 | AVAILTUNES += "armv8mmaindpsoftfp" | 257 | AVAILTUNES += "armv8mmaindpsoftfp" |
248 | PACKAGE_EXTRA_ARCHS:tune-armv8mmaindpsoftfp = "${TUNE_PKGARCH:tune-armv8mmaindpsoftfp}" | 258 | PACKAGE_EXTRA_ARCHS:tune-armv8mmaindpsoftfp = "${TUNE_PKGARCH:tune-armv8mmaindpsoftfp}" |
249 | BASE_LIB:tune-armv8mmaindpsoftfp = "lib/thumb/v8-m.main+dp/softfp" | 259 | BASE_LIB:tune-armv8mmaindpsoftfp = "lib/thumb/v8-m.main+dp/softfp" |
250 | TUNE_FEATURES:tune-armv8mmaindpsoftfp ="arm armrm" | 260 | TUNE_FEATURES:tune-armv8mmaindpsoftfp ="arm armv8r" |
251 | TUNE_CCARGS:tune-armv8mmaindpsoftfp = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=softfp" | 261 | TUNE_CCARGS:tune-armv8mmaindpsoftfp = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=softfp" |
252 | TUNE_PKGARCH:tune-armv8mmaindpsoftfp = "armv8mmainfpdpt" | 262 | TUNE_PKGARCH:tune-armv8mmaindpsoftfp = "armv8mmainfpdpt" |
253 | 263 | ||
@@ -259,6 +269,6 @@ DEFAULTTUNE:virtclass-multilib-libv8mmaindphard = "armv8mmaindphard" | |||
259 | AVAILTUNES += "armv8mmaindphard" | 269 | AVAILTUNES += "armv8mmaindphard" |
260 | PACKAGE_EXTRA_ARCHS:tune-armv8mmaindphard = "${TUNE_PKGARCH:tune-armv8mmaindphard}" | 270 | PACKAGE_EXTRA_ARCHS:tune-armv8mmaindphard = "${TUNE_PKGARCH:tune-armv8mmaindphard}" |
261 | BASE_LIB:tune-armv8mmaindphard = "lib/thumb/v8-m.main+dp/hard" | 271 | BASE_LIB:tune-armv8mmaindphard = "lib/thumb/v8-m.main+dp/hard" |
262 | TUNE_FEATURES:tune-armv8mmaindphard ="arm armrm" | 272 | TUNE_FEATURES:tune-armv8mmaindphard ="arm armv8r" |
263 | TUNE_CCARGS:tune-armv8mmaindphard = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=hard" | 273 | TUNE_CCARGS:tune-armv8mmaindphard = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=hard" |
264 | TUNE_PKGARCH:tune-armv8mmaindphard = "armv8mmainfpdpthf" | 274 | TUNE_PKGARCH:tune-armv8mmaindphard = "armv8mmainfpdpthf" |
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend index e12028b4..d2a174d5 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-runtime_%.bbappend | |||
@@ -16,16 +16,22 @@ EXTRA_OECONF:append:xilinx-standalone:aarch64:class-target = " \ | |||
16 | --with-arch=armv8-a \ | 16 | --with-arch=armv8-a \ |
17 | " | 17 | " |
18 | 18 | ||
19 | # Both arm and armrm overrides are set w/ cortex r5 | 19 | # Both arm and armv7r/armv8r overrides are set w/ cortex r5 |
20 | # So only set rmprofile if armrm is defined. | 20 | # So only set rmprofile if armv*r is defined. |
21 | ARM_PROFILE = "aprofile" | 21 | ARM_PROFILE = "aprofile" |
22 | ARM_PROFILE:armrm = "rmprofile" | 22 | ARM_PROFILE:armv7r = "rmprofile" |
23 | ARM_PROFILE:armv8r = "rmprofile" | ||
23 | 24 | ||
24 | EXTRA_OECONF:append:xilinx-standalone:arm:class-target = " \ | 25 | EXTRA_OECONF:append:xilinx-standalone:arm:class-target = " \ |
25 | --with-multilib-list=${ARM_PROFILE} \ | 26 | --with-multilib-list=${ARM_PROFILE} \ |
26 | " | 27 | " |
27 | 28 | ||
28 | EXTRA_OECONF:append:xilinx-standalone:armrm:class-target = " \ | 29 | EXTRA_OECONF:append:xilinx-standalone:armv7r:class-target = " \ |
30 | --disable-tls \ | ||
31 | --disable-decimal-float \ | ||
32 | " | ||
33 | |||
34 | EXTRA_OECONF:append:xilinx-standalone:armv8r:class-target = " \ | ||
29 | --disable-tls \ | 35 | --disable-tls \ |
30 | --disable-decimal-float \ | 36 | --disable-decimal-float \ |
31 | " | 37 | " |
diff --git a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc index 1262bd3c..ec76d518 100644 --- a/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc +++ b/meta-xilinx-standalone/recipes-devtools/gcc/gcc-xilinx-standalone.inc | |||
@@ -12,15 +12,21 @@ EXTRA_OECONF:append:xilinx-standalone:aarch64 = " \ | |||
12 | --with-arch=armv8-a \ | 12 | --with-arch=armv8-a \ |
13 | " | 13 | " |
14 | 14 | ||
15 | # Both arm and armrm overrides are set w/ cortex r5 | 15 | # Both arm and armv*r overrides are set w/ cortex r5 |
16 | # So only set rmprofile if armrm is defined. | 16 | # So only set rmprofile if armv*r is defined. |
17 | ARM_PROFILE = "aprofile" | 17 | ARM_PROFILE = "aprofile" |
18 | ARM_PROFILE:armrm = "rmprofile" | 18 | ARM_PROFILE:armv7r = "rmprofile" |
19 | ARM_PROFILE:armv8r = "rmprofile" | ||
19 | EXTRA_OECONF:append:xilinx-standalone:arm = " \ | 20 | EXTRA_OECONF:append:xilinx-standalone:arm = " \ |
20 | --with-multilib-list=${ARM_PROFILE} \ | 21 | --with-multilib-list=${ARM_PROFILE} \ |
21 | " | 22 | " |
22 | 23 | ||
23 | EXTRA_OECONF:append:xilinx-standalone:armrm = " \ | 24 | EXTRA_OECONF:append:xilinx-standalone:armv7r = " \ |
25 | --disable-tls \ | ||
26 | --disable-decimal-float \ | ||
27 | " | ||
28 | |||
29 | EXTRA_OECONF:append:xilinx-standalone:armv8r = " \ | ||
24 | --disable-tls \ | 30 | --disable-tls \ |
25 | --disable-decimal-float \ | 31 | --disable-decimal-float \ |
26 | " | 32 | " |