tune-microblaze: Add negative CCARGS definitions

* Add args to turn off CPU features

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>

6 files changed, 6 insertions, 6 deletions

diff --git a/conf/machine/include/microblaze/feature-microblaze-barrel-shift.inc b/conf/machine/include/microblaze/feature-microblaze-barrel-shift.inc
index 57ba03d9..ca7e7e39 100644
--- a/conf/machine/include/microblaze/feature-microblaze-barrel-shift.inc
+++ b/conf/machine/include/microblaze/feature-microblaze-barrel-shift.inc
@@ -1,3 +1,3 @@
 TUNEVALID[barrel-shift] = "Enable Microblaze Hardware Barrel Shift."
-MBCCARGSBARRELSHIFT += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "" ,d)}"
+MBCCARGSBARRELSHIFT += "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-mxl-barrel-shift", "-mno-xl-barrel-shift" ,d)}"
 MBPKGBARRELSHIFT .= "${@bb.utils.contains("TUNE_FEATURES", "barrel-shift", "-bs", "" ,d)}"
diff --git a/conf/machine/include/microblaze/feature-microblaze-divide.inc b/conf/machine/include/microblaze/feature-microblaze-divide.inc
index fed9fb20..5d010a4a 100644
--- a/conf/machine/include/microblaze/feature-microblaze-divide.inc
+++ b/conf/machine/include/microblaze/feature-microblaze-divide.inc
@@ -1,3 +1,3 @@
 TUNEVALID[divide-hard] = "Enable Microblaze hardware divider."
-MBCCARGSDIV += "${@bb.utils.contains("TUNE_FEATURES", "divide-hard", "-mno-xl-soft-div", "" ,d)}"
+MBCCARGSDIV += "${@bb.utils.contains("TUNE_FEATURES", "divide-hard", "-mno-xl-soft-div", "-mxl-soft-div" ,d)}"
 MBPKGDIV .= "${@bb.utils.contains("TUNE_FEATURES", "divide-hard", "-div", "" ,d)}"
diff --git a/conf/machine/include/microblaze/feature-microblaze-multiply.inc b/conf/machine/include/microblaze/feature-microblaze-multiply.inc
index 3f6d8c1a..e3f8ae5f 100644
--- a/conf/machine/include/microblaze/feature-microblaze-multiply.inc
+++ b/conf/machine/include/microblaze/feature-microblaze-multiply.inc
@@ -2,7 +2,7 @@ TUNEVALID[multiply-low] = "Enable Microblaze Hardware Multiply with low (32 bit)
 TUNEVALID[multiply-high] = "Enable Microblaze Hardware Multiply with high (64 bit) result."
 
 # Establish which Multiply output result size to use
-MBCCARGSMUL_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "multiply-low", "-mno-xl-soft-mul", "" ,d)}"
+MBCCARGSMUL_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "multiply-low", "-mno-xl-soft-mul", "-mxl-soft-mul" ,d)}"
 MBCCARGSMUL = "${@bb.utils.contains("TUNE_FEATURES", "multiply-high", "-mno-xl-soft-mul -mxl-multiply-high", "${MBCCARGSMUL_BASIC}" ,d)}"
 
 MBPKGMUL_BASIC = "${@bb.utils.contains("TUNE_FEATURES", "multiply-low", "-ml", "" ,d)}"
diff --git a/conf/machine/include/microblaze/feature-microblaze-pattern-compare.inc b/conf/machine/include/microblaze/feature-microblaze-pattern-compare.inc
index 9ed88977..347fba79 100644
--- a/conf/machine/include/microblaze/feature-microblaze-pattern-compare.inc
+++ b/conf/machine/include/microblaze/feature-microblaze-pattern-compare.inc
@@ -1,3 +1,3 @@
 TUNEVALID[pattern-compare] = "Enable Microblaze Pattern Compare Instructions."
-MBCCARGSPATTERNCOMPARE = "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "" ,d)}"
+MBCCARGSPATTERNCOMPARE = "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-mxl-pattern-compare", "-mno-xl-pattern-compare" ,d)}"
 MBPKGSPATTERNCOMPARE = "${@bb.utils.contains("TUNE_FEATURES", "pattern-compare", "-cmp", "" ,d)}"
diff --git a/conf/machine/include/microblaze/feature-microblaze-reorder.inc b/conf/machine/include/microblaze/feature-microblaze-reorder.inc
index e68fbb3a..0d809ad1 100644
--- a/conf/machine/include/microblaze/feature-microblaze-reorder.inc
+++ b/conf/machine/include/microblaze/feature-microblaze-reorder.inc
@@ -1,3 +1,3 @@
 TUNEVALID[reorder] = "Enable Microblaze Reorder Instructions."
-MBCCARGSREORDER = "${@bb.utils.contains("TUNE_FEATURES", "reorder", "-mxl-reorder", "" ,d)}"
+MBCCARGSREORDER = "${@bb.utils.contains("TUNE_FEATURES", "reorder", "-mxl-reorder", "-mno-xl-reorder" ,d)}"
 MBPKGREORDER = "${@bb.utils.contains("TUNE_FEATURES", "reorder", "-re", "" ,d)}"
diff --git a/conf/machine/include/tune-microblaze.inc b/conf/machine/include/tune-microblaze.inc
index 373f4b9a..b03b42a9 100644
--- a/conf/machine/include/tune-microblaze.inc
+++ b/conf/machine/include/tune-microblaze.inc
@@ -6,7 +6,7 @@ require conf/machine/include/tune-microblaze-features.inc
 TUNEVALID[microblaze] = "Microblaze"
 AVAILTUNES += "microblaze"
 
-TUNE_FEATURES_tune-microblaze += "microblaze"
+TUNE_FEATURES_tune-microblaze = "microblaze"
 PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
 
 # Linux Configuration