aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2016-11-01 16:18:26 -0700
committerNathan Rossi <nathan@nathanrossi.com>2016-11-02 19:11:25 +1000
commit7b4f401c04ed7887db892b340ca9decc26a06324 (patch)
tree095873a45ab782c3173039106b6c2a9ebbb05804
parent85c3eda9c36ee4b07f7ad190d5eef513f2cb237b (diff)
downloadmeta-xilinx-7b4f401c04ed7887db892b340ca9decc26a06324.tar.gz
meta-xilinx-7b4f401c04ed7887db892b340ca9decc26a06324.tar.bz2
meta-xilinx-7b4f401c04ed7887db892b340ca9decc26a06324.zip
feature-microblaze-*: Add Microblaze v10.0 IP
Add v10.0 IP for microblaze Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com> Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r--conf/machine/include/microblaze/feature-microblaze-v10.inc5
-rw-r--r--conf/machine/include/microblaze/feature-microblaze-versions.inc20
2 files changed, 16 insertions, 9 deletions
diff --git a/conf/machine/include/microblaze/feature-microblaze-v10.inc b/conf/machine/include/microblaze/feature-microblaze-v10.inc
new file mode 100644
index 00000000..61b440df
--- /dev/null
+++ b/conf/machine/include/microblaze/feature-microblaze-v10.inc
@@ -0,0 +1,5 @@
+# Setup version 'feature set' for supported Microblaze version 10 versions
+
+TUNEVALID[v10.0] = "Use Microblaze version 10.0"
+MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v10.0", "-mcpu=v10.0", "" ,d)}"
+MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v10.0", "-v10.0", "" ,d)}"
diff --git a/conf/machine/include/microblaze/feature-microblaze-versions.inc b/conf/machine/include/microblaze/feature-microblaze-versions.inc
index 1dc176e7..1d99ede4 100644
--- a/conf/machine/include/microblaze/feature-microblaze-versions.inc
+++ b/conf/machine/include/microblaze/feature-microblaze-versions.inc
@@ -3,18 +3,20 @@
MBCCARGSVERSION = ""
MBPKGVERSION = ""
+require conf/machine/include/microblaze/feature-microblaze-v10.inc
require conf/machine/include/microblaze/feature-microblaze-v9.inc
require conf/machine/include/microblaze/feature-microblaze-v8.inc
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 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"
+TUNECONFLICTS[v10.0] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.6"
+TUNECONFLICTS[v9.6] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v10.0"
+TUNECONFLICTS[v9.0] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.6 v10.0"
+TUNECONFLICTS[v8.50] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.40 v9.0 v9.6 v10.0"
+TUNECONFLICTS[v8.40] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.50 v9.0 v9.6 v10.0"
+TUNECONFLICTS[v8.30] += "v7.30 v8.00 v8.10 v8.20 v8.40 v8.50 v9.0 v9.6 v10.0"
+TUNECONFLICTS[v8.20] += "v7.30 v8.00 v8.10 v8.30 v8.40 v8.50 v9.0 v9.6 v10.0"
+TUNECONFLICTS[v8.10] += "v7.30 v8.00 v8.20 v8.30 v8.40 v8.50 v9.0 v9.6 v10.0"
+TUNECONFLICTS[v8.00] += "v7.30 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.6 v10.0"
+TUNECONFLICTS[v7.30] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50 v9.0 v9.6 v10.0"