From c73d382296aea6d9cd01076e87d61a9b9d890274 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 27 Mar 2012 18:37:45 -0700 Subject: tune/armv7: Delete armv7 is least common denominator of armv7-a armv7-m and armv7-r and armv7-m does not support ARM instructions but only thumb2 instruction set which means armv7 when chosen will complain if code is compiled in arm mode which is default in OE if not specified other wise if we chose this tuning errors like below pop up error: target CPU does not support ARM mode This tuning seems theoretical and base tune for armv7 would be one of armv7-a, armv7-m or armv7-r (From OE-Core rev: 75b8adbc042e0f65fb1286bc550d02becd3b6aea) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/conf/machine/include/arm/arch-armv7.inc | 56 --------------------------- meta/conf/machine/include/arm/arch-armv7a.inc | 3 +- meta/conf/machine/include/tune-armv7.inc | 2 - 3 files changed, 2 insertions(+), 59 deletions(-) delete mode 100644 meta/conf/machine/include/arm/arch-armv7.inc delete mode 100644 meta/conf/machine/include/tune-armv7.inc diff --git a/meta/conf/machine/include/arm/arch-armv7.inc b/meta/conf/machine/include/arm/arch-armv7.inc deleted file mode 100644 index 33d9f0d28c..0000000000 --- a/meta/conf/machine/include/arm/arch-armv7.inc +++ /dev/null @@ -1,56 +0,0 @@ -DEFAULTTUNE ?= "armv7" - -ARMPKGARCH ?= "armv7" - -TUNEVALID[armv7] = "Enable instructions for ARMv7" -TUNE_CONFLICTS[armv7] = "armv4 armv5 armv6" -TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7", "-march=armv7", "", d)}" -MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7", ":armv7", "" ,d)}" - -require conf/machine/include/arm/arch-armv6.inc -require conf/machine/include/arm/feature-arm-neon.inc - -# Little Endian base configs -AVAILTUNES += "armv7 armv7t armv7-neon armv7t-neon" -TUNE_FEATURES_tune-armv7 ?= "armv7 vfp" -TUNE_FEATURES_tune-armv7t ?= "armv7 vfp thumb" -TUNE_FEATURES_tune-armv7-neon ?= "armv7 vfp neon" -TUNE_FEATURES_tune-armv7t-neon ?= "armv7 vfp neon thumb" -PACKAGE_EXTRA_ARCHS_tune-armv7 = "${PACKAGE_EXTRA_ARCHS_tune-armv6} armv7-vfp" -PACKAGE_EXTRA_ARCHS_tune-armv7t = "${PACKAGE_EXTRA_ARCHS_tune-armv6t} armv7-vfp armv7t2-vfp" -PACKAGE_EXTRA_ARCHS_tune-armv7-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7-vfp-neon" -PACKAGE_EXTRA_ARCHS_tune-armv7t-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7-vfp-neon armv7at2-vfp-neon" - -# VFP Tunes -AVAILTUNES += "armv7hf armv7thf armv7hf-neon armv7thf-neon" -TUNE_FEATURES_tune-armv7hf ?= "${TUNE_FEATURES_tune-armv7} callconvention-hard" -TUNE_FEATURES_tune-armv7thf ?= "${TUNE_FEATURES_tune-armv7t} callconvention-hard" -TUNE_FEATURES_tune-armv7hf-neon ?= "${TUNE_FEATURES_tune-armv7-neon} callconvention-hard" -TUNE_FEATURES_tune-armv7thf-neon ?= "${TUNE_FEATURES_tune_armv7t-neon} callconvention-hard" -PACKAGE_EXTRA_ARCHS_tune-armv7hf = "${PACKAGE_EXTRA_ARCHS_tune-armv6hf} armv7hf-vfp" -PACKAGE_EXTRA_ARCHS_tune-armv7thf = "${PACKAGE_EXTRA_ARCHS_tune-armv6thf} armv7hf-vfp armv7t2hf-vfp" -PACKAGE_EXTRA_ARCHS_tune-armv7hf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7hf} armv7hf-vfp-neon" -PACKAGE_EXTRA_ARCHS_tune-armv7thf-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7thf} armv7hf-vfp-neon armv7at2hf-vfp-neon" - -# Big Endian -AVAILTUNES += "armv7b armv7tb armv7b-neon armv7tb-neon" -TUNE_FEATURES_tune-armv7b ?= "${TUNE_FEATURES_tune-armv7} bigendian" -TUNE_FEATURES_tune-armv7tb ?= "${TUNE_FEATURES_tune-armv7t} bigendian" -TUNE_FEATURES_tune-armv7b-neon ?= "${TUNE_FEATURES_tune-armv7-neon} bigendian" -TUNE_FEATURES_tune-armv7tb-neon ?= "${TUNE_FEATURES_tune-armv7t-neon} bigendian" -PACKAGE_EXTRA_ARCHS_tune-armv7b = "${PACKAGE_EXTRA_ARCHS_tune-armv6} armv7b-vfp" -PACKAGE_EXTRA_ARCHS_tune-armv7tb = "${PACKAGE_EXTRA_ARCHS_tune-armv6t} armv7b-vfp armv7t2b-vfp" -PACKAGE_EXTRA_ARCHS_tune-armv7b-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7} armv7b-vfp-neon" -PACKAGE_EXTRA_ARCHS_tune-armv7tb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7t} armv7b-vfp-neon armv7at2b-vfp-neon" - -# Big Endian + VFP -AVAILTUNES += "armv7hfb armv7thfb armv7hfb-neon armv7thfb-neon" -TUNE_FEATURES_tune-armv7hfb ?= "${TUNE_FEATURES_tune-armv7b} callconvention-hard" -TUNE_FEATURES_tune-armv7thfb ?= "${TUNE_FEATURES_tune-armv7tb} callconvention-hard" -TUNE_FEATURES_tune-armv7hfb-neon ?= "${TUNE_FEATURES_tune-armv7b-neon} callconvention-hard" -TUNE_FEATURES_tune-armv7thfb-neon ?= "${TUNE_FEATURES_tune_armv7tb-neon} callconvention-hard" -PACKAGE_EXTRA_ARCHS_tune-armv7hfb = "${PACKAGE_EXTRA_ARCHS_tune-armv6hfb} armv7hfb-vfp" -PACKAGE_EXTRA_ARCHS_tune-armv7thfb = "${PACKAGE_EXTRA_ARCHS_tune-armv6thfb} armv7hfb-vfp armv7t2hfb-vfp" -PACKAGE_EXTRA_ARCHS_tune-armv7hfb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7hfb} armv7hfb-vfp-neon" -PACKAGE_EXTRA_ARCHS_tune-armv7thfb-neon = "${PACKAGE_EXTRA_ARCHS_tune-armv7thfb} armv7hfb-vfp-neon armv7at2hfb-vfp-neon" - diff --git a/meta/conf/machine/include/arm/arch-armv7a.inc b/meta/conf/machine/include/arm/arch-armv7a.inc index de39cb56fd..92640e2603 100644 --- a/meta/conf/machine/include/arm/arch-armv7a.inc +++ b/meta/conf/machine/include/arm/arch-armv7a.inc @@ -7,7 +7,8 @@ TUNE_CONFLICTS[armv7a] = "armv4 armv5 armv6 armv7" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "armv7a", "-march=armv7-a -fno-tree-vectorize", "", d)}" MACHINEOVERRIDES .= "${@bb.utils.contains("TUNE_FEATURES", "armv7a", ":armv7a", "" ,d)}" -require conf/machine/include/arm/arch-armv7.inc +require conf/machine/include/arm/arch-armv6.inc +require conf/machine/include/arm/feature-arm-neon.inc # Little Endian base configs AVAILTUNES += "armv7a armv7at armv7a-neon armv7at-neon" diff --git a/meta/conf/machine/include/tune-armv7.inc b/meta/conf/machine/include/tune-armv7.inc deleted file mode 100644 index 664c24bd7f..0000000000 --- a/meta/conf/machine/include/tune-armv7.inc +++ /dev/null @@ -1,2 +0,0 @@ -require conf/machine/include/arm/arch-armv7.inc - -- cgit v1.2.3-54-g00ecf