From 14b07c94ab0f564c17ab07ea7a6d9d53dc8a87f4 Mon Sep 17 00:00:00 2001 From: Manjukumar Matha Date: Thu, 12 May 2016 17:31:26 -0700 Subject: feature-microblaze-*.inc: Updated to v9.6 Update to the latest v9.6 tune feature Signed-off-by: Manjukumar Matha Signed-off-by: Nathan Rossi --- .../include/microblaze/feature-microblaze-v9.inc | 4 ++++ .../include/microblaze/feature-microblaze-versions.inc | 17 +++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/conf/machine/include/microblaze/feature-microblaze-v9.inc b/conf/machine/include/microblaze/feature-microblaze-v9.inc index cb934f6a..4777398c 100644 --- a/conf/machine/include/microblaze/feature-microblaze-v9.inc +++ b/conf/machine/include/microblaze/feature-microblaze-v9.inc @@ -1,4 +1,8 @@ # Setup version 'feature set' for supported Microblaze version 9 versions +TUNEVALID[v9.6] = "Use Microblaze version 9.6" +MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v9.6", "-mcpu=v9.6", "" ,d)}" +MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v9.6", "-v9.6", "" ,d)}" + TUNEVALID[v9.0] = "Use Microblaze version 9.0" MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v9.0", "-mcpu=v9.0", "" ,d)}" MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v9.0", "-v9.0", "" ,d)}" diff --git a/conf/machine/include/microblaze/feature-microblaze-versions.inc b/conf/machine/include/microblaze/feature-microblaze-versions.inc index 24181cc9..1dc176e7 100644 --- a/conf/machine/include/microblaze/feature-microblaze-versions.inc +++ b/conf/machine/include/microblaze/feature-microblaze-versions.inc @@ -9,11 +9,12 @@ require conf/machine/include/microblaze/feature-microblaze-v7.inc # Setup a 'feature set' conflict list which ensures only one version is selected # when defining the TUNE_FEATURES_tune-<> in local.conf file. -TUNECONFLICTS[v9.0] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.40 v8.50" -TUNECONFLICTS[v8.50] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.40 v9.0" -TUNECONFLICTS[v8.40] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.50 v9.0" -TUNECONFLICTS[v8.30] += "v7.30 v8.00 v8.10 v8.20 v8.40 v8.50 v9.0" -TUNECONFLICTS[v8.20] += "v7.30 v8.00 v8.10 v8.30 v8.40 v8.50 v9.0" -TUNECONFLICTS[v8.10] += "v7.30 v8.00 v8.20 v8.30 v8.40 v8.50 v9.0" -TUNECONFLICTS[v8.00] += "v7.30 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0" -TUNECONFLICTS[v7.30] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0" +TUNECONFLICTS[v9.6] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0" +TUNECONFLICTS[v9.0] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.6" +TUNECONFLICTS[v8.50] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.40 v9.0 v9.6" +TUNECONFLICTS[v8.40] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.50 v9.0 v9.6" +TUNECONFLICTS[v8.30] += "v7.30 v8.00 v8.10 v8.20 v8.40 v8.50 v9.0 v9.6" +TUNECONFLICTS[v8.20] += "v7.30 v8.00 v8.10 v8.30 v8.40 v8.50 v9.0 v9.6" +TUNECONFLICTS[v8.10] += "v7.30 v8.00 v8.20 v8.30 v8.40 v8.50 v9.0 v9.6" +TUNECONFLICTS[v8.00] += "v7.30 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.6" +TUNECONFLICTS[v7.30] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.6" -- cgit v1.2.3-54-g00ecf