[meta-xilinx] [PATCH 2/2] qemuzynmp: Add the qemuzynqmp machine

[Alistair Francis]

On Tue, Jun 21, 2016 at 7:56 AM, Nathan Rossi <nathan at nathanrossi.com> wrote:
> On Tue, Jun 21, 2016 at 4:59 AM, Alistair Francis
> <alistair.francis at xilinx.com> wrote:
>> On Thu, Jun 16, 2016 at 4:36 AM, Nathan Rossi <nathan at nathanrossi.com> wrote:
>>> On Thu, Jun 16, 2016 at 4:50 AM, Alistair Francis
>>> <alistair.francis at xilinx.com> wrote:
>>>> Add the qemuzynqmp machine based on the EP108 board.
>>>>
>>>> Signed-off-by: Alistair Francis <alistair.francis at xilinx.com>
>>>> ---
>>>>  conf/machine/ep108-zynqmp.conf      | 2 ++
>>>>  conf/machine/qemuzynqmp.conf        | 9 +++++++++
>>>>  recipes-kernel/linux/linux-xlnx.inc | 4 +++-
>>>>  3 files changed, 14 insertions(+), 1 deletion(-)
>>>>  create mode 100644 conf/machine/qemuzynqmp.conf
>>>>
>>>> diff --git a/conf/machine/ep108-zynqmp.conf b/conf/machine/ep108-zynqmp.conf
>>>> index 73a357f..17363ef 100644
>>>> --- a/conf/machine/ep108-zynqmp.conf
>>>> +++ b/conf/machine/ep108-zynqmp.conf
>>>> @@ -21,3 +21,5 @@ UBOOT_ENTRYPOINT = "0x80000"
>>>>
>>>>  EXTRA_IMAGEDEPENDS += "arm-trusted-firmware"
>>>>
>>>> +QEMU_DTB = "${KERNEL_IMAGETYPE}-${@os.path.splitext(os.path.basename(d.getVar("KERNEL_DEVICETREE",True)))[0]}"
>>>> +
>>>> diff --git a/conf/machine/qemuzynqmp.conf b/conf/machine/qemuzynqmp.conf
>>>> new file mode 100644
>>>> index 0000000..5177b6c
>>>> --- /dev/null
>>>> +++ b/conf/machine/qemuzynqmp.conf
>>>> @@ -0,0 +1,9 @@
>>>> +#@TYPE: Machine
>>>> +#@NAME: qemuzynqmp
>>>> +#@DESCRIPTION: Zynq UltraScale+ QEMU machine support ('xlnx-ep108' model)
>>>> +
>>>
>>> Please add the MACHINEOVERRIDES addition here so that any ep108
>>> overrides that are done anywhere in this layer apply to this machine
>>> as well.
>>>
>>> MACHINEOVERRIDES =. "ep108-zynqmp:"
>>>
>>>> +require conf/machine/include/tune-zynqmp.inc
>>>> +require conf/machine/include/machine-xilinx-default.inc
>>>> +require conf/machine/include/machine-xilinx-board.inc
>>>
>>> These three are included in ep108-zynqmp.conf so no need to double include them.
>>
>> I'll fix these two.
>>
>>>
>>>> +require conf/machine/ep108-zynqmp.conf
>>>> +
>>>> diff --git a/recipes-kernel/linux/linux-xlnx.inc b/recipes-kernel/linux/linux-xlnx.inc
>>>> index c0c2bd5..92ecb2d 100644
>>>> --- a/recipes-kernel/linux/linux-xlnx.inc
>>>> +++ b/recipes-kernel/linux/linux-xlnx.inc
>>>> @@ -19,6 +19,9 @@ require recipes-kernel/linux/linux-yocto.inc
>>>>
>>>>  DESCRIPTION = "Xilinx Kernel"
>>>>
>>>> +KBUILD_DEFCONFIG_qemuzynqmp = "xilinx_zynqmp_defconfig"
>>>> +KCONFIG_MODE_qemuzynqmp = "--alldefconfig"
>>>
>>> This kernel config still has the kernel panic during boot where it
>>> attempts to call into PMU firmware. So leave this part out of this
>>> patch.
>>
>> I don't see any issues with this config on the current master. I can
>> boot to login without any panics.
>
> The ep108 machine defaults to linux-yocto. So to test the linux-xlnx,
> override the preferred_provider in local.conf:
>
> PREFERRED_PROVIDER_virtual/kernel = "linux-xlnx"

That makes sense why I don't see the problem.

Thanks,

Alistair

>
> Regards,
> Nathan
>
>>
>>>
>>> If you manage to solve the issues with this kernel config and QEMU,
>>> create a separate patch that simply sets up the use of this kernel
>>> config for all zynqmp machines (just update the overrides that are
>>> there for _zcu102-zynqmp to be for _zynqmp).
>>
>> Ok, I'll double check and send it out as a separate patch.
>>
>> Thanks,
>>
>> Alistair
>>
>>>
>>> Regards,
>>> Nathan
>>>
>>>> +
>>>>  require linux-xilinx-configs.inc
>>>>  require linux-xilinx-machines.inc
>>>>
>>>> @@ -28,4 +31,3 @@ KCONFIG_MODE_zcu102-zynqmp = "--alldefconfig"
>>>>  KERNEL_FEATURES_append = " bsp/xilinx/soc/linux-xlnx/drivers/xilinx.scc"
>>>>  KERNEL_FEATURES_append_zynq = " bsp/xilinx/soc/linux-xlnx/drivers/zynq7.scc"
>>>>  KERNEL_FEATURES_append_zynqmp = " bsp/xilinx/soc/linux-xlnx/drivers/zynqmp.scc"
>>>> -
>>>> --
>>>> 2.7.4
>>>>
>>>> --
>>>> _______________________________________________
>>>> meta-xilinx mailing list
>>>> meta-xilinx at yoctoproject.org
>>>> https://lists.yoctoproject.org/listinfo/meta-xilinx
>>> --
>>> _______________________________________________
>>> meta-xilinx mailing list
>>> meta-xilinx at yoctoproject.org
>>> https://lists.yoctoproject.org/listinfo/meta-xilinx
> --
> _______________________________________________
> meta-xilinx mailing list
> meta-xilinx at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-xilinx