qemu* -> *qemu-*: Rename QEMU machines

Rename the QEMU machines to match the <board>-<design>-<arch>
convention. QEMU only machines no longer need to be named qemu*.

Note for qemuzynq it is special in that it does not model a board, as
such it has no board in the name being just 'qemu-zynq7'.

This updates the README.md to match the new machine names.

Additional update all occurrences of the qemu* machines

Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/conf/machine/qemumicroblaze.conf b/conf/machine/ml605-qemu-microblazeel.conf
index 6fca065e..38364a83 100644
--- a/conf/machine/qemumicroblaze.conf
+++ b/conf/machine/ml605-qemu-microblazeel.conf
@@ -1,5 +1,5 @@
 #@TYPE: Machine
-#@NAME: qemumicroblaze
+#@NAME: ml605-qemu-microblazeel
 #@DESCRIPTION: MicroBlaze QEMU machine support ('petalogix-ml605' model)
 
 require conf/machine/include/tune-microblaze.inc
diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemu-zynq7.conf
index 70ea9e0e..02b9e621 100644
--- a/conf/machine/qemuzynq.conf
+++ b/conf/machine/qemu-zynq7.conf
@@ -1,5 +1,5 @@
 #@TYPE: Machine
-#@NAME: qemuzynq
+#@NAME: qemu-zynq7
 #@DESCRIPTION: Zynq QEMU machine support ('xilinx-zynq-a9' model)
 
 require conf/machine/include/tune-zynq.inc
@@ -11,7 +11,7 @@ MACHINE_FEATURES = "ext2 vfat"
 SERIAL_CONSOLE = "115200 ttyPS0"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
-MACHINE_DEVICETREE = "qemu/qemuzynq.dts"
+MACHINE_DEVICETREE = "qemu/qemu-zynq7.dts"
 
 # Use the networking setup from qemuarm
 FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
diff --git a/conf/machine/qemumicroblaze-s3adsp1800.conf b/conf/machine/s3adsp1800-qemu-microblazeeb.conf
index 4eb5061f..d76ed17f 100644
--- a/conf/machine/qemumicroblaze-s3adsp1800.conf
+++ b/conf/machine/s3adsp1800-qemu-microblazeeb.conf
@@ -1,5 +1,5 @@
 #@TYPE: Machine
-#@NAME: qemumicroblaze-s3adsp1800
+#@NAME: s3adsp1800-qemu-microblazeeb
 #@DESCRIPTION: MicroBlaze QEMU machine support ('petalogix-s3adsp1800' model)
 
 require conf/machine/include/tune-microblaze.inc