| Message ID | 20190203220744.11734-2-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: > The MIPSsim machine only emulates an 8250 UART and a simple network > controller, connected via an ISA bus. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > default-configs/mips-softmmu-common.mak | 2 -- > hw/mips/Kconfig | 3 +++ > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak > index 0795d522db..aa73a4a822 100644 > --- a/default-configs/mips-softmmu-common.mak > +++ b/default-configs/mips-softmmu-common.mak > @@ -26,7 +26,6 @@ CONFIG_PIIX4=y > CONFIG_IDE_ISA=y > CONFIG_IDE_PIIX=y > CONFIG_NE2000_ISA=y > -CONFIG_MIPSNET=y > CONFIG_PFLASH_CFI01=y > CONFIG_I8259=y > CONFIG_MC146818RTC=y > @@ -35,7 +34,6 @@ CONFIG_MIPS_CPS=y > CONFIG_MIPS_ITU=y > CONFIG_R4K=y > CONFIG_MALTA=y > -CONFIG_MIPSSIM=y > CONFIG_ACPI_SMBUS=y > CONFIG_SMBUS_EEPROM=y > CONFIG_TEST_DEVICES=y > diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig > index cdc07e59b6..3433e97e1a 100644 > --- a/hw/mips/Kconfig > +++ b/hw/mips/Kconfig > @@ -6,6 +6,9 @@ config MALTA > > config MIPSSIM > bool > + select ISA_BUS > + select SERIAL_ISA > + select MIPSNET > > config JAZZ > bool > Reviewed-by: Thomas Huth <thuth@redhat.com>
On 2019-02-04 09:31, Thomas Huth wrote: > On 2019-02-03 23:07, Philippe Mathieu-Daudé wrote: >> The MIPSsim machine only emulates an 8250 UART and a simple network >> controller, connected via an ISA bus. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> --- >> default-configs/mips-softmmu-common.mak | 2 -- >> hw/mips/Kconfig | 3 +++ >> 2 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak >> index 0795d522db..aa73a4a822 100644 >> --- a/default-configs/mips-softmmu-common.mak >> +++ b/default-configs/mips-softmmu-common.mak >> @@ -26,7 +26,6 @@ CONFIG_PIIX4=y >> CONFIG_IDE_ISA=y >> CONFIG_IDE_PIIX=y >> CONFIG_NE2000_ISA=y >> -CONFIG_MIPSNET=y >> CONFIG_PFLASH_CFI01=y >> CONFIG_I8259=y >> CONFIG_MC146818RTC=y >> @@ -35,7 +34,6 @@ CONFIG_MIPS_CPS=y >> CONFIG_MIPS_ITU=y >> CONFIG_R4K=y >> CONFIG_MALTA=y >> -CONFIG_MIPSSIM=y >> CONFIG_ACPI_SMBUS=y >> CONFIG_SMBUS_EEPROM=y >> CONFIG_TEST_DEVICES=y >> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig >> index cdc07e59b6..3433e97e1a 100644 >> --- a/hw/mips/Kconfig >> +++ b/hw/mips/Kconfig >> @@ -6,6 +6,9 @@ config MALTA >> >> config MIPSSIM >> bool >> + select ISA_BUS >> + select SERIAL_ISA >> + select MIPSNET >> >> config JAZZ >> bool >> > > Reviewed-by: Thomas Huth <thuth@redhat.com> Scratch that. I think you have to keep CONFIG_MIPSSIM=y enabled in the default-configs, don't you? Thomas
Hi Thomas, On 2/4/19 9:36 AM, Thomas Huth wrote: > On 2019-02-04 09:31, Thomas Huth wrote: >> On 2019-02-03 23:07, Philippe Mathieu-Daudé wrote: >>> The MIPSsim machine only emulates an 8250 UART and a simple network >>> controller, connected via an ISA bus. >>> >>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >>> --- >>> default-configs/mips-softmmu-common.mak | 2 -- >>> hw/mips/Kconfig | 3 +++ >>> 2 files changed, 3 insertions(+), 2 deletions(-) >>> >>> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak >>> index 0795d522db..aa73a4a822 100644 >>> --- a/default-configs/mips-softmmu-common.mak >>> +++ b/default-configs/mips-softmmu-common.mak >>> @@ -26,7 +26,6 @@ CONFIG_PIIX4=y >>> CONFIG_IDE_ISA=y >>> CONFIG_IDE_PIIX=y >>> CONFIG_NE2000_ISA=y >>> -CONFIG_MIPSNET=y >>> CONFIG_PFLASH_CFI01=y >>> CONFIG_I8259=y >>> CONFIG_MC146818RTC=y >>> @@ -35,7 +34,6 @@ CONFIG_MIPS_CPS=y >>> CONFIG_MIPS_ITU=y >>> CONFIG_R4K=y >>> CONFIG_MALTA=y >>> -CONFIG_MIPSSIM=y >>> CONFIG_ACPI_SMBUS=y >>> CONFIG_SMBUS_EEPROM=y >>> CONFIG_TEST_DEVICES=y >>> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig >>> index cdc07e59b6..3433e97e1a 100644 >>> --- a/hw/mips/Kconfig >>> +++ b/hw/mips/Kconfig >>> @@ -6,6 +6,9 @@ config MALTA >>> >>> config MIPSSIM >>> bool >>> + select ISA_BUS >>> + select SERIAL_ISA >>> + select MIPSNET >>> >>> config JAZZ >>> bool >>> >> >> Reviewed-by: Thomas Huth <thuth@redhat.com> > > Scratch that. I think you have to keep CONFIG_MIPSSIM=y enabled in the > default-configs, don't you? I guess I misunderstood --without-default-devices with --no-defaults, where you'd manually select the machines you want. Thanks for the review! Phil.
On 04/02/19 12:05, Philippe Mathieu-Daudé wrote: >> Scratch that. I think you have to keep CONFIG_MIPSSIM=y enabled in the >> default-configs, don't you? > I guess I misunderstood --without-default-devices with --no-defaults, > where you'd manually select the machines you want. Note that machines have to be included in default-configs/ even for --with-default-devices (which is the default). Paolo
On 2/4/19 12:21 PM, Paolo Bonzini wrote: > On 04/02/19 12:05, Philippe Mathieu-Daudé wrote: >>> Scratch that. I think you have to keep CONFIG_MIPSSIM=y enabled in the >>> default-configs, don't you? >> I guess I misunderstood --without-default-devices with --no-defaults, >> where you'd manually select the machines you want. > > Note that machines have to be included in default-configs/ even for > --with-default-devices (which is the default). OK, I'll respin. Thanks, Phil.
diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index 0795d522db..aa73a4a822 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -26,7 +26,6 @@ CONFIG_PIIX4=y CONFIG_IDE_ISA=y CONFIG_IDE_PIIX=y CONFIG_NE2000_ISA=y -CONFIG_MIPSNET=y CONFIG_PFLASH_CFI01=y CONFIG_I8259=y CONFIG_MC146818RTC=y @@ -35,7 +34,6 @@ CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y CONFIG_R4K=y CONFIG_MALTA=y -CONFIG_MIPSSIM=y CONFIG_ACPI_SMBUS=y CONFIG_SMBUS_EEPROM=y CONFIG_TEST_DEVICES=y diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig index cdc07e59b6..3433e97e1a 100644 --- a/hw/mips/Kconfig +++ b/hw/mips/Kconfig @@ -6,6 +6,9 @@ config MALTA config MIPSSIM bool + select ISA_BUS + select SERIAL_ISA + select MIPSNET config JAZZ bool
The MIPSsim machine only emulates an 8250 UART and a simple network controller, connected via an ISA bus. Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- default-configs/mips-softmmu-common.mak | 2 -- hw/mips/Kconfig | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-)