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_ARCH = "microblazeel"
-TUNE_FEATURES_tune-microblaze ?= "fpu-soft"
-PACKAGE_EXTRA_ARCHS_tune-microblaze = ""
-# FPU Configuration
+require conf/machine/include/tune-microblaze-features.inc
-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)}"
-# CPU Version Configuration
+AVAILTUNES += "microblaze"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "-mcpu=v8.30.a", "", d)}"
+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}"

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 @@
1	# Tune options for microblaze big endian	1	# Tune options for microblaze
		2	# The only tune 'feature' defined here is the microblaze tune.
		3	# See the machine file (microblaze[el].conf) for details.
2		4
3	DEFAULTTUNE ?= "microblaze"	5	DEFAULTTUNE ?= "microblaze"
4	TUNE_ARCH = "microblaze"
5	TUNE_PKGARCH = "${TUNE_ARCH}"
6		6
7	AVAILTUNES += "microblaze"	7	TUNE_ARCH = "microblazeel"
8	TUNE_FEATURES_tune-microblaze ?= "fpu-soft"
9	PACKAGE_EXTRA_ARCHS_tune-microblaze = ""
10		8
11	# FPU Configuration	9	require conf/machine/include/tune-microblaze-features.inc
12	TUNEVALID[fpu-soft] = "Use software FPU."
13	TARGET_FPU = "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "soft", "", d)}"
14	TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "fpu-soft", "-msoft-float", "", d)}"
15		10
16	# CPU Version Configuration	11	AVAILTUNES += "microblaze"
17	TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "microblaze", "-mcpu=v8.30.a", "", d)}"	12	TUNEVALID[microblaze] = "Microblaze"
		13	TUNE_FEATURES_tune-microblaze += "microblaze"
18		14
		15	TUNE_CCARGS += "${MBCCARGSENDIAN} ${MBCCARGSVERSION} ${MBCCARGSBARRELSHIFT} ${MBCCARGSMUL} ${MBCCARGSDIV} ${MBCCARGSFPU} ${MBCCARGSPATTERNCOMPARE} ${MBCCARGSREORDER}"
		16	TUNE_PKGARCH = "microblaze${MBPKGENDIAN}${MBPKGVERSION}${MBPKGBARRELSHIFT}${MBPKGMUL}${MBPKGDIV}${MBPKGFPU}${MBPKGSPATTERNCOMPARE}${MBPKGREORDER}"
		17	PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"