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>

7 files changed, 10 insertions, 10 deletions

diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.cfg b/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg
index 771aec06..771aec06 100644
--- a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.cfg
+++ b/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.cfg
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc b/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc
new file mode 100644
index 00000000..ae3c3104
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc
@@ -0,0 +1,4 @@
+define KFEATURE_DESCRIPTION "Kernel Config for ml605-qemu-microblazeel specific setup"
+define KFEATURE_COMPATIBILITY board
+
+kconf hardware ml605-qemu-microblazeel.cfg
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.scc b/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.scc
deleted file mode 100644
index e109ecb3..00000000
--- a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Kernel Config for qemumicroblaze-s3adsp1800 specific setup"
-define KFEATURE_COMPATIBILITY board
-
-kconf hardware qemumicroblaze-s3adsp1800.cfg
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.scc b/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.scc
deleted file mode 100644
index 8c14d76e..00000000
--- a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.scc
+++ /dev/null
@@ -1,4 +0,0 @@
-define KFEATURE_DESCRIPTION "Kernel Config for qemumicroblaze specific setup"
-define KFEATURE_COMPATIBILITY board
-
-kconf hardware qemumicroblaze.cfg
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.cfg b/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg
index 0f635c16..0f635c16 100644
--- a/recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.cfg
+++ b/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.cfg
diff --git a/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc b/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc
new file mode 100644
index 00000000..aef8109f
--- /dev/null
+++ b/recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc
@@ -0,0 +1,4 @@
+define KFEATURE_DESCRIPTION "Kernel Config for s3adsp1800-qemu-microblazeeb specific setup"
+define KFEATURE_COMPATIBILITY board
+
+kconf hardware s3adsp1800-qemu-microblazeeb.cfg
diff --git a/recipes-kernel/linux/linux-xilinx-machines.inc b/recipes-kernel/linux/linux-xilinx-machines.inc
index aa3149b1..77cab0af 100644
--- a/recipes-kernel/linux/linux-xilinx-machines.inc
+++ b/recipes-kernel/linux/linux-xilinx-machines.inc
@@ -5,8 +5,8 @@ COMPATIBLE_MACHINE_zynqmp = "zynqmp"
 COMPATIBLE_MACHINE_microblaze = "microblaze"
 
 # Default kernel config fragements for specific machines
-KERNEL_FEATURES_append_qemumicroblaze = " bsp/qemumicroblaze/qemumicroblaze.scc"
-KERNEL_FEATURES_append_qemumicroblaze-s3adsp1800 = " bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.scc"
+KERNEL_FEATURES_append_ml605-qemu-microblazeel = " bsp/ml605-qemu-microblazeel.scc"
+KERNEL_FEATURES_append_s3adsp1800-qemu-microblazeeb = " bsp/s3adsp1800-qemu-microblazeeb.scc"
 KERNEL_FEATURES_append_kc705-microblazeel = " bsp/kc705-microblazeel/kc705-microblazeel.scc"
 
 # MicroBlaze is a uImage target, but its not called 'uImage' instead it is called 'linux.bin.ub'