Re: [Qemu-devel] [PULL 04/28] hw/arm: Express dependencies of the highbank machines with Kconfig

[Philippe Mathieu-Daudé]

On 9/30/20 6:10 PM, Thomas Huth wrote:
> On 30/09/2020 17.38, Philippe Mathieu-Daudé wrote:
>> Hi Thomas,
>>
>> On 5/5/19 3:56 PM, Thomas Huth wrote:
>>> Add Kconfig dependencies for the highbank machine (and the midway
>>> machine).
>>> This patch is slightly based on earlier work by Ákos Kovács (i.e.
>>> his "hw/arm/Kconfig: Add ARM Kconfig" patch).
>>>
>>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>>  default-configs/arm-softmmu.mak |  9 +--------
>>>  hw/arm/Kconfig                  | 11 +++++++++++
>>>  2 files changed, 12 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/default-configs/arm-softmmu.mak 
>>> b/default-configs/arm-softmmu.mak
>>> index 2a11e76cc7..50a4be3cad 100644
>>> --- a/default-configs/arm-softmmu.mak
>>> +++ b/default-configs/arm-softmmu.mak
>>> @@ -8,6 +8,7 @@ CONFIG_PCI_DEVICES=y
>>>  CONFIG_PCI_TESTDEV=y
>>>  
>>>  CONFIG_EXYNOS4=y
>>> +CONFIG_HIGHBANK=y
>>>  
>>>  CONFIG_VGA=y
>>>  CONFIG_NAND=y
>>> @@ -45,24 +46,17 @@ CONFIG_PLATFORM_BUS=y
>>>  CONFIG_VIRTIO_MMIO=y
>>>  
>>>  CONFIG_ARM11MPCORE=y
>>> -CONFIG_A15MPCORE=y
>>>  
>>>  CONFIG_NETDUINO2=y
>>>  
>>> -CONFIG_ARM_TIMER=y
>>> -CONFIG_PL011=y
>>> -CONFIG_PL022=y
>>> -CONFIG_PL031=y
>>>  CONFIG_PL041=y
>>>  CONFIG_PL050=y
>>> -CONFIG_PL061=y
>>>  CONFIG_PL080=y
>>>  CONFIG_PL110=y
>>>  CONFIG_PL181=y
>>>  CONFIG_PL190=y
>>>  CONFIG_PL330=y
>>>  CONFIG_CADENCE=y
>>> -CONFIG_XGMAC=y
>>>  CONFIG_PXA2XX=y
>>>  CONFIG_BITBANG_I2C=y
>>>  CONFIG_FRAMEBUFFER=y
>>> @@ -150,7 +144,6 @@ CONFIG_XILINX_AXI=y
>>>  CONFIG_PCI_EXPRESS_DESIGNWARE=y
>>>  
>>>  CONFIG_STRONGARM=y
>>> -CONFIG_HIGHBANK=y
>>>  CONFIG_MUSICPAL=y
>>>  
>>>  # for realview and versatilepb
>>> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
>>> index acd07b2add..0ba377ac18 100644
>>> --- a/hw/arm/Kconfig
>>> +++ b/hw/arm/Kconfig
>>> @@ -18,6 +18,17 @@ config EXYNOS4
>>>  
>>>  config HIGHBANK
>>>      bool
>>> +    select A9MPCORE
>>> +    select A15MPCORE
>>> +    select AHCI
>>> +    select ARM_TIMER # sp804
>>> +    select ARM_V7M
>>
>> Hmm I missed that... This machine doesn't use a v7M core, right?
> 
> I think you're right: The machines seem to use A9 and A15 ... so I guess
> this was a copy-n-paste bug ... could you send a patch to clean it up,
> please?

Yes, will do.

> 
>  Thomas
>