From 7b078123b78805b5f973b453a07808cdcfa0ae36 Mon Sep 17 00:00:00 2001 From: Peter Seebach Date: Tue, 1 May 2012 20:45:10 -0500 Subject: conf/machine: Clean up configuration values. This cleans up and/or corrects a few values from machine includes for consistency with future toolchain sanity checks, and also adds the TUNEVALID and TUNECONFLICTS to documentation.conf. (From OE-Core rev: 6ffe53c721a80cf156b44f59b564f2e899c6af50) Signed-off-by: Peter Seebach Signed-off-by: Richard Purdie --- meta/conf/machine/include/mips/arch-mips.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta/conf/machine/include/mips/arch-mips.inc') diff --git a/meta/conf/machine/include/mips/arch-mips.inc b/meta/conf/machine/include/mips/arch-mips.inc index 8758ecd714..9f12920848 100644 --- a/meta/conf/machine/include/mips/arch-mips.inc +++ b/meta/conf/machine/include/mips/arch-mips.inc @@ -12,15 +12,15 @@ TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "bigendian", "-meb", "-mel # ABI flags TUNEVALID[o32] = "MIPS o32 ABI" -TUNECONFLICT[o32] = "n32 n64" +TUNECONFLICTS[o32] = "n32 n64" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "o32", "-mabi=32", "", d)}" TUNEVALID[n32] = "MIPS64 n32 ABI" -TUNECONFLICT[n32] = "o32 n64" +TUNECONFLICTS[n32] = "o32 n64" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "n32", "-mabi=n32", "", d)}" TUNEVALID[n64] = "MIPS64 n64 ABI" -TUNECONFLICT[n64] = "o32 n32" +TUNECONFLICTS[n64] = "o32 n32" TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "n64", "-mabi=64", "", d)}" # Floating point -- cgit v1.2.3-54-g00ecf