On 2019-01-15 15:10, Yang Zhong wrote: > From: Ákos Kovács <akoskov...@gmx.com> > > Make hw/sh4 configurable and add new CONFIG_* to the > default-configs/sh4*-softmmu.mak. > > Signed-off-by: Ákos Kovács <akoskov...@gmx.com> > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > default-configs/sh4-softmmu.mak | 3 +++ > default-configs/sh4eb-softmmu.mak | 3 +++ > hw/sh4/Makefile.objs | 6 +++--- > 3 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak > index caeccd55be..4b65489624 100644 > --- a/default-configs/sh4-softmmu.mak > +++ b/default-configs/sh4-softmmu.mak > @@ -19,3 +19,6 @@ CONFIG_PCSPK=y > CONFIG_I82374=y > CONFIG_I8257=y > CONFIG_MC146818RTC=y > +CONFIG_R2D=y > +CONFIG_SHIX=y > +CONFIG_SH7750=y > diff --git a/default-configs/sh4eb-softmmu.mak > b/default-configs/sh4eb-softmmu.mak > index 53b9cd7b5a..af71aa7f42 100644 > --- a/default-configs/sh4eb-softmmu.mak > +++ b/default-configs/sh4eb-softmmu.mak > @@ -19,3 +19,6 @@ CONFIG_PCSPK=y > CONFIG_I82374=y > CONFIG_I8257=y > CONFIG_MC146818RTC=y > +CONFIG_R2D=y > +CONFIG_SHIX=y > +CONFIG_SH7750=y > diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs > index 2393702c57..70903d79a9 100644 > --- a/hw/sh4/Makefile.objs > +++ b/hw/sh4/Makefile.objs > @@ -1,4 +1,4 @@ > -obj-y += shix.o r2d.o > - > -obj-y += sh7750.o sh7750_regnames.o > +obj-$(CONFIG_R2D) += r2d.o > +obj-$(CONFIG_SHIX) += shix.o > +obj-$(CONFIG_SH7750) += sh7750.o sh7750_regnames.o > obj-y += sh_pci.o >
sh7750.o and sh7750_regnames.o are "common" code of the r2d and shix machine, and do not define a separate machine ... not sure whether we need a separate CONFIG_SH7750 switch for this? I'd rather treat these two file like sh_pci.o instead, and always include them unconditionally, I think... Or do I miss something? Thomas
