| Message ID | 20190203220744.11734-6-philmd@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/6] mips: Express dependencies of the MIPSsim machine with kconfig | expand |
On 2019-02-03 23:07, Philippe Mathieu-Daudé wrote: > Ease the kconfig selection by introducing CONFIG_PCI_BONITO to select > the Bonito North Bridge. Select it for the Loongson 2E machine. I think you should either rather drop the last sentence here (since the "select" is only done in the next patch), or even merge this patch with the next one. Thomas > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > default-configs/mips64el-softmmu.mak | 1 + > hw/pci-host/Kconfig | 4 ++++ > hw/pci-host/Makefile.objs | 2 +- > 3 files changed, 6 insertions(+), 1 deletion(-) > > diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak > index ac44df1d0d..ee583758e1 100644 > --- a/default-configs/mips64el-softmmu.mak > +++ b/default-configs/mips64el-softmmu.mak > @@ -3,4 +3,5 @@ > include mips-softmmu-common.mak > CONFIG_IDE_VIA=y > CONFIG_FULONG=y > +CONFIG_PCI_BONITO=y > CONFIG_VT82C686=y > diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig > index b39ea297ba..9abadafaf5 100644 > --- a/hw/pci-host/Kconfig > +++ b/hw/pci-host/Kconfig > @@ -49,3 +49,7 @@ config PCI_EXPRESS_XILINX > config PCI_EXPRESS_DESIGNWARE > bool > select PCI_EXPRESS > + > +config PCI_BONITO > + select PCI > + bool > diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs > index a9cd3e022d..d6e86b9b89 100644 > --- a/hw/pci-host/Makefile.objs > +++ b/hw/pci-host/Makefile.objs > @@ -12,7 +12,7 @@ common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o > common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o > > common-obj-$(CONFIG_PCI_SABRE) += sabre.o > -common-obj-$(CONFIG_FULONG) += bonito.o > +common-obj-$(CONFIG_PCI_BONITO) += bonito.o > common-obj-$(CONFIG_PCI_PIIX) += piix.o > common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o > common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o >
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak index ac44df1d0d..ee583758e1 100644 --- a/default-configs/mips64el-softmmu.mak +++ b/default-configs/mips64el-softmmu.mak @@ -3,4 +3,5 @@ include mips-softmmu-common.mak CONFIG_IDE_VIA=y CONFIG_FULONG=y +CONFIG_PCI_BONITO=y CONFIG_VT82C686=y diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index b39ea297ba..9abadafaf5 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -49,3 +49,7 @@ config PCI_EXPRESS_XILINX config PCI_EXPRESS_DESIGNWARE bool select PCI_EXPRESS + +config PCI_BONITO + select PCI + bool diff --git a/hw/pci-host/Makefile.objs b/hw/pci-host/Makefile.objs index a9cd3e022d..d6e86b9b89 100644 --- a/hw/pci-host/Makefile.objs +++ b/hw/pci-host/Makefile.objs @@ -12,7 +12,7 @@ common-obj-$(CONFIG_PPCE500_PCI) += ppce500.o common-obj-$(CONFIG_VERSATILE_PCI) += versatile.o common-obj-$(CONFIG_PCI_SABRE) += sabre.o -common-obj-$(CONFIG_FULONG) += bonito.o +common-obj-$(CONFIG_PCI_BONITO) += bonito.o common-obj-$(CONFIG_PCI_PIIX) += piix.o common-obj-$(CONFIG_PCI_EXPRESS_Q35) += q35.o common-obj-$(CONFIG_PCI_EXPRESS_GENERIC_BRIDGE) += gpex.o
Ease the kconfig selection by introducing CONFIG_PCI_BONITO to select the Bonito North Bridge. Select it for the Loongson 2E machine. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- default-configs/mips64el-softmmu.mak | 1 + hw/pci-host/Kconfig | 4 ++++ hw/pci-host/Makefile.objs | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-)