[meta-xilinx] [PATCH 10/29] conf/machine: update for new runqemu

[Nathan Rossi]

On Thu, Sep 29, 2016 at 7:16 AM, Alistair Francis <alistair23 at gmail.com> wrote:
> On Wed, Sep 28, 2016 at 8:15 AM, Nathan Rossi <nathan at nathanrossi.com> wrote:
>> From: Robert Yang <liezhi.yang at windriver.com>
>>
>> The new runqemu has removed machine knowledge, these info can set in
>> bsp's conf file, please see oe-core's meta/classes/qemuboot.bbclass for
>> more info.
>>
>> Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
>> Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
>> ---
>>  conf/machine/qemumicroblaze.conf |  7 +++++++
>>  conf/machine/qemuzynq.conf       | 10 ++++++++++
>>  conf/machine/qemuzynqmp.conf     | 12 ++++++++++++
>>  3 files changed, 29 insertions(+)
>>
>> diff --git a/conf/machine/qemumicroblaze.conf b/conf/machine/qemumicroblaze.conf
>> index 9de93c8cce..d3708dd180 100644
>> --- a/conf/machine/qemumicroblaze.conf
>> +++ b/conf/machine/qemumicroblaze.conf
>> @@ -17,3 +17,10 @@ SERIAL_CONSOLE = "115200 ttyS0"
>>  # Use the networking setup from qemuarm
>>  FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
>>
>> +# For runqemu
>> +IMAGE_CLASSES += "qemuboot"
>> +QB_SYSTEM_NAME = "qemu-system-microblazeel"
>> +QB_MACHINE = "-machine petalogix-ml605"
>> +QB_DEFAULT_FSTYPE = "cpio"
>> +QB_KERNEL_CMDLINE_APPEND = "console=ttyPS0 earlyprintk"
>> +QB_MEM = "-m 256"
>> diff --git a/conf/machine/qemuzynq.conf b/conf/machine/qemuzynq.conf
>> index c23db5da44..894fee8173 100644
>> --- a/conf/machine/qemuzynq.conf
>> +++ b/conf/machine/qemuzynq.conf
>> @@ -17,3 +17,13 @@ MACHINE_DEVICETREE = "qemu/qemuzynq.dts"
>>  # Use the networking setup from qemuarm
>>  FILESOVERRIDES_append_pn-init-ifupdown = ":qemuarm"
>>
>> +# For runqemu
>> +IMAGE_CLASSES += "qemuboot"
>> +QB_SYSTEM_NAME = "qemu-system-arm"
>
> Can we use aarch64 instead?
>
> It is a super-set of system-arm.

Sure, however I will add the change in machine-xilinx-qemu.inc to swap
"arm" -> "aarch64" in the python function.

>
>> +QB_MEM = "-m 1024"
>> +QB_MACHINE = "-machine xilinx-zynq-a9"
>> +QB_DTB = "${MACHINE}.dtb"
>> +QB_SERIAL_OPT = "-serial null -serial mon:stdio"
>> +QB_OPT_APPEND = "-net nic -net nic -usb -usbdevice tablet"
>> +QB_DEFAULT_FSTYPE = "cpio"
>> +QB_KERNEL_CMDLINE_APPEND = "console=ttyPS0"
>> diff --git a/conf/machine/qemuzynqmp.conf b/conf/machine/qemuzynqmp.conf
>> index 8b4dd5d230..6fa93b164b 100644
>> --- a/conf/machine/qemuzynqmp.conf
>> +++ b/conf/machine/qemuzynqmp.conf
>> @@ -5,3 +5,15 @@
>>  MACHINEOVERRIDES =. "ep108-zynqmp:"
>>
>>  require conf/machine/ep108-zynqmp.conf
>> +
>> +# For runqemu
>> +IMAGE_CLASSES += "qemuboot"
>> +QB_SYSTEM_NAME = "qemu-system-aarch64"
>> +QB_MACHINE = "-machine xlnx-ep108"
>> +QB_CPU = "-cpu cortex-a57"
>
> ZynqMP has A53s, why is this setting the A57?
>
> Also, we don't need the CPU option at all.

Will drop it where adding the runqemu setup support for ep108/zcu102.

Regards,
Nathan

>
> Thanks,
>
> Alistair
>
>> +QB_MEM = "-m 2048"
>> +QB_DTB = "${QEMU_DTB}.dtb"
>> +QB_SERIAL_OPT = "-serial mon:stdio -serial null"
>> +QB_DEFAULT_KERNEL = "Image"
>> +QB_DEFAULT_FSTYPE = "cpio"
>> +QB_KERNEL_CMDLINE_APPEND = "console=ttyPS0"
>> --
>> 2.9.3
>> --
>> _______________________________________________
>> meta-xilinx mailing list
>> meta-xilinx at yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-xilinx