On 2019-01-30 18:13, Mark Cave-Ayland wrote:
> On 30/01/2019 09:43, Thomas Huth wrote:
>
>> This will make it for example easier if the users want to disable
>> one of the two machines for their builds.
>>
>> Cc: Mark Cave-Ayland <[email protected]>
>> Signed-off-by: Thomas Huth <[email protected]>
>> ---
[...]
>> diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
>> index 3ebe30f..f392502 100644
>> --- a/hw/misc/Kconfig
>> +++ b/hw/misc/Kconfig
>> @@ -59,6 +59,14 @@ config MOS6522
>>
>> config MACIO
>> bool
>> + select CUDA
>> + select ESCC
>> + select IDE_MACIO
>> + select MACIO_GPIO
>> + select MAC_DBDMA
>> + select MAC_NVRAM
>> + select MAC_PMU
>> + select MOS6522
>
> Technically MACIO_GPIO and MAC_PMU are MAC_NEWWORLD only, so we might want to
> split
> this down further?
I can also change the lines into:
select MACIO_GPIO if MAC_NEWWORLD
select MAC_PMU if MAC_NEWWORLD
>> diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
>> index 809830e..f6b4206 100644
>> --- a/hw/ppc/Kconfig
>> +++ b/hw/ppc/Kconfig
>> @@ -44,9 +44,16 @@ config RS6000_MC
>>
>> config MAC_OLDWORLD
>> bool
>> + select ADB
>> + select GRACKLE_PCI
>> + select HEATHROW_PIC
>> + select MACIO
>>
>> config MAC_NEWWORLD
>> bool
>> + select ADB
>> + select MACIO
>> + select UNIN_PCI
>
> Also MAC_NEWWORLD has an in-built USB PCI bridge (OHCI) which populates with
> a USB
> keyboard/mouse rather than ADB when using -M mac99,via=pmu, but I presume USB
> is
> handled elsewhere?
Yes, in hw/usb/Kconfig we have:
config USB_OHCI
bool
default y if PCI_DEVICES
depends on PCI
select USB
Thomas
