[meta-xilinx] [meta-xilinx 05/14] feature-microblaze-versions.inc: Update to v9.6

Manjukumar Matha manjukumar.harthikote-matha at xilinx.com
Mon May 2 17:57:25 PDT 2016


Update the conflict list for v9.6

Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha at xilinx.com>
---
 conf/machine/include/microblaze/feature-microblaze-versions.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/conf/machine/include/microblaze/feature-microblaze-versions.inc b/conf/machine/include/microblaze/feature-microblaze-versions.inc
index 24181cc..c674ba2 100644
--- a/conf/machine/include/microblaze/feature-microblaze-versions.inc
+++ b/conf/machine/include/microblaze/feature-microblaze-versions.inc
@@ -9,6 +9,7 @@ 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.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"
 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"
-- 
2.1.4




More information about the meta-xilinx mailing list