On Sun, Jan 31, 2021 at 3:08 AM Philippe Mathieu-Daudé <f4...@amsat.org> wrote:
>
> The Versal SoC instantiates the TYPE_XLNX_ZDMA object in
> versal_create_admas(). Introduce the XLNX_ZDMA configuration
> and select it to fix:
>
> $ qemu-system-aarch64 -M xlnx-versal-virt ...
> qemu-system-aarch64: missing object type 'xlnx.zdma'
>
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Alistair Francis <alistair.fran...@wdc.com>
Alistair
> ---
> Cc: Alistair Francis <alist...@alistair23.me>
> Cc: "Edgar E. Iglesias" <edgar.igles...@gmail.com>
> ---
> hw/arm/Kconfig | 2 ++
> hw/dma/Kconfig | 3 +++
> hw/dma/meson.build | 2 +-
> 3 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 223016bb4e8..09298881f2f 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -354,6 +354,7 @@ config XLNX_ZYNQMP_ARM
> select XILINX_AXI
> select XILINX_SPIPS
> select XLNX_ZYNQMP
> + select XLNX_ZDMA
>
> config XLNX_VERSAL
> bool
> @@ -362,6 +363,7 @@ config XLNX_VERSAL
> select CADENCE
> select VIRTIO_MMIO
> select UNIMP
> + select XLNX_ZDMA
>
> config NPCM7XX
> bool
> diff --git a/hw/dma/Kconfig b/hw/dma/Kconfig
> index d67492d36c1..5d6be1a7a7a 100644
> --- a/hw/dma/Kconfig
> +++ b/hw/dma/Kconfig
> @@ -18,6 +18,9 @@ config ZYNQ_DEVCFG
> bool
> select REGISTER
>
> +config XLNX_ZDMA
> + bool
> +
> config STP2000
> bool
>
> diff --git a/hw/dma/meson.build b/hw/dma/meson.build
> index b991d7698c7..47b4a7cb47b 100644
> --- a/hw/dma/meson.build
> +++ b/hw/dma/meson.build
> @@ -9,7 +9,7 @@
> softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_dma.c'))
> softmmu_ss.add(when: 'CONFIG_STP2000', if_true: files('sparc32_dma.c'))
> softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true:
> files('xlnx_dpdma.c'))
> -softmmu_ss.add(when: 'CONFIG_XLNX_ZYNQMP_ARM', if_true: files('xlnx-zdma.c'))
> +softmmu_ss.add(when: 'CONFIG_XLNX_ZDMA', if_true: files('xlnx-zdma.c'))
> softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_dma.c',
> 'soc_dma.c'))
> softmmu_ss.add(when: 'CONFIG_PXA2XX', if_true: files('pxa2xx_dma.c'))
> softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_dma.c'))
> --
> 2.26.2
>
>
