tune-microblaze: Refactored

* Added features with CFLAG mappings
* Added version features for v7.3-.a to v8.50.a
* Added MicroBlaze PACKAGE_ARCH expansion e.g. "microblazeel-v830-cmp"

Signed-off-by: Sipke Vriend <sipke.vriend@xilinx.com>

1 files changed, 11 insertions, 12 deletions

diff --git a/conf/machine/include/tune-microblaze.inc b/conf/machine/include/tune-microblaze.inc
index e6dd2295..6479afbf 100644
--- a/conf/machine/include/tune-microblaze.inc
+++ b/conf/machine/include/tune-microblaze.inc
@@ -1,18 +1,17 @@
-# Tune options for microblaze big endian
+# Tune options for microblaze
+# The only tune 'feature' defined here is the microblaze tune.
+# See the machine file (microblaze[el].conf) for details.
 
 DEFAULTTUNE ?= "microblaze"
-TUNE_ARCH = "microblaze"
-TUNE_PKGARCH = "${TUNE_ARCH}"
 
-AVAILTUNES += "microblaze"
-TUNE_FEATURES_tune-microblaze ?= "fpu-soft"
-PACKAGE_EXTRA_ARCHS_tune-microblaze = ""
+TUNE_ARCH = "microblazeel"
 
-# FPU Configuration
-TUNEVALID[fpu-soft] = "Use software FPU."
-TARGET_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-msoft-float", "", d)}"
+require conf/machine/include/tune-microblaze-features.inc
 
-# CPU Version Configuration
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "-mcpu=v8.30.a", "", d)}"
+AVAILTUNES += "microblaze"
+TUNEVALID[microblaze] = "Microblaze"
+TUNE_FEATURES_tune-microblaze += "microblaze"
 
+TUNE_CCARGS += "${MBCCARGSENDIAN} ${MBCCARGSVERSION} ${MBCCARGSBARRELSHIFT} ${MBCCARGSMUL} ${MBCCARGSDIV} ${MBCCARGSFPU} ${MBCCARGSPATTERNCOMPARE} ${MBCCARGSREORDER}"
+TUNE_PKGARCH = "microblaze${MBPKGENDIAN}${MBPKGVERSION}${MBPKGBARRELSHIFT}${MBPKGMUL}${MBPKGDIV}${MBPKGFPU}${MBPKGSPATTERNCOMPARE}${MBPKGREORDER}"
+PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"