summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/conf/machine/include/microblaze/arch-microblaze.inc22
-rw-r--r--meta/conf/machine/include/microblaze/feature-microblaze-math.inc12
2 files changed, 17 insertions, 17 deletions
diff --git a/meta/conf/machine/include/microblaze/arch-microblaze.inc b/meta/conf/machine/include/microblaze/arch-microblaze.inc
index 0349caac0a..4f58076ac9 100644
--- a/meta/conf/machine/include/microblaze/arch-microblaze.inc
+++ b/meta/conf/machine/include/microblaze/arch-microblaze.inc
@@ -11,34 +11,34 @@ MACHINEOVERRIDES =. "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "microblaze
11 11
12# Endian 12# Endian
13TUNEVALID[bigendian] = "Use Microblaze Big Endian" 13TUNEVALID[bigendian] = "Use Microblaze Big Endian"
14TUNECONFLICTS[bigendian] += "v10.0" 14TUNECONFLICTS[bigendian] = "v10.0"
15 15
16MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}" 16MBPKGARCH_ENDIAN = "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "eb", "el", d)}"
17 17
18TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-mbig-endian", "-mlittle-endian", d)}" 18TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "bigendian", " -mbig-endian", " -mlittle-endian", d)}"
19 19
20# General features 20# General features
21TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter" 21TUNEVALID[barrel-shift] = "Enable Hardware Barrel Shifter"
22TUNEVALID[pattern-compare] = "Enable Pattern Compare Instructions" 22TUNEVALID[pattern-compare] = "Enable Pattern Compare Instructions"
23TUNEVALID[reorder] = "Enable Reorder Instructions" 23TUNEVALID[reorder] = "Enable Reorder Instructions"
24TUNECONFLICTS[reorder] += "v8.00 v8.10 v8.20" 24TUNECONFLICTS[reorder] = "v8.00 v8.10 v8.20"
25 25
26# Core configuration tune optimizations 26# Core configuration tune optimizations
27TUNEVALID[frequency-optimized] = "Enabling tuning for frequency optimized core (AREA_OPTIMIZED_2)" 27TUNEVALID[frequency-optimized] = "Enabling tuning for frequency optimized core (AREA_OPTIMIZED_2)"
28TUNECONFLICTS[frequency-optimized] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6" 28TUNECONFLICTS[frequency-optimized] = "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.1 v9.2 v9.3 v9.4 v9.5 v9.6"
29 29
30# Feature compiler args 30# Feature compiler args
31TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift", d)}" 31TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", " -mxl-barrel-shift", " -mno-xl-barrel-shift", d)}"
32TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare", d)}" 32TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", " -mxl-pattern-compare", " -mno-xl-pattern-compare", d)}"
33TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", "-mxl-frequency", "", d)}" 33TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "frequency-optimized", " -mxl-frequency", "", d)}"
34TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "64-bit", "-m64", "", d)}" 34TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "64-bit", " -m64", "", d)}"
35 35
36# Disable reorder for v8.30 if pattern-compare is not enabled 36# Disable reorder for v8.30 if pattern-compare is not enabled
37TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "reorder", \ 37TUNE_CCARGS .= "${@bb.utils.contains("TUNE_FEATURES", "reorder", \
38 bb.utils.contains("TUNE_FEATURES", "v8.30", \ 38 bb.utils.contains("TUNE_FEATURES", "v8.30", \
39 bb.utils.contains("TUNE_FEATURES", "pattern-compare", \ 39 bb.utils.contains("TUNE_FEATURES", "pattern-compare", \
40 "-mxl-reorder", "-mno-xl-reorder", d), \ 40 " -mxl-reorder", " -mno-xl-reorder", d), \
41 "-mxl-reorder", d), "-mno-xl-reorder", d)}" 41 " -mxl-reorder", d), " -mno-xl-reorder", d)}"
42 42
43# Feature package architecture formatting 43# Feature package architecture formatting
44MBPKGARCH_TUNE = "" 44MBPKGARCH_TUNE = ""
diff --git a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc
index a31516659c..cba0ae67e3 100644
--- a/meta/conf/machine/include/microblaze/feature-microblaze-math.inc
+++ b/meta/conf/machine/include/microblaze/feature-microblaze-math.inc
@@ -13,14 +13,14 @@ TUNECONFLICTS[fpu-hard] = "fpu-soft"
13TUNECONFLICTS[fpu-hard-extended] = "fpu-soft" 13TUNECONFLICTS[fpu-hard-extended] = "fpu-soft"
14 14
15# Compiler args 15# Compiler args
16TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], '-mno-xl-soft-mul', '-mxl-soft-mul', d)}" 16TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['multiply-low', 'multiply-high'], ' -mno-xl-soft-mul', ' -mxl-soft-mul', d)}"
17TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', '-mxl-multiply-high', '', d)}" 17TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'multiply-high', ' -mxl-multiply-high', '', d)}"
18 18
19TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', '-mno-xl-soft-div', '-mxl-soft-div', d)}" 19TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'divide-hard', ' -mno-xl-soft-div', ' -mxl-soft-div', d)}"
20 20
21TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}" 21TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-soft', '', '', d)}"
22TUNE_CCARGS += "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], '-mhard-float', '', d)}" 22TUNE_CCARGS .= "${@bb.utils.contains_any('TUNE_FEATURES', ['fpu-hard', 'fpu-hard-extended'], ' -mhard-float', '', d)}"
23TUNE_CCARGS += "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', '-mxl-float-convert -mxl-float-sqrt', '', d)}" 23TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'fpu-hard-extended', ' -mxl-float-convert -mxl-float-sqrt', '', d)}"
24 24
25# Set target fpu (bitbake known target) to soft or hard (basic or extended) 25# Set target fpu (bitbake known target) to soft or hard (basic or extended)
26TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}" 26TARGET_FPU = "${@bb.utils.contains_any('TUNE_FEATURES', 'fpu-hard fpu-hard-extended', 'fpu-hard', 'fpu-soft', d)}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 16:56:11 +0000