From d6d1edd9c13ea16a049cc2ca84080e8319f61321 Mon Sep 17 00:00:00 2001 From: Jon Mason Date: Fri, 20 Aug 2021 11:23:54 -0400 Subject: [PATCH] arm-bsp: remove tunes that are now upstream Signed-off-by: Jon Mason --- .../conf/machine/include/arm/arch-armv7r.inc | 30 --------------- .../machine/include/arm/arch-armv8-4a.inc | 19 ---------- .../conf/machine/include/arm/arch-armv8r.inc | 38 ------------------- .../include/arm/armv7r/tune-cortexr4.inc | 14 ------- .../include/arm/armv7r/tune-cortexr4f.inc | 14 ------- .../include/arm/armv7r/tune-cortexr5.inc | 14 ------- .../include/arm/armv7r/tune-cortexr7.inc | 14 ------- .../include/arm/armv7r/tune-cortexr8.inc | 14 ------- .../include/arm/armv8r/tune-cortexr52.inc | 14 ------- .../machine/include/arm/feature-arm-crc.inc | 4 -- .../include/arm/feature-arm-crypto.inc | 5 --- .../machine/include/arm/feature-arm-idiv.inc | 2 - .../machine/include/arm/feature-arm-simd.inc | 5 --- 13 files changed, 187 deletions(-) delete mode 100755 meta-arm-bsp/conf/machine/include/arm/arch-armv7r.inc delete mode 100644 meta-arm-bsp/conf/machine/include/arm/arch-armv8-4a.inc delete mode 100755 meta-arm-bsp/conf/machine/include/arm/arch-armv8r.inc delete mode 100644 meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr4.inc delete mode 100644 meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr4f.inc delete mode 100644 meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr5.inc delete mode 100644 meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr7.inc delete mode 100644 meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr8.inc delete mode 100644 meta-arm-bsp/conf/machine/include/arm/armv8r/tune-cortexr52.inc delete mode 100644 meta-arm-bsp/conf/machine/include/arm/feature-arm-crc.inc delete mode 100644 meta-arm-bsp/conf/machine/include/arm/feature-arm-crypto.inc delete mode 100644 meta-arm-bsp/conf/machine/include/arm/feature-arm-idiv.inc delete mode 100644 meta-arm-bsp/conf/machine/include/arm/feature-arm-simd.inc diff --git a/meta-arm-bsp/conf/machine/include/arm/arch-armv7r.inc b/meta-arm-bsp/conf/machine/include/arm/arch-armv7r.inc deleted file mode 100755 index dd811357..00000000 --- a/meta-arm-bsp/conf/machine/include/arm/arch-armv7r.inc +++ /dev/null @@ -1,30 +0,0 @@ -# -# Defaults for ARMv7-r -# -DEFAULTTUNE ?= "armv7r" - -TUNEVALID[armv7r] = "Enable instructions for ARMv7-r" -TUNE_CCARGS_MARCH = "${@bb.utils.contains('TUNE_FEATURES', 'armv7r', ' -march=armv7-r', '', d)}" -MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv7r', 'armv7r:', '', d)}" - -TUNECONFLICTS[armv7r] = "armv4 armv5 armv6 armv7a" - -require conf/machine/include/arm/arch-armv6.inc -require conf/machine/include/arm/feature-arm-idiv.inc -require conf/machine/include/arm/feature-arm-neon.inc - -AVAILTUNES += "armv7r armv7r-vfpv3d16" -ARMPKGARCH:tune-armv7r = "armv7r" -ARMPKGARCH:tune-armv7r-vfpv3d16 = "armv7r" -TUNE_FEATURES:tune-armv7r = "armv7r" -TUNE_FEATURES:tune-armv7r-vfpv3d16 = "${TUNE_FEATURES:tune-armv7r} vfpv3d16" -PACKAGE_EXTRA_ARCHS:tune-armv7r = "armv7r" -PACKAGE_EXTRA_ARCHS:tune-armv7r-vfpv3d16 = "${PACKAGE_EXTRA_ARCHS:tune-armv7r} tune-armv7r-fpv3d16" - -# FIXME - This goes in arch-arm.inc when upstreamed -# Some -march settings need a +X option passed in. Since we cannot guarantee that any specified TUNE_CCARGS option is set in any order, we must hard code the order here to allow for it. -TUNE_CCARGS_MARCH_OPTS ??= "" -TUNE_CCARGS .= "${TUNE_CCARGS_MARCH}${TUNE_CCARGS_MARCH_OPTS}" - -# FIXME - Thise goes in feature-arm-neon.inc when upstreamed -TUNE_CCARGS_MARCH_OPTS .= "${@bb.utils.contains('TUNE_FEATURES', [ 'vfpv3d16', 'vfpv5spd16' ], '+fp', '', d)}" diff --git a/meta-arm-bsp/conf/machine/include/arm/arch-armv8-4a.inc b/meta-arm-bsp/conf/machine/include/arm/arch-armv8-4a.inc deleted file mode 100644 index 2dc04b6d..00000000 --- a/meta-arm-bsp/conf/machine/include/arm/arch-armv8-4a.inc +++ /dev/null @@ -1,19 +0,0 @@ -DEFAULTTUNE ?= "armv8-4a" - -TUNEVALID[armv8-4a] = "Enable instructions for ARMv8.4-a" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'armv8-4a', ' -march=armv8.4-a', '', d)}" -# TUNE crypto will be handled by arch-armv8a.inc below -MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv8-4a', 'armv8-4a:', '', d)}" - -require conf/machine/include/arm/arch-armv8a.inc - -# Little Endian base configs -AVAILTUNES += "armv8-4a armv8-4a-crypto" -ARMPKGARCH:tune-armv8-4a ?= "armv8-4a" -ARMPKGARCH:tune-armv8-4a-crypto ?= "armv8-4a" -TUNE_FEATURES:tune-armv8-4a = "aarch64 armv8-4a" -TUNE_FEATURES:tune-armv8-4a-crypto = "${TUNE_FEATURES:tune-armv8-4a} crypto" -PACKAGE_EXTRA_ARCHS:tune-armv8-4a = "${PACKAGE_EXTRA_ARCHS:tune-armv8a} armv8-4a" -PACKAGE_EXTRA_ARCHS:tune-armv8-4a-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8-4a} armv8-4a-crypto" -BASE_LIB:tune-armv8-4a = "lib64" -BASE_LIB:tune-armv8-4a-crypto = "lib64" diff --git a/meta-arm-bsp/conf/machine/include/arm/arch-armv8r.inc b/meta-arm-bsp/conf/machine/include/arm/arch-armv8r.inc deleted file mode 100755 index be4ef3e6..00000000 --- a/meta-arm-bsp/conf/machine/include/arm/arch-armv8r.inc +++ /dev/null @@ -1,38 +0,0 @@ -# -# Defaults for ARMv8-r -# -DEFAULTTUNE ?= "armv8r" - -TUNEVALID[armv8r] = "Enable instructions for ARMv8-r" -TUNE_CCARGS_MARCH .= "${@bb.utils.contains('TUNE_FEATURES', 'armv8r', ' -march=armv8-r', '', d)}" -MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'armv8r', 'armv8r:', '', d)}" - -require conf/machine/include/arm/arch-arm64.inc -require conf/machine/include/arm/feature-arm-simd.inc -require conf/machine/include/arm/feature-arm-crc.inc -require conf/machine/include/arm/feature-arm-crypto.inc - -# All ARMv8 has floating point hardware built in. Null it here to avoid any confusion for 32bit. -TARGET_FPU_32 = "" - -AVAILTUNES += "armv8r armv8r-crc armv8r-crypto armv8r-simd armv8r-crc-crypto armv8r-crc-simd armv8r-crc-crypto-simd" -ARMPKGARCH:tune-armv8r = "armv8r" -ARMPKGARCH:tune-armv8r-crc = "armv8r" -ARMPKGARCH:tune-armv8r-crypto = "armv8r" -ARMPKGARCH:tune-armv8r-simd = "armv8r" -ARMPKGARCH:tune-armv8r-crc-crypto = "armv8r" -ARMPKGARCH:tune-armv8r-crc-simd = "armv8r" -ARMPKGARCH:tune-armv8r-crc-crypto-simd = "armv8r" -TUNE_FEATURES:tune-armv8r = "armv8r" -TUNE_FEATURES:tune-armv8r-crc = "${TUNE_FEATURES:tune-armv8r} crc" -TUNE_FEATURES:tune-armv8r-crypto = "${TUNE_FEATURES:tune-armv8r} crypto" -TUNE_FEATURES:tune-armv8r-simd = "${TUNE_FEATURES:tune-armv8r} simd" -TUNE_FEATURES:tune-armv8r-crc-crypto = "${TUNE_FEATURES:tune-armv8r-crc} crypto" -TUNE_FEATURES:tune-armv8r-crc-simd = "${TUNE_FEATURES:tune-armv8r-crc} simd" -TUNE_FEATURES:tune-armv8r-crc-crypto-simd = "${TUNE_FEATURES:tune-armv8r-crc-crypto} simd" -PACKAGE_EXTRA_ARCHS:tune-armv8r = "armv8r" -PACKAGE_EXTRA_ARCHS:tune-armv8r-crc = "${PACKAGE_EXTRA_ARCHS:tune-armv8r} armv8r-crc" -PACKAGE_EXTRA_ARCHS:tune-armv8r-crypto = "${PACKAGE_EXTRA_ARCHS:tune-armv8r} armv8r-crypto" -PACKAGE_EXTRA_ARCHS:tune-armv8r-simd = "${PACKAGE_EXTRA_ARCHS:tune-armv8r} armv8r-simd" -PACKAGE_EXTRA_ARCHS:tune-armv8r-crc-simd = "${PACKAGE_EXTRA_ARCHS:tune-armv8r-crc} armv8r-simd armv8r-crc-simd" -PACKAGE_EXTRA_ARCHS:tune-armv8r-crc-crypto-simd = "${PACKAGE_EXTRA_ARCHS:tune-armv8r-crc-simd} armv8r-crc-crypto-simd" diff --git a/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr4.inc b/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr4.inc deleted file mode 100644 index 0eed7296..00000000 --- a/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr4.inc +++ /dev/null @@ -1,14 +0,0 @@ -# -# Tune Settings for Cortex-R4 -# -DEFAULTTUNE ?= "cortexr4" - -TUNEVALID[cortexr4] = "Enable Cortex-R4 specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr4', ' -mcpu=cortex-r4', '', d)}" - -require conf/machine/include/arm/arch-armv7r.inc - -AVAILTUNES += "cortexr4" -ARMPKGARCH:tune-cortexr4 = "cortexr4" -TUNE_FEATURES:tune-cortexr4 = "${TUNE_FEATURES:tune-armv7r} cortexr4" -PACKAGE_EXTRA_ARCHS:tune-cortexr4 = "${PACKAGE_EXTRA_ARCHS:tune-armv7r} cortexr4" diff --git a/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr4f.inc b/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr4f.inc deleted file mode 100644 index 0712b3ab..00000000 --- a/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr4f.inc +++ /dev/null @@ -1,14 +0,0 @@ -# -# Tune Settings for Cortex-R4F -# -DEFAULTTUNE ?= "cortexr4f" - -TUNEVALID[cortexr4f] = "Enable Cortex-R4F specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr4f', ' -mcpu=cortex-r4f', '', d)}" - -require conf/machine/include/arm/arch-armv7r.inc - -AVAILTUNES += "cortexr4f" -ARMPKGARCH:tune-cortexr4f = "cortexr4f" -TUNE_FEATURES:tune-cortexr4f = "${TUNE_FEATURES:tune-armv7r-vfpv3d16} cortexr4f" -PACKAGE_EXTRA_ARCHS:tune-cortexr4f = "${PACKAGE_EXTRA_ARCHS:tune-armv7r-vfpv3d16} cortexr4f-vfpv3d16" diff --git a/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr5.inc b/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr5.inc deleted file mode 100644 index ecaaa0d8..00000000 --- a/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr5.inc +++ /dev/null @@ -1,14 +0,0 @@ -# -# Tune Settings for Cortex-R5 -# -DEFAULTTUNE ?= "cortexr5" - -TUNEVALID[cortexr5] = "Enable Cortex-R5 specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr5', ' -mcpu=cortex-r5', '', d)}" - -require conf/machine/include/arm/arch-armv7r.inc - -AVAILTUNES += "cortexr5" -ARMPKGARCH:tune-cortexr5 = "cortexr5" -TUNE_FEATURES:tune-cortexr5 = "${TUNE_FEATURES:tune-armv7r-vfpv3d16} cortexr5 idiv" -PACKAGE_EXTRA_ARCHS:tune-cortexr5 = "${PACKAGE_EXTRA_ARCHS:tune-armv7r-vfpv3d16} cortexr5-vfpv3d16" diff --git a/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr7.inc b/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr7.inc deleted file mode 100644 index bfae1f00..00000000 --- a/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr7.inc +++ /dev/null @@ -1,14 +0,0 @@ -# -# Tune Settings for Cortex-R7 -# -DEFAULTTUNE ?= "cortexr7" - -TUNEVALID[cortexr7] = "Enable Cortex-R7 specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr7', ' -mcpu=cortex-r7', '', d)}" - -require conf/machine/include/arm/arch-armv7r.inc - -AVAILTUNES += "cortexr7" -ARMPKGARCH:tune-cortexr7 = "cortexr7" -TUNE_FEATURES:tune-cortexr7 = "${TUNE_FEATURES:tune-armv7r-vfpv3d16} cortexr7 idiv" -PACKAGE_EXTRA_ARCHS:tune-cortexr7 = "${PACKAGE_EXTRA_ARCHS:tune-armv7r-vfpv3d16} cortexr7-vfpv3d16" diff --git a/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr8.inc b/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr8.inc deleted file mode 100644 index 7fb824f6..00000000 --- a/meta-arm-bsp/conf/machine/include/arm/armv7r/tune-cortexr8.inc +++ /dev/null @@ -1,14 +0,0 @@ -# -# Tune Settings for Cortex-R8 -# -DEFAULTTUNE ?= "cortexr8" - -TUNEVALID[cortexr8] = "Enable Cortex-R8 specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr8', ' -mcpu=cortex-r8', '', d)}" - -require conf/machine/include/arm/arch-armv7r.inc - -AVAILTUNES += "cortexr8" -ARMPKGARCH:tune-cortexr8 = "cortexr8" -TUNE_FEATURES:tune-cortexr8 = "${TUNE_FEATURES:tune-armv7r-vfpv3d16} cortexr8 idiv" -PACKAGE_EXTRA_ARCHS:tune-cortexr8 = "${PACKAGE_EXTRA_ARCHS:tune-armv7r-vfpv3d16} cortexr8-vfpv3d16" diff --git a/meta-arm-bsp/conf/machine/include/arm/armv8r/tune-cortexr52.inc b/meta-arm-bsp/conf/machine/include/arm/armv8r/tune-cortexr52.inc deleted file mode 100644 index 3a97cf8e..00000000 --- a/meta-arm-bsp/conf/machine/include/arm/armv8r/tune-cortexr52.inc +++ /dev/null @@ -1,14 +0,0 @@ -# -# Tune Settings for Cortex-R52 -# -DEFAULTTUNE ?= "cortexr52" - -TUNEVALID[cortexr52] = "Enable Cortex-R52 specific processor optimizations" -TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'cortexr52', ' -mcpu=cortex-r52', '', d)}" - -require conf/machine/include/arm/arch-armv8r.inc - -AVAILTUNES += "cortexr52" -ARMPKGARCH:tune-cortexr52 = "cortexr52" -TUNE_FEATURES:tune-cortexr52 = "${TUNE_FEATURES:tune-armv8r-crc-simd} cortexr52" -PACKAGE_EXTRA_ARCHS:tune-cortexr52 = "${PACKAGE_EXTRA_ARCHS:tune-armv8r-crc-simd} cortexr52" diff --git a/meta-arm-bsp/conf/machine/include/arm/feature-arm-crc.inc b/meta-arm-bsp/conf/machine/include/arm/feature-arm-crc.inc deleted file mode 100644 index 8a69d2e2..00000000 --- a/meta-arm-bsp/conf/machine/include/arm/feature-arm-crc.inc +++ /dev/null @@ -1,4 +0,0 @@ -# Cyclic Redundancy Check (CRC) instructions for armv8-a and armv8-r - -TUNEVALID[crc] = "Enable instructions for ARMv8 Cyclic Redundancy Check (CRC)" -TUNE_CCARGS_MARCH_OPTS .= "${@bb.utils.contains('TUNE_FEATURES', 'crc', '+crc', '', d)}" diff --git a/meta-arm-bsp/conf/machine/include/arm/feature-arm-crypto.inc b/meta-arm-bsp/conf/machine/include/arm/feature-arm-crypto.inc deleted file mode 100644 index aade6ce0..00000000 --- a/meta-arm-bsp/conf/machine/include/arm/feature-arm-crypto.inc +++ /dev/null @@ -1,5 +0,0 @@ -# Cryptographic instructions for: -# armv8-a, armv8.1-a, armv8.3-a, armv8.4-a, armv8.5-a, armv8.6-a, and armv8-r - -TUNEVALID[crypto] = "Enable cryptographic instructions for ARMv8" -TUNE_CCARGS_MARCH_OPTS .= "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '+crypto', '', d)}" diff --git a/meta-arm-bsp/conf/machine/include/arm/feature-arm-idiv.inc b/meta-arm-bsp/conf/machine/include/arm/feature-arm-idiv.inc deleted file mode 100644 index 0ea42b1b..00000000 --- a/meta-arm-bsp/conf/machine/include/arm/feature-arm-idiv.inc +++ /dev/null @@ -1,2 +0,0 @@ -TUNEVALID[idiv] = "ARM-state integer division instructions" -TUNE_CCARGS_MARCH_OPTS .= "${@bb.utils.contains('TUNE_FEATURES', 'idiv', '+idiv', '', d)}" diff --git a/meta-arm-bsp/conf/machine/include/arm/feature-arm-simd.inc b/meta-arm-bsp/conf/machine/include/arm/feature-arm-simd.inc deleted file mode 100644 index 1afaf8d9..00000000 --- a/meta-arm-bsp/conf/machine/include/arm/feature-arm-simd.inc +++ /dev/null @@ -1,5 +0,0 @@ -# Advanced SIMD and floating-point instructions for armv7-a, armv7ve, -# armv8-a, armv8.1-a, armv8.3-a, armv8.4-a, armv8.5-a, armv8.6-a, and armv8-r - -TUNEVALID[simd] = "Enable instructions for Advanced SIMD and floating-point units" -TUNE_CCARGS_MARCH_OPTS .= "${@bb.utils.contains('TUNE_FEATURES', 'simd', '+simd', '', d)}"