On 2019-01-23 07:55, Yang Zhong wrote: > From: Ákos Kovács <[email protected]> > > Make hw/sh4 configurable and add new CONFIG_* to the > default-configs/sh4*-softmmu.mak. > > Signed-off-by: Ákos Kovács <[email protected]> > Signed-off-by: Paolo Bonzini <[email protected]> > --- > default-configs/sh4-softmmu.mak | 2 ++ > default-configs/sh4eb-softmmu.mak | 2 ++ > hw/sh4/Makefile.objs | 4 ++-- > 3 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak > index caeccd55be..1fdb009151 100644 > --- a/default-configs/sh4-softmmu.mak > +++ b/default-configs/sh4-softmmu.mak > @@ -19,3 +19,5 @@ CONFIG_PCSPK=y > CONFIG_I82374=y > CONFIG_I8257=y > CONFIG_MC146818RTC=y > +CONFIG_R2D=y > +CONFIG_SHIX=y > diff --git a/default-configs/sh4eb-softmmu.mak > b/default-configs/sh4eb-softmmu.mak > index 53b9cd7b5a..3b550a5fe8 100644 > --- a/default-configs/sh4eb-softmmu.mak > +++ b/default-configs/sh4eb-softmmu.mak > @@ -19,3 +19,5 @@ CONFIG_PCSPK=y > CONFIG_I82374=y > CONFIG_I8257=y > CONFIG_MC146818RTC=y > +CONFIG_R2D=y > +CONFIG_SHIX=y > diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs > index 2393702c57..2a707f9473 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-y += sh_pci.o > +obj-$(CONFIG_R2D) += r2d.o > +obj-$(CONFIG_SHIX) += shix.o
Reviewed-by: Thomas Huth <[email protected]>
