Message ID | 20190123065618.3520-8-yang.zhong@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Support Kconfig in QEMU | expand |
On 2019-01-23 07:55, Yang Zhong wrote: > From: Ákos Kovács <akoskovacs@gmx.com> > > Add the new configs to default-configs/mips*-sofmmu.mak. > > Signed-off-by: Ákos Kovács <akoskovacs@gmx.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > Signed-off-by: Yang Zhong <yang.zhong@intel.com> > --- > default-configs/mips-softmmu-common.mak | 3 +++ > hw/mips/Makefile.objs | 6 ++++-- > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak > index fae2347ee7..479fb4d900 100644 > --- a/default-configs/mips-softmmu-common.mak > +++ b/default-configs/mips-softmmu-common.mak > @@ -36,3 +36,6 @@ CONFIG_EMPTY_SLOT=y > CONFIG_MIPS_CPS=y > CONFIG_MIPS_ITU=y > CONFIG_I2C=y > +CONFIG_R4K=y > +CONFIG_MALTA=y > +CONFIG_MIPSSIM=y > diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs > index 17a311aaba..230866ae91 100644 > --- a/hw/mips/Makefile.objs > +++ b/hw/mips/Makefile.objs > @@ -1,7 +1,9 @@ > -obj-y += mips_r4k.o mips_malta.o mips_mipssim.o > obj-y += addr.o mips_int.o > +obj-y += gt64xxx_pci.o The gt64xxx_pci.c file seems to belong to the Malta machine, so I think you could mark this with $(CONFIG_MALTA), too. Apart from that: Reviewed-by: Thomas Huth <thuth@redhat.com> > +obj-$(CONFIG_R4K) += mips_r4k.o > +obj-$(CONFIG_MALTA) += mips_malta.o > +obj-$(CONFIG_MIPSSIM) += mips_mipssim.o > obj-$(CONFIG_JAZZ) += mips_jazz.o > obj-$(CONFIG_FULONG) += mips_fulong2e.o > -obj-y += gt64xxx_pci.o > obj-$(CONFIG_MIPS_CPS) += cps.o > obj-$(CONFIG_MIPS_BOSTON) += boston.o
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index fae2347ee7..479fb4d900 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -36,3 +36,6 @@ CONFIG_EMPTY_SLOT=y CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y CONFIG_I2C=y +CONFIG_R4K=y +CONFIG_MALTA=y +CONFIG_MIPSSIM=y diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 17a311aaba..230866ae91 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,7 +1,9 @@ -obj-y += mips_r4k.o mips_malta.o mips_mipssim.o obj-y += addr.o mips_int.o +obj-y += gt64xxx_pci.o +obj-$(CONFIG_R4K) += mips_r4k.o +obj-$(CONFIG_MALTA) += mips_malta.o +obj-$(CONFIG_MIPSSIM) += mips_mipssim.o obj-$(CONFIG_JAZZ) += mips_jazz.o obj-$(CONFIG_FULONG) += mips_fulong2e.o -obj-y += gt64xxx_pci.o obj-$(CONFIG_MIPS_CPS) += cps.o obj-$(CONFIG_MIPS_BOSTON) += boston.o