meta-xilinx-standalone machines: Update to match embeddedsw

microblaze-pmu: Rename to microblaze-zynqmp-pmu
Also upon inspection of embeddedsw, it was setting the CPU version to v9.2.
Fix this.

versal-mb: Rename to microblaze-versal-fw
microblaze-plm: Remove (duplicate of above)
Also upon inspection of embeddedsw, it was setting the CPU version to v10.0.
Fix this.

Signed-off-by: Mark Hatle <mark.hatle@kernel.crashing.org>

4 files changed, 16 insertions, 22 deletions

diff --git a/meta-xilinx-standalone/conf/machine/microblaze-plm.conf b/meta-xilinx-standalone/conf/machine/microblaze-plm.conf
deleted file mode 100644
index 9ab8a46b..00000000
--- a/meta-xilinx-standalone/conf/machine/microblaze-plm.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFAULTTUNE ?= "microblaze"
-
-require conf/machine/include/soc-versal.inc
-
-# Endianess, multiplier, barrel shift, pattern compare, floating point double or single, are the possibilities
-AVAILTUNES += "microblaze"
-TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare"
-PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
-
-LINKER_HASH_STYLE_microblaze = "sysv"
diff --git a/meta-xilinx-standalone/conf/machine/microblaze-pmu.conf b/meta-xilinx-standalone/conf/machine/microblaze-pmu.conf
deleted file mode 100644
index 09fd3c80..00000000
--- a/meta-xilinx-standalone/conf/machine/microblaze-pmu.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFAULTTUNE ?= "microblaze"
-
-require conf/machine/include/soc-zynqmp.inc
-
-# Endianess, multiplier, barrel shift, pattern compare, floating point double or single, are the possibilities
-AVAILTUNES += "microblaze"
-TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare"
-PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
-
-LINKER_HASH_STYLE_microblaze = "sysv"
diff --git a/meta-xilinx-standalone/conf/machine/microblaze-versal-fw.conf b/meta-xilinx-standalone/conf/machine/microblaze-versal-fw.conf
new file mode 100644
index 00000000..620338f5
--- /dev/null
+++ b/meta-xilinx-standalone/conf/machine/microblaze-versal-fw.conf
@@ -0,0 +1,11 @@
+# Definition for versal PSM and PLM Firmware
+
+DEFAULTTUNE ?= "microblaze"
+
+require conf/machine/versal-generic.conf
+
+AVAILTUNES += "microblaze"
+TUNE_FEATURES_tune-microblaze = "microblaze v10.0 barrel-shift pattern-compare"
+PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
+
+LINKER_HASH_STYLE_microblaze = ""
diff --git a/meta-xilinx-standalone/conf/machine/versal-mb.conf b/meta-xilinx-standalone/conf/machine/microblaze-zynqmp-pmu.conf
index f40b8bca..247b8bd5 100644
--- a/meta-xilinx-standalone/conf/machine/versal-mb.conf
+++ b/meta-xilinx-standalone/conf/machine/microblaze-zynqmp-pmu.conf
@@ -1,10 +1,13 @@
+# Definition for ZynqMP PMU Firmware
+
 DEFAULTTUNE ?= "microblaze"
 
-require conf/machine/include/soc-versal.inc
+# Based on zynqmp-generic
+require conf/machine/zynqmp-generic.conf
 
 # Endianess, multiplier, barrel shift, pattern compare, floating point double or single, are the possibilities
 AVAILTUNES += "microblaze"
-TUNE_FEATURES_tune-microblaze = "microblaze v11.0 barrel-shift pattern-compare"
+TUNE_FEATURES_tune-microblaze = "microblaze v9.2 barrel-shift pattern-compare"
 PACKAGE_EXTRA_ARCHS_tune-microblaze = "${TUNE_PKGARCH}"
 
 LINKER_HASH_STYLE_microblaze = ""