On 2019-01-15 15:10, Yang Zhong wrote: > From: Ákos Kovács <akoskov...@gmx.com> > > Add the new CONFIG_* values to default-config/xtensa*-softmmu.mak. > > Signed-off-by: Ákos Kovács <akoskov...@gmx.com> > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > default-configs/xtensa-softmmu.mak | 3 +++ > default-configs/xtensaeb-softmmu.mak | 3 +++ > hw/xtensa/Makefile.objs | 4 ++-- > 3 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/default-configs/xtensa-softmmu.mak > b/default-configs/xtensa-softmmu.mak > index 9d8899cde7..baf90ca162 100644 > --- a/default-configs/xtensa-softmmu.mak > +++ b/default-configs/xtensa-softmmu.mak > @@ -3,3 +3,6 @@ > CONFIG_SERIAL=y > CONFIG_OPENCORES_ETH=y > CONFIG_PFLASH_CFI01=y > + > +CONFIG_XTENSA_SIM=y > +CONFIG_XTENSA_FPGA=y > diff --git a/default-configs/xtensaeb-softmmu.mak > b/default-configs/xtensaeb-softmmu.mak > index 9d8899cde7..baf90ca162 100644 > --- a/default-configs/xtensaeb-softmmu.mak > +++ b/default-configs/xtensaeb-softmmu.mak > @@ -3,3 +3,6 @@ > CONFIG_SERIAL=y > CONFIG_OPENCORES_ETH=y > CONFIG_PFLASH_CFI01=y > + > +CONFIG_XTENSA_SIM=y > +CONFIG_XTENSA_FPGA=y > diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs > index cb4998d2bf..62e244fa53 100644 > --- a/hw/xtensa/Makefile.objs > +++ b/hw/xtensa/Makefile.objs > @@ -1,4 +1,4 @@ > obj-y += pic_cpu.o > -obj-y += sim.o > obj-y += xtensa_memory.o > -obj-y += xtfpga.o > +obj-$(CONFIG_XTENSA_SIM) += sim.o > +obj-$(CONFIG_XTENSA_FPGA) += xtfpga.o >
Reviewed-by: Thomas Huth <th...@redhat.com>
