[meta-xilinx] [PATCH 14/29] zcu102-zynqmp: Add runqemu support

[Nathan Rossi]

On Thu, Sep 29, 2016 at 7:33 AM, Alistair Francis <alistair23 at gmail.com> wrote:
> On Wed, Sep 28, 2016 at 8:15 AM, Nathan Rossi <nathan at nathanrossi.com> wrote:
>> QEMU 2.7 introduced support for the 'xlnx-zcu102' machine model. This
>> allows for runqemu to boot a machine based on the zcu102 hardware. The
>> support added is based on the support that is provided for ep108-zynq.
>>
>> Signed-off-by: Nathan Rossi <nathan at nathanrossi.com>
>> ---
>>  README.md                       |  2 +-
>>  conf/machine/zcu102-zynqmp.conf | 17 +++++++++++++++++
>>  2 files changed, 18 insertions(+), 1 deletion(-)
>>
>> diff --git a/README.md b/README.md
>> index 11b2198428..491b19c4dc 100644
>> --- a/README.md
>> +++ b/README.md
>> @@ -26,7 +26,7 @@ Boards/Machines supported by this layer:
>>    * [Digilent Zybo Linux BD](conf/machine/zybo-linux-bd-zynq7.conf) - `zybo-linux-bd-zynq7`
>>   * ZynqMP:
>>    * [Xilinx EP108](conf/machine/ep108-zynqmp.conf) - `ep108-zynqmp` (QEMU support)
>> -  * [Xilinx ZCU102](conf/machine/zcu102-zynqmp.conf) - `zcu102-zynqmp`
>> +  * [Xilinx ZCU102](conf/machine/zcu102-zynqmp.conf) - `zcu102-zynqmp` (QEMU support)
>>
>>  Additional information on Xilinx architectures can be found at:
>>         http://www.xilinx.com/support/index.htm
>> diff --git a/conf/machine/zcu102-zynqmp.conf b/conf/machine/zcu102-zynqmp.conf
>> index 11a8ddbfbe..cf25baeee4 100644
>> --- a/conf/machine/zcu102-zynqmp.conf
>> +++ b/conf/machine/zcu102-zynqmp.conf
>> @@ -9,6 +9,9 @@ require conf/machine/include/machine-xilinx-board.inc
>>
>>  MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost mali"
>>
>> +# This machine has a qemu machine model
>> +EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native"
>> +
>>  UBOOT_MACHINE = "xilinx_zynqmp_zcu102_revB_defconfig"
>>
>>  SERIAL_CONSOLE = "115200 ttyPS0"
>> @@ -21,3 +24,17 @@ PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx"
>>  EXTRA_IMAGEDEPENDS += "\
>>                 arm-trusted-firmware \
>>                 "
>> +
>> +# For runqemu
>> +IMAGE_CLASSES += "qemuboot"
>> +QB_SYSTEM_NAME = "qemu-system-aarch64"
>> +QB_MACHINE = "-machine xlnx-zcu102"
>> +QB_CPU = "-cpu cortex-a57"
>
> We don't want this

Will remove this.

>
>> +QB_MEM = "-m 2048"
>> +QB_DTB = "${KERNEL_IMAGETYPE}-${@os.path.splitext(os.path.basename(d.getVar("KERNEL_DEVICETREE",True)))[0]}.dtb"
>> +QB_OPT_APPEND = "-nographic -serial mon:stdio -serial null"
>> +QB_DEFAULT_FSTYPE = "cpio"
>
> Do we not need the kernel image type as well?

It is already populated in qemuboot.bbclass as "KERNEL_IMAGETYPE" by
default, which is what zynqmp has set as the default kernel type.

Also I will squish this patch with the ep108 patch.

Regards,
Nathan

>
> Thanks,
>
> Alistair
>
>> +QB_KERNEL_CMDLINE_APPEND = "console=ttyPS0"
>> +QB_TAP_OPT = "-netdev tap,id=net0,ifname=@TAP@,script=no,downscript=no -net nic -net nic -net nic -net nic,netdev=net0,macaddr=@MAC@"
>> +QB_SLIRP_OPT = "-netdev user,id=net0 -net nic -net nic -net nic -net nic,netdev=net0"
>> +
>> --
>> 2.9.3
>> --
>> _______________________________________________
>> meta-xilinx mailing list
>> meta-xilinx at yoctoproject.org
>> https://lists.yoctoproject.org/listinfo/meta-xilinx