Re: [Qemu-devel] [PATCH v3 2/7] hw/mips: Express dependencies of the Jazz machine with Kconfig

[Thomas Huth]

On 11/03/2019 12.37, Philippe Mathieu-Daudé wrote:
> Hi Thomas,
> 
> On 3/11/19 12:17 PM, Thomas Huth wrote:
>> On 11/03/2019 01.56, Philippe Mathieu-Daudé wrote:
>>> The Jazz use the RC4030 Asic to provide an EISA bus and DMA/IRQ. The
>>> framebuffer display is managed by a G364, the network card is a Sonic
>>> DP83932. A QLogic ESP216 provides a SCSI bus.
>>>
>>> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
>>> ---
>>> v3: Keep CONFIG_JAZZ in default-configs/mips64el-softmmu.mak (Thomas)
>>> ---
>>>  default-configs/mips-softmmu-common.mak |  1 -
>>>  default-configs/mips64-softmmu.mak      |  5 -----
>>>  default-configs/mips64el-softmmu.mak    |  5 -----
>>>  hw/mips/Kconfig                         | 17 +++++++++++++++++
>>>  4 files changed, 17 insertions(+), 11 deletions(-)
>>>
>>> diff --git a/default-configs/mips-softmmu-common.mak 
>>> b/default-configs/mips-softmmu-common.mak
>>> index 8c5fdf5ee1..caebafd416 100644
>>> --- a/default-configs/mips-softmmu-common.mak
>>> +++ b/default-configs/mips-softmmu-common.mak
>>> @@ -3,7 +3,6 @@
>>>  CONFIG_ISA_BUS=y
>>>  CONFIG_PCI=y
>>>  CONFIG_PCI_DEVICES=y
>>> -CONFIG_ESP=y
>>>  CONFIG_VGA_ISA=y
>>>  CONFIG_VGA_ISA_MM=y
>>>  CONFIG_VGA_CIRRUS=y
>>> diff --git a/default-configs/mips64-softmmu.mak 
>>> b/default-configs/mips64-softmmu.mak
>>> index bad7496672..a169738635 100644
>>> --- a/default-configs/mips64-softmmu.mak
>>> +++ b/default-configs/mips64-softmmu.mak
>>> @@ -1,9 +1,4 @@
>>>  # Default configuration for mips64-softmmu
>>>  
>>>  include mips-softmmu-common.mak
>>> -CONFIG_RC4030=y
>>> -CONFIG_DP8393X=y
>>> -CONFIG_DS1225Y=y
>>>  CONFIG_JAZZ=y
>>> -CONFIG_G364FB=y
>>> -CONFIG_JAZZ_LED=y
>>> diff --git a/default-configs/mips64el-softmmu.mak 
>>> b/default-configs/mips64el-softmmu.mak
>>> index 8b255efc54..a7b88318b2 100644
>>> --- a/default-configs/mips64el-softmmu.mak
>>> +++ b/default-configs/mips64el-softmmu.mak
>>> @@ -2,13 +2,8 @@
>>>  
>>>  include mips-softmmu-common.mak
>>>  CONFIG_IDE_VIA=y
>>> -CONFIG_RC4030=y
>>> -CONFIG_DP8393X=y
>>> -CONFIG_DS1225Y=y
>>>  CONFIG_FULONG=y
>>>  CONFIG_JAZZ=y
>>> -CONFIG_G364FB=y
>>> -CONFIG_JAZZ_LED=y
>>>  CONFIG_VT82C686=y
>>>  CONFIG_AHCI=y
>>>  CONFIG_MIPS_BOSTON=y
>>> diff --git a/hw/mips/Kconfig b/hw/mips/Kconfig
>>> index 3433e97e1a..ab006477c7 100644
>>> --- a/hw/mips/Kconfig
>>> +++ b/hw/mips/Kconfig
>>> @@ -12,6 +12,23 @@ config MIPSSIM
>>>  
>>>  config JAZZ
>>>      bool
>>> +    select ISA_BUS
>>> +    select RC4030
>>> +    select I8259
>>> +    select I8254
>>> +    select I8257
>>> +    select PCSPK
>>> +    select VGA_ISA_MM
>>> +    select G364FB
>>> +    select DP8393X
>>
>> Looking at the code, it seems like you can also run the machine with
>> "-net none", so I'd rather use "imply DP8393X" here instead.
> 
> Well here I'm not sure.
> For the both machine variants (PICA-61 and Magnum 4000), the chipset is
> soldered on the board, and is MMIO mapped (via a ChipSelect, no via a
> bus you can plug/unplug).
Ok, then please ignore my comment and keep the "select" here!

 Thomas