microblaze: Change version tune format.

Modify versions from vXYY to vX.YY to provide distinction between major and minor sections.

Signed-off-by: Sipke Vriend <sipke.vriend@xilinx.com>

5 files changed, 32 insertions, 32 deletions

diff --git a/conf/machine/include/microblaze/feature-microblaze-v7.inc b/conf/machine/include/microblaze/feature-microblaze-v7.inc
index f716c67b..6022e473 100644
--- a/conf/machine/include/microblaze/feature-microblaze-v7.inc
+++ b/conf/machine/include/microblaze/feature-microblaze-v7.inc
@@ -1,7 +1,7 @@
 # Setup version 'feature set' for supported Microblaze version 7 versions
-TUNEVALID[v730] = "Use Microblaze version 7.30"
+TUNEVALID[v7.30] = "Use Microblaze version 7.30"
 
-MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v730", "-mcpu=v7.30.a", "" ,d)}"
-MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v730", "-v730", "" ,d)}"
+MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v7.30", "-mcpu=v7.30.a", "" ,d)}"
+MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v7.30", "-v7.30", "" ,d)}"
 
-TUNECONFLICTS[v730] += "reorder little-endian"
+TUNECONFLICTS[v7.30] += "reorder little-endian"
diff --git a/conf/machine/include/microblaze/feature-microblaze-v8.inc b/conf/machine/include/microblaze/feature-microblaze-v8.inc
index 43f68086..21b54c0f 100644
--- a/conf/machine/include/microblaze/feature-microblaze-v8.inc
+++ b/conf/machine/include/microblaze/feature-microblaze-v8.inc
@@ -1,24 +1,24 @@
 # Setup version 'feature set' for supported Microblaze version 8 versions
-TUNEVALID[v850] = "Use Microblaze version 8.50"
-MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v850", "-mcpu=v8.50.a", "" ,d)}"
-MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v850", "-v850", "" ,d)}"
+TUNEVALID[v8.50] = "Use Microblaze version 8.50"
+MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v8.50", "-mcpu=v8.50.a", "" ,d)}"
+MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v8.50", "-v8.50", "" ,d)}"
 
-TUNEVALID[v840] = "Use Microblaze version 8.40"
-MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v840", "-mcpu=v8.40.a", "" ,d)}"
-MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v840", "-v840", "" ,d)}"
+TUNEVALID[v8.40] = "Use Microblaze version 8.40"
+MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v8.40", "-mcpu=v8.40.a", "" ,d)}"
+MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v8.40", "-v8.40", "" ,d)}"
 
-TUNEVALID[v830] = "Use Microblaze version 8.30"
-MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v830", "-mcpu=v8.30.a", "" ,d)}"
-MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v830", "-v830", "" ,d)}"
+TUNEVALID[v8.30] = "Use Microblaze version 8.30"
+MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v8.30", "-mcpu=v8.30.a", "" ,d)}"
+MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v8.30", "-v8.30", "" ,d)}"
 
-TUNEVALID[v820] = "Use Microblaze version 8.20"
-MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v820", "-mcpu=v8.20.a", "" ,d)}"
-MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v820", "-v820", "" ,d)}"
+TUNEVALID[v8.20] = "Use Microblaze version 8.20"
+MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v8.20", "-mcpu=v8.20.a", "" ,d)}"
+MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v8.20", "-v8.20", "" ,d)}"
 
-TUNEVALID[v810] = "Use Microblaze version 8.10"
-MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v810", "-mcpu=v8.10.a", "" ,d)}"
-MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v810", "-v810", "" ,d)}"
+TUNEVALID[v8.10] = "Use Microblaze version 8.10"
+MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v8.10", "-mcpu=v8.10.a", "" ,d)}"
+MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v8.10", "-v8.10", "" ,d)}"
 
-TUNEVALID[v800] = "Use Microblaze version 8.00"
-MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v800", "-mcpu=v8.00.a", "" ,d)}"
-MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v800", "-v800", "" ,d)}"
+TUNEVALID[v8.00] = "Use Microblaze version 8.00"
+MBCCARGSVERSION += "${@bb.utils.contains("TUNE_FEATURES", "v8.00", "-mcpu=v8.00.a", "" ,d)}"
+MBPKGVERSION .= "${@bb.utils.contains("TUNE_FEATURES", "v8.00", "-v8.00", "" ,d)}"
diff --git a/conf/machine/include/microblaze/feature-microblaze-versions.inc b/conf/machine/include/microblaze/feature-microblaze-versions.inc
index b6ff708a..a6e356d2 100644
--- a/conf/machine/include/microblaze/feature-microblaze-versions.inc
+++ b/conf/machine/include/microblaze/feature-microblaze-versions.inc
@@ -8,10 +8,10 @@ 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[v850] += "v730 v800 v810 v820 v830 v840"
-TUNECONFLICTS[v840] += "v730 v800 v810 v820 v830 v850"
-TUNECONFLICTS[v830] += "v730 v800 v810 v820 v840 v850"
-TUNECONFLICTS[v820] += "v730 v800 v810 v830 v840 v850"
-TUNECONFLICTS[v810] += "v730 v800 v820 v830 v840 v850"
-TUNECONFLICTS[v800] += "v730 v810 v820 v830 v840 v850"
-TUNECONFLICTS[v730] += "v800 v810 v820 v830 v840 v850"
+TUNECONFLICTS[v8.50] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.40"
+TUNECONFLICTS[v8.40] += "v7.30 v8.00 v8.10 v8.20 v8.30 v8.50"
+TUNECONFLICTS[v8.30] += "v7.30 v8.00 v8.10 v8.20 v8.40 v8.50"
+TUNECONFLICTS[v8.20] += "v7.30 v8.00 v8.10 v8.30 v8.40 v8.50"
+TUNECONFLICTS[v8.10] += "v7.30 v8.00 v8.20 v8.30 v8.40 v8.50"
+TUNECONFLICTS[v8.00] += "v7.30 v8.10 v8.20 v8.30 v8.40 v8.50"
+TUNECONFLICTS[v7.30] += "v8.00 v8.10 v8.20 v8.30 v8.40 v8.50"
diff --git a/conf/machine/microblazeel.conf b/conf/machine/microblazeel.conf
index 5ca9b100..d1857dc3 100644
--- a/conf/machine/microblazeel.conf
+++ b/conf/machine/microblazeel.conf
@@ -8,7 +8,7 @@
 # For this reason the user must define the TUNE_FEATURES_tune-microblaze 
 # in the local.conf file. 
 # An example is:
-# TUNE_FEATURES_tune-microblaze += "little-endian v830 barrel-shift multiply-high multiply-low pattern-compare reorder divide-hard fpu-hard fpu-hard-extended"
+# TUNE_FEATURES_tune-microblaze += "little-endian v8.30 barrel-shift multiply-high multiply-low pattern-compare reorder divide-hard fpu-hard fpu-hard-extended"
 # If no other feature is defined in local.conf, then no hardware 
 # features will be enabled.
 
@@ -17,7 +17,7 @@ MACHINE_FEATURES := ""
 
 require conf/machine/include/tune-microblaze.inc
 
-TUNE_FEATURES_tune-microblaze += "little-endian v830"
+TUNE_FEATURES_tune-microblaze += "little-endian v8.30"
 
 KERNEL_IMAGETYPE = "uImage"
 
diff --git a/meta-kc705/conf/machine/kc705-trd.conf b/meta-kc705/conf/machine/kc705-trd.conf
index 9722bfc8..764ab339 100644
--- a/meta-kc705/conf/machine/kc705-trd.conf
+++ b/meta-kc705/conf/machine/kc705-trd.conf
@@ -6,6 +6,6 @@ TARGET_CPU = "microblazeel"
 MACHINE_FEATURES := ""
 
 require conf/machine/include/tune-microblaze.inc
-TUNE_FEATURES_tune-microblaze += "v830 little-endian barrel-shift pattern-compare divide-hard multiply-high"
+TUNE_FEATURES_tune-microblaze += "v8.30 little-endian barrel-shift pattern-compare divide-hard multiply-high"
 
 SERIAL_CONSOLE = "115200 ttyS0"