On 2019-01-15 15:10, Yang Zhong wrote:
> From: Ákos Kovács <akoskovacs@gmx.com>
>
> CONFIG_PETALOGIX_* and CONFIG_XLNX_* configs added to
> default-configs/microblaze-softmmu.mak and
> default-configs/microblazeel-softmmu.mak.
>
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> default-configs/microblaze-softmmu.mak | 3 +++
> hw/microblaze/Makefile.objs | 6 +++---
> 2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak
> index 7fca8e4c99..14837cf74a 100644
> --- a/default-configs/microblaze-softmmu.mak
> +++ b/default-configs/microblaze-softmmu.mak
> @@ -10,3 +10,6 @@ CONFIG_XILINX_ETHLITE=y
> CONFIG_SSI=y
> CONFIG_SSI_M25P80=y
> CONFIG_XLNX_ZYNQMP=y
> +CONFIG_PETALOGIX_S3ADSP1800=y
> +CONFIG_PETALOGIX_ML605=y
> +CONFIG_XLNX_ZYNQMP_PMU=y
> diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs
> index ae9fd40de7..8595a62f6c 100644
> --- a/hw/microblaze/Makefile.objs
> +++ b/hw/microblaze/Makefile.objs
> @@ -1,4 +1,4 @@
> -obj-y += petalogix_s3adsp1800_mmu.o
> -obj-y += petalogix_ml605_mmu.o
> -obj-y += xlnx-zynqmp-pmu.o
> +obj-$(CONFIG_PETALOGIX_S3ADSP1800) += petalogix_s3adsp1800_mmu.o
> +obj-$(CONFIG_PETALOGIX_ML605) += petalogix_ml605_mmu.o
> +obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-zynqmp-pmu.o
> obj-y += boot.o
Reviewed-by: Thomas Huth <thuth@redhat.com>