Message ID | 20190131073234.18037-19-yang.zhong@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | make qemu configurable for Kconfig | expand |
On 2019-01-31 08:32, Yang Zhong wrote: > Add the new configs to default-configs/riscv*-sofmmu.mak. > > Signed-off-by: Yang Zhong <yang.zhong@intel.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > --- > default-configs/riscv32-softmmu.mak | 7 +++++++ > default-configs/riscv64-softmmu.mak | 7 +++++++ > hw/riscv/Makefile.objs | 22 +++++++++++----------- > 3 files changed, 25 insertions(+), 11 deletions(-) > > diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak > index fbfd1d4e4b..65337166e1 100644 > --- a/default-configs/riscv32-softmmu.mak > +++ b/default-configs/riscv32-softmmu.mak > @@ -12,3 +12,10 @@ CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y > > CONFIG_VGA=y > CONFIG_VGA_PCI=y > + > +CONFIG_SPIKE=y > +CONFIG_HART=y > +CONFIG_SIFIVE_E=y > +CONFIG_SIFIVE=y > +CONFIG_SIFIVE_U=y > +CONFIG_RISCV_VIRT=y > diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak > index fbfd1d4e4b..65337166e1 100644 > --- a/default-configs/riscv64-softmmu.mak > +++ b/default-configs/riscv64-softmmu.mak > @@ -12,3 +12,10 @@ CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y > > CONFIG_VGA=y > CONFIG_VGA_PCI=y > + > +CONFIG_SPIKE=y > +CONFIG_HART=y > +CONFIG_SIFIVE_E=y > +CONFIG_SIFIVE=y > +CONFIG_SIFIVE_U=y > +CONFIG_RISCV_VIRT=y > diff --git a/hw/riscv/Makefile.objs b/hw/riscv/Makefile.objs > index 1dde01d39d..79bfb3abf9 100644 > --- a/hw/riscv/Makefile.objs > +++ b/hw/riscv/Makefile.objs > @@ -1,11 +1,11 @@ > -obj-y += riscv_htif.o > -obj-y += riscv_hart.o > -obj-y += sifive_e.o > -obj-y += sifive_clint.o > -obj-y += sifive_prci.o > -obj-y += sifive_plic.o > -obj-y += sifive_test.o > -obj-y += sifive_u.o > -obj-y += sifive_uart.o > -obj-y += spike.o > -obj-y += virt.o > +obj-$(CONFIG_SPIKE) += riscv_htif.o > +obj-$(CONFIG_HART) += riscv_hart.o > +obj-$(CONFIG_SIFIVE_E) += sifive_e.o > +obj-$(CONFIG_SIFIVE) += sifive_clint.o > +obj-$(CONFIG_SIFIVE) += sifive_prci.o > +obj-$(CONFIG_SIFIVE) += sifive_plic.o > +obj-$(CONFIG_SIFIVE) += sifive_test.o > +obj-$(CONFIG_SIFIVE_U) += sifive_u.o > +obj-$(CONFIG_SIFIVE) += sifive_uart.o > +obj-$(CONFIG_SPIKE) += spike.o > +obj-$(CONFIG_RISCV_VIRT) += virt.o Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak index fbfd1d4e4b..65337166e1 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -12,3 +12,10 @@ CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y CONFIG_VGA=y CONFIG_VGA_PCI=y + +CONFIG_SPIKE=y +CONFIG_HART=y +CONFIG_SIFIVE_E=y +CONFIG_SIFIVE=y +CONFIG_SIFIVE_U=y +CONFIG_RISCV_VIRT=y diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak index fbfd1d4e4b..65337166e1 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -12,3 +12,10 @@ CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y CONFIG_VGA=y CONFIG_VGA_PCI=y + +CONFIG_SPIKE=y +CONFIG_HART=y +CONFIG_SIFIVE_E=y +CONFIG_SIFIVE=y +CONFIG_SIFIVE_U=y +CONFIG_RISCV_VIRT=y diff --git a/hw/riscv/Makefile.objs b/hw/riscv/Makefile.objs index 1dde01d39d..79bfb3abf9 100644 --- a/hw/riscv/Makefile.objs +++ b/hw/riscv/Makefile.objs @@ -1,11 +1,11 @@ -obj-y += riscv_htif.o -obj-y += riscv_hart.o -obj-y += sifive_e.o -obj-y += sifive_clint.o -obj-y += sifive_prci.o -obj-y += sifive_plic.o -obj-y += sifive_test.o -obj-y += sifive_u.o -obj-y += sifive_uart.o -obj-y += spike.o -obj-y += virt.o +obj-$(CONFIG_SPIKE) += riscv_htif.o +obj-$(CONFIG_HART) += riscv_hart.o +obj-$(CONFIG_SIFIVE_E) += sifive_e.o +obj-$(CONFIG_SIFIVE) += sifive_clint.o +obj-$(CONFIG_SIFIVE) += sifive_prci.o +obj-$(CONFIG_SIFIVE) += sifive_plic.o +obj-$(CONFIG_SIFIVE) += sifive_test.o +obj-$(CONFIG_SIFIVE_U) += sifive_u.o +obj-$(CONFIG_SIFIVE) += sifive_uart.o +obj-$(CONFIG_SPIKE) += spike.o +obj-$(CONFIG_RISCV_VIRT) += virt.o