From 6a1c662f40c11fcd26bafb53aaf190c0791d8ce2 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Sat, 18 Dec 2021 10:20:35 -0800 Subject: Remove cortexrm tune, as Yocto Project now has cortex-r tunes armrm override is now replaced by armv7r and armv8r overrides. Adjust recipes to match the new usage. Signed-off-by: Mark Hatle --- meta-xilinx-standalone/conf/machine/arm-rm-tc.conf | 64 +++++++++++++--------- 1 file changed, 37 insertions(+), 27 deletions(-) (limited to 'meta-xilinx-standalone/conf') diff --git a/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf b/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf index d8e68e4f..a3a07768 100644 --- a/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf +++ b/meta-xilinx-standalone/conf/machine/arm-rm-tc.conf @@ -1,7 +1,17 @@ require conf/multilib.conf -require conf/machine/include/tune-cortexrm.inc +require conf/machine/include/arm/arch-armv8r.inc require conf/machine/include/baremetal-tc.conf +# Since we're combining armv7r and armv8r into a single set of multilibs, +# copy the following machine setting to make sure it's available +# From conf/machine/include/arm/arch-armv7r.inc + +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" + + # Define all of the multilibs supproted by this configuration MULTILIB_GLOBAL_VARIANTS = "${@extend_variants(d,'MULTILIBS','multilib')}" @@ -21,14 +31,14 @@ TUNE_PKGARCH = "${TUNE_PKGARCH:tune-${DEFAULTTUNE}}" # Base configuration # CFLAGS: -DEFAULTTUNE = "armrm" +DEFAULTTUNE = "armv7r" -AVAILTUNES += "armrm" -PACKAGE_EXTRA_ARCHS:tune-armrm = "${TUNE_PKGARCH:tune-armrm}" -BASE_LIB:tune-armrm = "lib" -TUNE_FEATURES:tune-armrm = "arm armrm" -TUNE_CCARGS:tune-armrm = "" -TUNE_PKGARCH:tune-armrm = "armrm" +AVAILTUNES += "armv7r" +PACKAGE_EXTRA_ARCHS:tune-armv7r = "${TUNE_PKGARCH:tune-armv7r}" +BASE_LIB:tune-armv7r = "lib" +TUNE_FEATURES:tune-armv7r = "arm armv7r" +TUNE_CCARGS:tune-armv7r = "" +TUNE_PKGARCH:tune-armv7r = "armv7r" # arm/v5te/softfp @@ -38,7 +48,7 @@ DEFAULTTUNE:virtclass-multilib-libarmv5tesoftfp = "armv5tesoftfp" AVAILTUNES += "armv5tesoftfp" PACKAGE_EXTRA_ARCHS:tune-armv5tesoftfp = "${TUNE_PKGARCH:tune-armv5tesoftfp}" BASE_LIB:tune-armv5tesoftfp = "lib/arm/v5te/softfp" -TUNE_FEATURES:tune-armv5tesoftfp = "arm armrm" +TUNE_FEATURES:tune-armv5tesoftfp = "arm armv7r" TUNE_CCARGS:tune-armv5tesoftfp = "-marm -march=armv5te+fp -mfloat-abi=softfp" TUNE_PKGARCH:tune-armv5tesoftfp = "armv5tefp" @@ -50,7 +60,7 @@ DEFAULTTUNE:virtclass-multilib-libarmv5tehard = "armv5tehard" AVAILTUNES += "armv5tehard" PACKAGE_EXTRA_ARCHS:tune-armv5tehard = "${TUNE_PKGARCH:tune-armv5tehard}" BASE_LIB:tune-armv5tehard = "lib/arm/v5te/hard" -TUNE_FEATURES:tune-armv5tehard = "arm armrm" +TUNE_FEATURES:tune-armv5tehard = "arm armv7r" TUNE_CCARGS:tune-armv5tehard = "-marm -march=armv5te+fp -mfloat-abi=hard" TUNE_PKGARCH:tune-armv5tehard = "armv5tefphf" @@ -62,7 +72,7 @@ DEFAULTTUNE:virtclass-multilib-libnofp = "armnofp" AVAILTUNES += "armnofp" PACKAGE_EXTRA_ARCHS:tune-armnofp = "${TUNE_PKGARCH:tune-armnofp}" BASE_LIB:tune-armnofp = "lib/thumb/nofp" -TUNE_FEATURES:tune-armnofp = "arm armrm" +TUNE_FEATURES:tune-armnofp = "arm armv7r" TUNE_CCARGS:tune-armnofp = "-mthumb -mfloat-abi=soft" TUNE_PKGARCH:tune-armnofp = "armt" @@ -74,7 +84,7 @@ DEFAULTTUNE:virtclass-multilib-libv7nofp = "armv7nofp" AVAILTUNES += "armv7nofp" PACKAGE_EXTRA_ARCHS:tune-armv7nofp = "${TUNE_PKGARCH:tune-armv7nofp}" BASE_LIB:tune-armv7nofp = "lib/thumb/v7/nofp" -TUNE_FEATURES:tune-armv7nofp ="arm armrm" +TUNE_FEATURES:tune-armv7nofp ="arm armv7r" TUNE_CCARGS:tune-armv7nofp = "-mthumb -march=armv7 -mfloat-abi=soft" TUNE_PKGARCH:tune-armv7nofp = "armv7t" @@ -86,7 +96,7 @@ DEFAULTTUNE:virtclass-multilib-libv7fpsoftfp = "armv7fpsoftfp" AVAILTUNES += "armv7fpsoftfp" PACKAGE_EXTRA_ARCHS:tune-armv7fpsoftfp = "${TUNE_PKGARCH:tune-armv7fpsoftfp}" BASE_LIB:tune-armv7fpsoftfp = "lib/thumb/v7+fp/softfp" -TUNE_FEATURES:tune-armv7fpsoftfp ="arm armrm" +TUNE_FEATURES:tune-armv7fpsoftfp ="arm armv7r" TUNE_CCARGS:tune-armv7fpsoftfp = "-mthumb -march=armv7+fp -mfloat-abi=softfp" TUNE_PKGARCH:tune-armv7fpsoftfp = "armv7fpt" @@ -98,7 +108,7 @@ DEFAULTTUNE:virtclass-multilib-libv7fphard = "armv7fphard" AVAILTUNES += "armv7fphard" PACKAGE_EXTRA_ARCHS:tune-armv7fphard = "${TUNE_PKGARCH:tune-armv7fphard}" BASE_LIB:tune-armv7fphard = "lib/thumb/v7+fp/hard" -TUNE_FEATURES:tune-armv7fphard ="arm armrm" +TUNE_FEATURES:tune-armv7fphard ="arm armv7r" TUNE_CCARGS:tune-armv7fphard = "-mthumb -march=armv7+fp -mfloat-abi=hard" TUNE_PKGARCH:tune-armv7fphard = "armv7fpthf" @@ -114,7 +124,7 @@ EXTRA_OECONF:append:pn-libv6mnofp-newlib = " --disable-newlib-supplied-sysca AVAILTUNES += "armv6mnofp" PACKAGE_EXTRA_ARCHS:tune-armv6mnofp = "${TUNE_PKGARCH:tune-armv6mnofp}" BASE_LIB:tune-armv6mnofp = "lib/thumb/v6-m/nofp" -TUNE_FEATURES:tune-armv6mnofp ="arm armrm" +TUNE_FEATURES:tune-armv6mnofp ="arm armv7r" TUNE_CCARGS:tune-armv6mnofp = "-mthumb -march=armv6s-m -mfloat-abi=soft" TUNE_PKGARCH:tune-armv6mnofp = "armv6smt" @@ -126,7 +136,7 @@ DEFAULTTUNE:virtclass-multilib-libv7mnofp = "armv7mnofp" AVAILTUNES += "armv7mnofp" PACKAGE_EXTRA_ARCHS:tune-armv7mnofp = "${TUNE_PKGARCH:tune-armv7mnofp}" BASE_LIB:tune-armv7mnofp = "lib/thumb/v7-m/nofp" -TUNE_FEATURES:tune-armv7mnofp ="arm armrm" +TUNE_FEATURES:tune-armv7mnofp ="arm armv7r" TUNE_CCARGS:tune-armv7mnofp = "-mthumb -march=armv7-m -mfloat-abi=soft" TUNE_PKGARCH:tune-armv7mnofp = "armv7mt" @@ -138,7 +148,7 @@ DEFAULTTUNE:virtclass-multilib-libv7emnofp = "armv7emnofp" AVAILTUNES += "armv7emnofp" PACKAGE_EXTRA_ARCHS:tune-armv7emnofp = "${TUNE_PKGARCH:tune-armv7emnofp}" BASE_LIB:tune-armv7emnofp = "lib/thumb/v7e-m/nofp" -TUNE_FEATURES:tune-armv7emnofp ="arm armrm" +TUNE_FEATURES:tune-armv7emnofp ="arm armv7r" TUNE_CCARGS:tune-armv7emnofp = "-mthumb -march=armv7e-m -mfloat-abi=soft" TUNE_PKGARCH:tune-armv7emnofp = "armv7emt" @@ -150,7 +160,7 @@ DEFAULTTUNE:virtclass-multilib-libv7emfpsoftfp = "armv7emfpsoftfp" AVAILTUNES += "armv7emfpsoftfp" PACKAGE_EXTRA_ARCHS:tune-armv7emfpsoftfp = "${TUNE_PKGARCH:tune-armv7emfpsoftfp}" BASE_LIB:tune-armv7emfpsoftfp = "lib/thumb/v7e-m+fp/softfp" -TUNE_FEATURES:tune-armv7emfpsoftfp ="arm armrm" +TUNE_FEATURES:tune-armv7emfpsoftfp ="arm armv7r" TUNE_CCARGS:tune-armv7emfpsoftfp = "-mthumb -march=armv7e-m+fp -mfloat-abi=softfp" TUNE_PKGARCH:tune-armv7emfpsoftfp = "armv7emfpt" @@ -162,7 +172,7 @@ DEFAULTTUNE:virtclass-multilib-libv7emfphard = "armv7emfphard" AVAILTUNES += "armv7emfphard" PACKAGE_EXTRA_ARCHS:tune-armv7emfphard = "${TUNE_PKGARCH:tune-armv7emfphard}" BASE_LIB:tune-armv7emfphard = "lib/thumb/v7e-m+fp/hard" -TUNE_FEATURES:tune-armv7emfphard ="arm armrm" +TUNE_FEATURES:tune-armv7emfphard ="arm armv7r" TUNE_CCARGS:tune-armv7emfphard = "-mthumb -march=armv7e-m+fp -mfloat-abi=hard" TUNE_PKGARCH:tune-armv7emfphard = "armv7emfpthf" @@ -174,7 +184,7 @@ DEFAULTTUNE:virtclass-multilib-libv7emdpsoftfp = "armv7emdpsoftfp" AVAILTUNES += "armv7emdpsoftfp" PACKAGE_EXTRA_ARCHS:tune-armv7emdpsoftfp = "${TUNE_PKGARCH:tune-armv7emdpsoftfp}" BASE_LIB:tune-armv7emdpsoftfp = "lib/thumb/v7e-m+dp/softfp" -TUNE_FEATURES:tune-armv7emdpsoftfp ="arm armrm" +TUNE_FEATURES:tune-armv7emdpsoftfp ="arm armv7r" TUNE_CCARGS:tune-armv7emdpsoftfp = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=softfp" TUNE_PKGARCH:tune-armv7emdpsoftfp = "armv7emdp" @@ -185,7 +195,7 @@ DEFAULTTUNE:virtclass-multilib-libv7emdphard = "armv7emdphard" AVAILTUNES += "armv7emdphard" PACKAGE_EXTRA_ARCHS:tune-armv7emdphard = "${TUNE_PKGARCH:tune-armv7emdphard}" BASE_LIB:tune-armv7emdphard = "lib/thumb/v7e-m+dp/hard" -TUNE_FEATURES:tune-armv7emdphard ="arm armrm" +TUNE_FEATURES:tune-armv7emdphard ="arm armv7r" TUNE_CCARGS:tune-armv7emdphard = "-mthumb -march=armv7e-m+fp.dp -mfloat-abi=hard" TUNE_PKGARCH:tune-armv7emdphard = "armv7emdpthf" @@ -201,7 +211,7 @@ EXTRA_OECONF:append:pn-libv8mbasenofp-newlib = " --disable-newlib-supplied-sysca AVAILTUNES += "armv8mbasenofp" PACKAGE_EXTRA_ARCHS:tune-armv8mbasenofp = "${TUNE_PKGARCH:tune-armv8mbasenofp}" BASE_LIB:tune-armv8mbasenofp = "lib/thumb/v8-m.base/nofp" -TUNE_FEATURES:tune-armv8mbasenofp ="arm armrm" +TUNE_FEATURES:tune-armv8mbasenofp ="arm armv8r" TUNE_CCARGS:tune-armv8mbasenofp = "-mthumb -march=armv8-m.base -mfloat-abi=soft" TUNE_PKGARCH:tune-armv8mbasenofp = "armv8mbaset" @@ -212,7 +222,7 @@ DEFAULTTUNE:virtclass-multilib-libv8mmainnofp = "armv8mmainnofp" AVAILTUNES += "armv8mmainnofp" PACKAGE_EXTRA_ARCHS:tune-armv8mmainnofp = "${TUNE_PKGARCH:tune-armv8mmainnofp}" BASE_LIB:tune-armv8mmainnofp = "lib/thumb/v8-m.main/nofp" -TUNE_FEATURES:tune-armv8mmainnofp ="arm armrm" +TUNE_FEATURES:tune-armv8mmainnofp ="arm armv8r" TUNE_CCARGS:tune-armv8mmainnofp = "-mthumb -march=armv8-m.main -mfloat-abi=soft" TUNE_PKGARCH:tune-armv8mmainnofp = "armv8mmaint" @@ -224,7 +234,7 @@ DEFAULTTUNE:virtclass-multilib-libv8mmainfpsoftfp = "armv8mmainfpsoftfp" AVAILTUNES += "armv8mmainfpsoftfp" PACKAGE_EXTRA_ARCHS:tune-armv8mmainfpsoftfp = "${TUNE_PKGARCH:tune-armv8mmainfpsoftfp}" BASE_LIB:tune-armv8mmainfpsoftfp = "lib/thumb/v8-m.main+fp/softfp" -TUNE_FEATURES:tune-armv8mmainfpsoftfp ="arm armrm" +TUNE_FEATURES:tune-armv8mmainfpsoftfp ="arm armv8r" TUNE_CCARGS:tune-armv8mmainfpsoftfp = "-mthumb -march=armv8-m.main+fp -mfloat-abi=softfp" TUNE_PKGARCH:tune-armv8mmainfpsoftfp = "armv8mmainfpt" @@ -235,7 +245,7 @@ DEFAULTTUNE:virtclass-multilib-libv8mmainfphard = "armv8mmainfphard" AVAILTUNES += "armv8mmainfphard" PACKAGE_EXTRA_ARCHS:tune-armv8mmainfphard = "${TUNE_PKGARCH:tune-armv8mmainfphard}" BASE_LIB:tune-armv8mmainfphard = "lib/thumb/v8-m.main+fp/hard" -TUNE_FEATURES:tune-armv8mmainfphard ="arm armrm" +TUNE_FEATURES:tune-armv8mmainfphard ="arm armv8r" TUNE_CCARGS:tune-armv8mmainfphard = "-mthumb -march=armv8-m.main+fp -mfloat-abi=hard" TUNE_PKGARCH:tune-armv8mmainfphard = "armv8mmainfpthf" @@ -247,7 +257,7 @@ DEFAULTTUNE:virtclass-multilib-libv8mmaindpsoftfp = "armv8mmaindpsoftfp" AVAILTUNES += "armv8mmaindpsoftfp" PACKAGE_EXTRA_ARCHS:tune-armv8mmaindpsoftfp = "${TUNE_PKGARCH:tune-armv8mmaindpsoftfp}" BASE_LIB:tune-armv8mmaindpsoftfp = "lib/thumb/v8-m.main+dp/softfp" -TUNE_FEATURES:tune-armv8mmaindpsoftfp ="arm armrm" +TUNE_FEATURES:tune-armv8mmaindpsoftfp ="arm armv8r" TUNE_CCARGS:tune-armv8mmaindpsoftfp = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=softfp" TUNE_PKGARCH:tune-armv8mmaindpsoftfp = "armv8mmainfpdpt" @@ -259,6 +269,6 @@ DEFAULTTUNE:virtclass-multilib-libv8mmaindphard = "armv8mmaindphard" AVAILTUNES += "armv8mmaindphard" PACKAGE_EXTRA_ARCHS:tune-armv8mmaindphard = "${TUNE_PKGARCH:tune-armv8mmaindphard}" BASE_LIB:tune-armv8mmaindphard = "lib/thumb/v8-m.main+dp/hard" -TUNE_FEATURES:tune-armv8mmaindphard ="arm armrm" +TUNE_FEATURES:tune-armv8mmaindphard ="arm armv8r" TUNE_CCARGS:tune-armv8mmaindphard = "-mthumb -march=armv8-m.main+fp.dp -mfloat-abi=hard" TUNE_PKGARCH:tune-armv8mmaindphard = "armv8mmainfpdpthf" -- cgit v1.2.3-54-g00ecf