From b769bf5d888eaf5b45d22cc2b119e67d786fc702 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 8 May 2013 12:13:39 +1000 Subject: tune-microblaze: Refactor tune definition * Extract the arch, package arch and cc flags into the features.inc * Specify the SOC_FAMILY as 'microblaze' (for both little and big endian) Signed-off-by: Nathan Rossi --- conf/machine/include/tune-microblaze-features.inc | 10 ++++++++++ conf/machine/include/tune-microblaze.inc | 18 ++++++------------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/conf/machine/include/tune-microblaze-features.inc b/conf/machine/include/tune-microblaze-features.inc index f12508ae..fd7e0c8f 100644 --- a/conf/machine/include/tune-microblaze-features.inc +++ b/conf/machine/include/tune-microblaze-features.inc @@ -7,3 +7,13 @@ require conf/machine/include/microblaze/feature-microblaze-divide.inc require conf/machine/include/microblaze/feature-microblaze-fpu.inc require conf/machine/include/microblaze/feature-microblaze-pattern-compare.inc require conf/machine/include/microblaze/feature-microblaze-reorder.inc + +# Architecture name, either 'microblaze' or 'microblazeel' depending on endianess +TUNE_ARCH = "microblaze${@bb.utils.contains("TUNE_FEATURES", "little-endian", "el", "" ,d)}" + +# Compiler args +TUNE_CCARGS += "${MBCCARGSENDIAN} ${MBCCARGSVERSION} ${MBCCARGSBARRELSHIFT} ${MBCCARGSMUL} ${MBCCARGSDIV} ${MBCCARGSFPU} ${MBCCARGSPATTERNCOMPARE} ${MBCCARGSREORDER}" + +# Package Architecture formatting +MBPKGMATH = "${MBPKGMUL}${MBPKGDIV}${MBPKGFPU}" +TUNE_PKGARCH = "microblaze${MBPKGENDIAN}${MBPKGVERSION}${MBPKGBARRELSHIFT}${MBPKGSPATTERNCOMPARE}${MBPKGREORDER}${MBPKGMATH}" diff --git a/conf/machine/include/tune-microblaze.inc b/conf/machine/include/tune-microblaze.inc index 85a2619a..373f4b9a 100644 --- a/conf/machine/include/tune-microblaze.inc +++ b/conf/machine/include/tune-microblaze.inc @@ -1,30 +1,24 @@ -# 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 = "microblazeel" +SOC_FAMILY ?= "microblaze" require conf/machine/include/tune-microblaze-features.inc -AVAILTUNES += "microblaze" TUNEVALID[microblaze] = "Microblaze" -TUNE_FEATURES_tune-microblaze += "microblaze" +AVAILTUNES += "microblaze" -TUNE_CCARGS += "${MBCCARGSENDIAN} ${MBCCARGSVERSION} ${MBCCARGSBARRELSHIFT} ${MBCCARGSMUL} ${MBCCARGSDIV} ${MBCCARGSFPU} ${MBCCARGSPATTERNCOMPARE} ${MBCCARGSREORDER}" -MBPKGMATH = "${MBPKGMUL}${MBPKGDIV}${MBPKGFPU}" -TUNE_PKGARCH = "microblaze${MBPKGENDIAN}${MBPKGVERSION}${MBPKGBARRELSHIFT}${MBPKGSPATTERNCOMPARE}${MBPKGREORDER}${MBPKGMATH}" +TUNE_FEATURES_tune-microblaze += "microblaze" PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}" # Linux Configuration PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx" PREFERRED_VERSION_linux-xlnx ?= "3.8%" - KERNEL_IMAGETYPE ?= "linux.bin" + +# File System Configuration IMAGE_FSTYPES ?= "cpio ext2 ext2.gz.u-boot ext2.gz" IMAGE_CLASSES += "image_types_uboot" +# U-Boot Configuration PREFERRED_PROVIDER_u-boot ?= "u-boot-xlnx" PREFERRED_VERSION_u-boot-xlnx ?= "v2013.01%" UBOOT_MACHINE ?= "microblaze-generic" -- cgit v1.2.3-54-g00ecf