[meta-xilinx] [PATCH] qemu* -> *qemu-*: Rename QEMU machines
Nathan Rossi
nathan at nathanrossi.com
Wed Oct 26 09:20:19 PDT 2016
On Mon, Oct 24, 2016 at 5:09 PM, Alistair Francis <alistair23 at gmail.com> wrote:
> On Fri, Oct 21, 2016 at 3:15 PM, Nathan Rossi <nathan at nathanrossi.com> wrote:
>> 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 at nathanrossi.com>
>
> Looks good to me
>
> Reviewed-by: Alistair Francis <alistair.francis at xilinx.com>
Thanks for the review Alistair.
I have merged this.
Regards,
Nathan
>
> Thanks,
>
> Alistair
>
>> ---
>> README.md | 6 +++---
>> conf/machine/{qemumicroblaze.conf => ml605-qemu-microblazeel.conf} | 2 +-
>> conf/machine/{qemuzynq.conf => qemu-zynq7.conf} | 4 ++--
>> ...microblaze-s3adsp1800.conf => s3adsp1800-qemu-microblazeeb.conf} | 2 +-
>> recipes-bsp/device-tree/files/qemu/{qemuzynq.dts => qemu-zynq7.dts} | 0
>> .../qemumicroblaze.cfg => ml605-qemu-microblazeel.cfg} | 0
>> .../linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc | 4 ++++
>> .../bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.scc | 4 ----
>> .../config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.scc | 4 ----
>> ...mumicroblaze-s3adsp1800.cfg => s3adsp1800-qemu-microblazeeb.cfg} | 0
>> .../config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc | 4 ++++
>> recipes-kernel/linux/linux-xilinx-machines.inc | 4 ++--
>> 12 files changed, 17 insertions(+), 17 deletions(-)
>> rename conf/machine/{qemumicroblaze.conf => ml605-qemu-microblazeel.conf} (96%)
>> rename conf/machine/{qemuzynq.conf => qemu-zynq7.conf} (92%)
>> rename conf/machine/{qemumicroblaze-s3adsp1800.conf => s3adsp1800-qemu-microblazeeb.conf} (95%)
>> rename recipes-bsp/device-tree/files/qemu/{qemuzynq.dts => qemu-zynq7.dts} (100%)
>> rename recipes-kernel/linux/config/xilinx-machine/bsp/{qemumicroblaze/qemumicroblaze.cfg => ml605-qemu-microblazeel.cfg} (100%)
>> create mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/ml605-qemu-microblazeel.scc
>> delete mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.scc
>> delete mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.scc
>> rename recipes-kernel/linux/config/xilinx-machine/bsp/{qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.cfg => s3adsp1800-qemu-microblazeeb.cfg} (100%)
>> create mode 100644 recipes-kernel/linux/config/xilinx-machine/bsp/s3adsp1800-qemu-microblazeeb.scc
>>
>> diff --git a/README.md b/README.md
>> index 491b19c4dc..c3fc60682e 100644
>> --- a/README.md
>> +++ b/README.md
>> @@ -12,11 +12,11 @@ Supported Boards/Machines
>>
>> Boards/Machines supported by this layer:
>> * MicroBlaze:
>> - * [qemumicroblaze](conf/machine/qemumicroblaze.conf) - `qemumicroblaze`
>> - * [qemumicroblaze-s3adsp1800](conf/machine/qemumicroblaze-s3adsp1800.conf) - `qemumicroblaze-s3adsp1800`
>> + * [Xilinx ML605 (QEMU)](conf/machine/ml605-qemu-microblazeel.conf) - `ml605-qemu-microblazeel` (QEMU support)
>> + * [Xilinx S3A DSP 1800 (QEMU)](conf/machine/s3adsp1800-qemu-microblazeeb.conf) - `s3adsp1800-qemu-microblazeeb` (QEMU support)
>> * [Xilinx KC705](conf/machine/kc705-microblazeel.conf) - `kc705-microblazeel`
>> * Zynq:
>> - * [qemuzynq](conf/machine/qemuzynq.conf) - `qemuzynq`
>> + * [Zynq (QEMU)](conf/machine/qemu-zynq7.conf) - `qemu-zynq7` (QEMU Support)
>> * [Xilinx ZC702](conf/machine/zc702-zynq7.conf) - `zc702-zynq7`
>> * [Xilinx ZC706](conf/machine/zc706-zynq7.conf) - `zc706-zynq7`
>> * [Avnet MicroZed](conf/machine/microzed-zynq7.conf) - `microzed-zynq7`
>> diff --git a/conf/machine/qemumicroblaze.conf b/conf/machine/ml605-qemu-microblazeel.conf
>> similarity index 96%
>> rename from conf/machine/qemumicroblaze.conf
>> rename to conf/machine/ml605-qemu-microblazeel.conf
>> index 6fca065e4b..38364a839d 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
>> similarity index 92%
>> rename from conf/machine/qemuzynq.conf
>> rename to conf/machine/qemu-zynq7.conf
>> index 70ea9e0e4f..02b9e62106 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
>> similarity index 95%
>> rename from conf/machine/qemumicroblaze-s3adsp1800.conf
>> rename to conf/machine/s3adsp1800-qemu-microblazeeb.conf
>> index 4eb5061fdf..d76ed17f57 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
>> diff --git a/recipes-bsp/device-tree/files/qemu/qemuzynq.dts b/recipes-bsp/device-tree/files/qemu/qemu-zynq7.dts
>> similarity index 100%
>> rename from recipes-bsp/device-tree/files/qemu/qemuzynq.dts
>> rename to recipes-bsp/device-tree/files/qemu/qemu-zynq7.dts
>> 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
>> similarity index 100%
>> rename from recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze/qemumicroblaze.cfg
>> rename to 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 0000000000..ae3c3104f8
>> --- /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 e109ecb3cd..0000000000
>> --- 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 8c14d76e05..0000000000
>> --- 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
>> similarity index 100%
>> rename from recipes-kernel/linux/config/xilinx-machine/bsp/qemumicroblaze-s3adsp1800/qemumicroblaze-s3adsp1800.cfg
>> rename to 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 0000000000..aef8109fea
>> --- /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 aa3149b1a7..77cab0af33 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'
>> --
>> 2.9.3
>> --
>> _______________________________________________
>> meta-xilinx mailing list
>> meta-xilinx at yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-xilinx
More information about the meta-xilinx
mailing list