* [Qemu-devel] [PATCH v2 01/25] hw/arm: Express dependencies of the exynos machines with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
@ 2019-02-13 8:37 ` Thomas Huth
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 02/25] hw/arm: Express dependencies of the highbank " Thomas Huth
` (23 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:37 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Add Kconfig dependencies for the Exynos-related boards (nuri and
smdkc210).
This patch is slightly based on earlier work by Ákos Kovács (i.e.
his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 16 ++++++----------
hw/arm/Kconfig | 11 +++++++++++
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 8283aeb..3baafc4 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -1,7 +1,12 @@
# Default configuration for arm-softmmu
-CONFIG_PCI=y
+# TODO: ARM_V7M is currently always required - make this more flexible!
+CONFIG_ARM_V7M=y
+
CONFIG_PCI_DEVICES=y
+
+CONFIG_EXYNOS4=y
+
CONFIG_VGA=y
CONFIG_NAND=y
CONFIG_ECC=y
@@ -25,7 +30,6 @@ CONFIG_ADS7846=y
CONFIG_MAX111X=y
CONFIG_SSI_SD=y
CONFIG_SSI_M25P80=y
-CONFIG_LAN9118=y
CONFIG_SMC91C111=y
CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y
@@ -35,7 +39,6 @@ CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y
CONFIG_MICRODRIVE=y
CONFIG_USB_MUSB=y
-CONFIG_USB_EHCI_SYSBUS=y
CONFIG_PLATFORM_BUS=y
CONFIG_VIRTIO_MMIO=y
@@ -43,13 +46,9 @@ CONFIG_ARM11MPCORE=y
CONFIG_A9MPCORE=y
CONFIG_A15MPCORE=y
-CONFIG_ARM_V7M=y
CONFIG_NETDUINO2=y
-CONFIG_ARM_GIC=y
CONFIG_ARM_TIMER=y
-CONFIG_ARM_MPTIMER=y
-CONFIG_A9_GTIMER=y
CONFIG_PL011=y
CONFIG_PL022=y
CONFIG_PL031=y
@@ -60,11 +59,9 @@ CONFIG_PL080=y
CONFIG_PL110=y
CONFIG_PL181=y
CONFIG_PL190=y
-CONFIG_PL310=y
CONFIG_PL330=y
CONFIG_CADENCE=y
CONFIG_XGMAC=y
-CONFIG_EXYNOS4=y
CONFIG_PXA2XX=y
CONFIG_BITBANG_I2C=y
CONFIG_FRAMEBUFFER=y
@@ -72,7 +69,6 @@ CONFIG_XILINX_SPIPS=y
CONFIG_ZYNQ_DEVCFG=y
CONFIG_ARM11SCU=y
-CONFIG_A9SCU=y
CONFIG_DIGIC=y
CONFIG_MARVELL_88W8618=y
CONFIG_OMAP=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 3176680..2850000 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -7,7 +7,14 @@ config DIGIC
config EXYNOS4
bool
+ select A9MPCORE
+ select I2C
+ select LAN9118
+ select PCI
+ select PL310 # cache controller
select PTIMER
+ select SDHCI
+ select USB_EHCI_SYSBUS
config HIGHBANK
bool
@@ -109,6 +116,10 @@ config ZAURUS
config A9MPCORE
bool
+ select A9_GTIMER
+ select A9SCU # snoop control unit
+ select ARM_GIC
+ select ARM_MPTIMER
config A15MPCORE
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 02/25] hw/arm: Express dependencies of the highbank machines with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 01/25] hw/arm: Express dependencies of the exynos machines with Kconfig Thomas Huth
@ 2019-02-13 8:37 ` Thomas Huth
2019-02-14 19:17 ` Peter Maydell
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 03/25] hw/arm: Express dependencies of integratorcp " Thomas Huth
` (22 subsequent siblings)
24 siblings, 1 reply; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:37 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
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).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 4 +---
hw/arm/Kconfig | 12 ++++++++++++
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 3baafc4..59734ee 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y
CONFIG_PCI_DEVICES=y
CONFIG_EXYNOS4=y
+CONFIG_HIGHBANK=y
CONFIG_VGA=y
CONFIG_NAND=y
@@ -54,14 +55,12 @@ 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
@@ -151,7 +150,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 2850000..984de8a 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -18,6 +18,18 @@ config EXYNOS4
config HIGHBANK
bool
+ select A9MPCORE
+ select A15MPCORE
+ select AHCI
+ select ARM_TIMER # sp804
+ select ARM_V7M
+ select PCI
+ select PL011 # UART
+ select PL022 # Serial port
+ select PL031 # RTC
+ select PL061 # GPIO
+ select PL310 # cache controller
+ select XGMAC # ethernet
config INTEGRATOR
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* Re: [Qemu-devel] [PATCH v2 02/25] hw/arm: Express dependencies of the highbank machines with Kconfig
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 02/25] hw/arm: Express dependencies of the highbank " Thomas Huth
@ 2019-02-14 19:17 ` Peter Maydell
2019-02-14 20:35 ` Paolo Bonzini
0 siblings, 1 reply; 31+ messages in thread
From: Peter Maydell @ 2019-02-14 19:17 UTC (permalink / raw)
To: Thomas Huth
Cc: Yang Zhong, Paolo Bonzini, QEMU Developers, qemu-arm,
Philippe Mathieu-Daudé
On Wed, 13 Feb 2019 at 08:38, Thomas Huth <thuth@redhat.com> 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).
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 4 +---
> hw/arm/Kconfig | 12 ++++++++++++
> 2 files changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 3baafc4..59734ee 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y
> CONFIG_PCI_DEVICES=y
>
> CONFIG_EXYNOS4=y
> +CONFIG_HIGHBANK=y
>
> CONFIG_VGA=y
> CONFIG_NAND=y
> @@ -54,14 +55,12 @@ 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
Could you explain the logic for when CONFIG_*=y
lines get deleted from the arm-softmmu.mak?
In this patch PL061 has been deleted, but PL011,
PL022, PL031 have not, though all these devices are
used in both Highbank and in other not-yet-converted
machine types. What's the difference ?
thanks
-- PMM
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PATCH v2 02/25] hw/arm: Express dependencies of the highbank machines with Kconfig
2019-02-14 19:17 ` Peter Maydell
@ 2019-02-14 20:35 ` Paolo Bonzini
2019-02-15 12:15 ` Thomas Huth
0 siblings, 1 reply; 31+ messages in thread
From: Paolo Bonzini @ 2019-02-14 20:35 UTC (permalink / raw)
To: Peter Maydell, Thomas Huth
Cc: Yang Zhong, QEMU Developers, qemu-arm, Philippe Mathieu-Daudé
On 14/02/19 20:17, Peter Maydell wrote:
> On Wed, 13 Feb 2019 at 08:38, Thomas Huth <thuth@redhat.com> 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).
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> default-configs/arm-softmmu.mak | 4 +---
>> hw/arm/Kconfig | 12 ++++++++++++
>> 2 files changed, 13 insertions(+), 3 deletions(-)
>>
>> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
>> index 3baafc4..59734ee 100644
>> --- a/default-configs/arm-softmmu.mak
>> +++ b/default-configs/arm-softmmu.mak
>> @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y
>> CONFIG_PCI_DEVICES=y
>>
>> CONFIG_EXYNOS4=y
>> +CONFIG_HIGHBANK=y
>>
>> CONFIG_VGA=y
>> CONFIG_NAND=y
>> @@ -54,14 +55,12 @@ 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
>
> Could you explain the logic for when CONFIG_*=y
> lines get deleted from the arm-softmmu.mak?
> In this patch PL061 has been deleted, but PL011,
> PL022, PL031 have not, though all these devices are
> used in both Highbank and in other not-yet-converted
> machine types. What's the difference ?
I think it's a mistake. I'd not remove any CONFIG_*=y except in a final
separate patch.
Paolo
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PATCH v2 02/25] hw/arm: Express dependencies of the highbank machines with Kconfig
2019-02-14 20:35 ` Paolo Bonzini
@ 2019-02-15 12:15 ` Thomas Huth
2019-02-23 10:56 ` Philippe Mathieu-Daudé
0 siblings, 1 reply; 31+ messages in thread
From: Thomas Huth @ 2019-02-15 12:15 UTC (permalink / raw)
To: qemu-devel
On 14/02/2019 21.35, Paolo Bonzini wrote:
> On 14/02/19 20:17, Peter Maydell wrote:
>> On Wed, 13 Feb 2019 at 08:38, Thomas Huth <thuth@redhat.com> 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).
>>>
>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>> ---
>>> default-configs/arm-softmmu.mak | 4 +---
>>> hw/arm/Kconfig | 12 ++++++++++++
>>> 2 files changed, 13 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
>>> index 3baafc4..59734ee 100644
>>> --- a/default-configs/arm-softmmu.mak
>>> +++ b/default-configs/arm-softmmu.mak
>>> @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y
>>> CONFIG_PCI_DEVICES=y
>>>
>>> CONFIG_EXYNOS4=y
>>> +CONFIG_HIGHBANK=y
>>>
>>> CONFIG_VGA=y
>>> CONFIG_NAND=y
>>> @@ -54,14 +55,12 @@ 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
>>
>> Could you explain the logic for when CONFIG_*=y
>> lines get deleted from the arm-softmmu.mak?
>> In this patch PL061 has been deleted, but PL011,
>> PL022, PL031 have not, though all these devices are
>> used in both Highbank and in other not-yet-converted
>> machine types. What's the difference ?
My plan was indeed to remove the switches from the default-configs file
as soon as they are enabled in the Kconfig file. Looks like I missed
these here in this patch, sorry!
(but unless there are other reasons for respinning, I think it should
also be OK if the switches get removed in later patches instead)
> I think it's a mistake. I'd not remove any CONFIG_*=y except in a final
> separate patch.
Really? In that case it's way harder to see which options from the
default-configs are really handled in the Kconfig files - and there's a
risk that some options would get removed that are not enabled in any of
the preceeding Kconfig patches. So I think it's better this way, bit by bit.
Thomas
^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [Qemu-devel] [PATCH v2 02/25] hw/arm: Express dependencies of the highbank machines with Kconfig
2019-02-15 12:15 ` Thomas Huth
@ 2019-02-23 10:56 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 31+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-02-23 10:56 UTC (permalink / raw)
To: Thomas Huth, qemu-devel
On 2/15/19 1:15 PM, Thomas Huth wrote:
> On 14/02/2019 21.35, Paolo Bonzini wrote:
>> On 14/02/19 20:17, Peter Maydell wrote:
>>> On Wed, 13 Feb 2019 at 08:38, Thomas Huth <thuth@redhat.com> 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).
>>>>
>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>> ---
>>>> default-configs/arm-softmmu.mak | 4 +---
>>>> hw/arm/Kconfig | 12 ++++++++++++
>>>> 2 files changed, 13 insertions(+), 3 deletions(-)
>>>>
>>>> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
>>>> index 3baafc4..59734ee 100644
>>>> --- a/default-configs/arm-softmmu.mak
>>>> +++ b/default-configs/arm-softmmu.mak
>>>> @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y
>>>> CONFIG_PCI_DEVICES=y
>>>>
>>>> CONFIG_EXYNOS4=y
>>>> +CONFIG_HIGHBANK=y
>>>>
>>>> CONFIG_VGA=y
>>>> CONFIG_NAND=y
>>>> @@ -54,14 +55,12 @@ 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
>>>
>>> Could you explain the logic for when CONFIG_*=y
>>> lines get deleted from the arm-softmmu.mak?
>>> In this patch PL061 has been deleted, but PL011,
>>> PL022, PL031 have not, though all these devices are
>>> used in both Highbank and in other not-yet-converted
>>> machine types. What's the difference ?
>
> My plan was indeed to remove the switches from the default-configs file
> as soon as they are enabled in the Kconfig file. Looks like I missed
> these here in this patch, sorry!
>
> (but unless there are other reasons for respinning, I think it should
> also be OK if the switches get removed in later patches instead)
>
>> I think it's a mistake. I'd not remove any CONFIG_*=y except in a final
>> separate patch.
>
> Really? In that case it's way harder to see which options from the
> default-configs are really handled in the Kconfig files - and there's a
> risk that some options would get removed that are not enabled in any of
> the preceeding Kconfig patches. So I think it's better this way, bit by bit.
Agreed. This way you can build/test at each step.
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH v2 03/25] hw/arm: Express dependencies of integratorcp with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 01/25] hw/arm: Express dependencies of the exynos machines with Kconfig Thomas Huth
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 02/25] hw/arm: Express dependencies of the highbank " Thomas Huth
@ 2019-02-13 8:37 ` Thomas Huth
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 04/25] hw/arm: Express dependencies of the fsl-imx31 machine " Thomas Huth
` (21 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:37 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
This patch is slightly based on earlier work by Ákos Kovács (i.e.
his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 11 +----------
hw/arm/Kconfig | 9 +++++++++
hw/display/Kconfig | 1 +
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 59734ee..2033050 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -7,6 +7,7 @@ CONFIG_PCI_DEVICES=y
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
+CONFIG_INTEGRATOR=y
CONFIG_VGA=y
CONFIG_NAND=y
@@ -31,7 +32,6 @@ CONFIG_ADS7846=y
CONFIG_MAX111X=y
CONFIG_SSI_SD=y
CONFIG_SSI_M25P80=y
-CONFIG_SMC91C111=y
CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y
CONFIG_FTGMAC100=y
@@ -49,15 +49,8 @@ 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_PL080=y
-CONFIG_PL110=y
-CONFIG_PL181=y
CONFIG_PL190=y
CONFIG_PL330=y
CONFIG_CADENCE=y
@@ -119,8 +112,6 @@ CONFIG_VFIO_XGMAC=y
CONFIG_VFIO_AMD_XGBE=y
CONFIG_SDHCI=y
-CONFIG_INTEGRATOR=y
-CONFIG_INTEGRATOR_DEBUG=y
CONFIG_ALLWINNER_A10_PIT=y
CONFIG_ALLWINNER_A10_PIC=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 984de8a..c022b8d 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -33,6 +33,15 @@ config HIGHBANK
config INTEGRATOR
bool
+ select ARM_TIMER
+ select INTEGRATOR_DEBUG
+ select PL011 # UART
+ select PL031 # RTC
+ select PL050 # keyboard/mouse
+ select PL110 # pl111 LCD controller
+ select PL181 # display
+ select PCI
+ select SMC91C111
config MAINSTONE
bool
diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index ee3acd9..34c8c12 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -21,6 +21,7 @@ config JAZZ_LED
config PL110
bool
+ select FRAMEBUFFER
config SII9022
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 04/25] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (2 preceding siblings ...)
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 03/25] hw/arm: Express dependencies of integratorcp " Thomas Huth
@ 2019-02-13 8:37 ` Thomas Huth
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 05/25] hw/arm: Express dependencies of musicpal " Thomas Huth
` (20 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:37 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Add Kconfig dependencies for the fsl-imx31 / kzm machine.
This patch is slightly based on earlier work by Ákos Kovács (i.e.
his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 3 +--
hw/arm/Kconfig | 5 +++++
hw/misc/Kconfig | 2 ++
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 2033050..19d0ab0 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -8,6 +8,7 @@ CONFIG_PCI_DEVICES=y
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
+CONFIG_FSL_IMX31=y
CONFIG_VGA=y
CONFIG_NAND=y
@@ -68,7 +69,6 @@ CONFIG_TSC210X=y
CONFIG_BLIZZARD=y
CONFIG_ONENAND=y
CONFIG_TUSB6010=y
-CONFIG_IMX=y
CONFIG_MAINSTONE=y
CONFIG_MPS2=y
CONFIG_NSERIES=y
@@ -118,7 +118,6 @@ CONFIG_ALLWINNER_A10_PIC=y
CONFIG_ALLWINNER_A10=y
CONFIG_FSL_IMX6=y
-CONFIG_FSL_IMX31=y
CONFIG_FSL_IMX25=y
CONFIG_FSL_IMX7=y
CONFIG_FSL_IMX6UL=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index c022b8d..3d0ee29 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -103,6 +103,11 @@ config FSL_IMX25
config FSL_IMX31
bool
+ select SERIAL
+ select IMX
+ select IMX_I2C
+ select LAN9118
+ select PCI
config FSL_IMX6
bool
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 11d4b30..54ff9a8 100644
--- a/hw/misc/Kconfig
+++ b/hw/misc/Kconfig
@@ -76,6 +76,8 @@ config ECCMEMCTL
config IMX
bool
select PTIMER
+ select SSI
+ select USB_EHCI_SYSBUS
config STM32F2XX_SYSCFG
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 05/25] hw/arm: Express dependencies of musicpal with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (3 preceding siblings ...)
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 04/25] hw/arm: Express dependencies of the fsl-imx31 machine " Thomas Huth
@ 2019-02-13 8:37 ` Thomas Huth
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 06/25] hw/arm: Express dependencies of the OMAP machines " Thomas Huth
` (19 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:37 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
This patch is slightly based on earlier work by Ákos Kovács (i.e.
his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 6 +-----
hw/arm/Kconfig | 6 ++++++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 19d0ab0..fe7e306 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -9,13 +9,13 @@ CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
CONFIG_FSL_IMX31=y
+CONFIG_MUSICPAL=y
CONFIG_VGA=y
CONFIG_NAND=y
CONFIG_ECC=y
CONFIG_SERIAL=y
CONFIG_MAX7310=y
-CONFIG_WM8750=y
CONFIG_TWL92230=y
CONFIG_TSC2005=y
CONFIG_LM832X=y
@@ -38,7 +38,6 @@ CONFIG_IMX_FEC=y
CONFIG_FTGMAC100=y
CONFIG_DS1338=y
CONFIG_PFLASH_CFI01=y
-CONFIG_PFLASH_CFI02=y
CONFIG_MICRODRIVE=y
CONFIG_USB_MUSB=y
CONFIG_PLATFORM_BUS=y
@@ -56,14 +55,12 @@ CONFIG_PL190=y
CONFIG_PL330=y
CONFIG_CADENCE=y
CONFIG_PXA2XX=y
-CONFIG_BITBANG_I2C=y
CONFIG_FRAMEBUFFER=y
CONFIG_XILINX_SPIPS=y
CONFIG_ZYNQ_DEVCFG=y
CONFIG_ARM11SCU=y
CONFIG_DIGIC=y
-CONFIG_MARVELL_88W8618=y
CONFIG_OMAP=y
CONFIG_TSC210X=y
CONFIG_BLIZZARD=y
@@ -140,7 +137,6 @@ CONFIG_XILINX_AXI=y
CONFIG_PCI_EXPRESS_DESIGNWARE=y
CONFIG_STRONGARM=y
-CONFIG_MUSICPAL=y
# for realview and versatilepb
CONFIG_LSI_SCSI_PCI=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 3d0ee29..aeb0cf0 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -48,7 +48,13 @@ config MAINSTONE
config MUSICPAL
bool
+ select BITBANG_I2C
+ select MARVELL_88W8618
select PTIMER
+ select PFLASH_CFI02
+ select PCI
+ select SERIAL
+ select WM8750
config NETDUINO2
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 06/25] hw/arm: Express dependencies of the OMAP machines with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (4 preceding siblings ...)
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 05/25] hw/arm: Express dependencies of musicpal " Thomas Huth
@ 2019-02-13 8:37 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 07/25] hw/arm: Express dependencies of stellaris " Thomas Huth
` (18 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:37 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Add Kconfig dependencies for the OMAP machines (cheetah, n800, n810,
sx1 and sx1-v1).
This patch is slightly based on earlier work by Ákos Kovács (i.e.
his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 15 +++------------
hw/arm/Kconfig | 26 ++++++++++++++++++++++++++
hw/arm/Makefile.objs | 3 ++-
3 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index fe7e306..492db53 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -10,16 +10,15 @@ CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
CONFIG_FSL_IMX31=y
CONFIG_MUSICPAL=y
+CONFIG_CHEETAH=y
+CONFIG_SX1=y
+CONFIG_NSERIES=y
CONFIG_VGA=y
CONFIG_NAND=y
CONFIG_ECC=y
CONFIG_SERIAL=y
CONFIG_MAX7310=y
-CONFIG_TWL92230=y
-CONFIG_TSC2005=y
-CONFIG_LM832X=y
-CONFIG_TMP105=y
CONFIG_TMP421=y
CONFIG_PCA9552=y
CONFIG_STELLARIS=y
@@ -37,9 +36,7 @@ CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y
CONFIG_FTGMAC100=y
CONFIG_DS1338=y
-CONFIG_PFLASH_CFI01=y
CONFIG_MICRODRIVE=y
-CONFIG_USB_MUSB=y
CONFIG_PLATFORM_BUS=y
CONFIG_VIRTIO_MMIO=y
@@ -61,14 +58,8 @@ CONFIG_ZYNQ_DEVCFG=y
CONFIG_ARM11SCU=y
CONFIG_DIGIC=y
-CONFIG_OMAP=y
-CONFIG_TSC210X=y
-CONFIG_BLIZZARD=y
-CONFIG_ONENAND=y
-CONFIG_TUSB6010=y
CONFIG_MAINSTONE=y
CONFIG_MPS2=y
-CONFIG_NSERIES=y
CONFIG_RASPI=y
CONFIG_REALVIEW=y
CONFIG_ZAURUS=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index aeb0cf0..fe1505e 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -1,6 +1,11 @@
config ARM_VIRT
bool
+config CHEETAH
+ bool
+ select OMAP
+ select TSC210X
+
config DIGIC
bool
select PTIMER
@@ -61,9 +66,26 @@ config NETDUINO2
config NSERIES
bool
+ select OMAP
+ select TMP105 # tempature sensor
+ select BLIZZARD # LCD/TV controller
+ select ONENAND
+ select TSC210X # touchscreen/sensors/audio
+ select TSC2005 # touchscreen/sensors/keypad
+ select LM832X # GPIO keyboard chip
+ select TWL92230 # energy-management
+ select TUSB6010
config OMAP
bool
+ select FRAMEBUFFER
+ select I2C
+ select ECC
+ select NAND
+ select PFLASH_CFI01
+ select PCI
+ select SD
+ select SERIAL
config PXA2XX
bool
@@ -77,6 +99,10 @@ config STELLARIS
config STRONGARM
bool
+config SX1
+ bool
+ select OMAP
+
config VERSATILE
bool
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index fa40e8d..b0fd556 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -9,7 +9,8 @@ obj-$(CONFIG_MAINSTONE) += mainstone.o
obj-$(CONFIG_MUSICPAL) += musicpal.o
obj-$(CONFIG_NETDUINO2) += netduino2.o
obj-$(CONFIG_NSERIES) += nseries.o
-obj-$(CONFIG_OMAP) += omap_sx1.o palm.o
+obj-$(CONFIG_SX1) += omap_sx1.o
+obj-$(CONFIG_CHEETAH) += palm.o
obj-$(CONFIG_PXA2XX) += gumstix.o spitz.o tosa.o z2.o
obj-$(CONFIG_REALVIEW) += realview.o
obj-$(CONFIG_STELLARIS) += stellaris.o
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 07/25] hw/arm: Express dependencies of stellaris with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (5 preceding siblings ...)
2019-02-13 8:37 ` [Qemu-devel] [PATCH v2 06/25] hw/arm: Express dependencies of the OMAP machines " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 08/25] hw/arm: Express dependencies of realview, versatile and vexpress " Thomas Huth
` (17 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
This patch is slightly based on earlier work by Ákos Kovács (i.e.
his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 7 +------
hw/arm/Kconfig | 10 ++++++++++
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 492db53..1be49bd 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -13,6 +13,7 @@ CONFIG_MUSICPAL=y
CONFIG_CHEETAH=y
CONFIG_SX1=y
CONFIG_NSERIES=y
+CONFIG_STELLARIS=y
CONFIG_VGA=y
CONFIG_NAND=y
@@ -21,16 +22,10 @@ CONFIG_SERIAL=y
CONFIG_MAX7310=y
CONFIG_TMP421=y
CONFIG_PCA9552=y
-CONFIG_STELLARIS=y
-CONFIG_STELLARIS_INPUT=y
-CONFIG_STELLARIS_ENET=y
-CONFIG_SSD0303=y
-CONFIG_SSD0323=y
CONFIG_DDC=y
CONFIG_SII9022=y
CONFIG_ADS7846=y
CONFIG_MAX111X=y
-CONFIG_SSI_SD=y
CONFIG_SSI_M25P80=y
CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index fe1505e..3034252 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -95,6 +95,16 @@ config REALVIEW
config STELLARIS
bool
+ select ARM_V7M
+ select I2C
+ select PL011 # UART
+ select PL022 # Serial port
+ select PL061 # GPIO
+ select SSD0303 # OLED display
+ select SSD0323 # OLED display
+ select SSI_SD
+ select STELLARIS_INPUT
+ select STELLARIS_ENET # ethernet
config STRONGARM
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 08/25] hw/arm: Express dependencies of realview, versatile and vexpress with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (6 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 07/25] hw/arm: Express dependencies of stellaris " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 09/25] hw/arm: Express dependencies of the PXA2xx machines " Thomas Huth
` (16 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
This patch is slightly based on earlier work by Ákos Kovács (i.e.
his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 23 +++-----------------
hw/arm/Kconfig | 47 +++++++++++++++++++++++++++++++++++++++++
hw/arm/Makefile.objs | 3 ++-
hw/display/Kconfig | 1 +
hw/i2c/Kconfig | 2 +-
5 files changed, 54 insertions(+), 22 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 1be49bd..2bac13b 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -3,8 +3,6 @@
# TODO: ARM_V7M is currently always required - make this more flexible!
CONFIG_ARM_V7M=y
-CONFIG_PCI_DEVICES=y
-
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
@@ -14,6 +12,9 @@ CONFIG_CHEETAH=y
CONFIG_SX1=y
CONFIG_NSERIES=y
CONFIG_STELLARIS=y
+CONFIG_REALVIEW=y
+CONFIG_VERSATILE=y
+CONFIG_VEXPRESS=y
CONFIG_VGA=y
CONFIG_NAND=y
@@ -22,8 +23,6 @@ CONFIG_SERIAL=y
CONFIG_MAX7310=y
CONFIG_TMP421=y
CONFIG_PCA9552=y
-CONFIG_DDC=y
-CONFIG_SII9022=y
CONFIG_ADS7846=y
CONFIG_MAX111X=y
CONFIG_SSI_M25P80=y
@@ -35,15 +34,8 @@ CONFIG_MICRODRIVE=y
CONFIG_PLATFORM_BUS=y
CONFIG_VIRTIO_MMIO=y
-CONFIG_ARM11MPCORE=y
-CONFIG_A9MPCORE=y
-CONFIG_A15MPCORE=y
-
CONFIG_NETDUINO2=y
-CONFIG_PL041=y
-CONFIG_PL080=y
-CONFIG_PL190=y
CONFIG_PL330=y
CONFIG_CADENCE=y
CONFIG_PXA2XX=y
@@ -51,12 +43,10 @@ CONFIG_FRAMEBUFFER=y
CONFIG_XILINX_SPIPS=y
CONFIG_ZYNQ_DEVCFG=y
-CONFIG_ARM11SCU=y
CONFIG_DIGIC=y
CONFIG_MAINSTONE=y
CONFIG_MPS2=y
CONFIG_RASPI=y
-CONFIG_REALVIEW=y
CONFIG_ZAURUS=y
CONFIG_ZYNQ=y
CONFIG_STM32F2XX_TIMER=y
@@ -84,10 +74,6 @@ CONFIG_IOTKIT_SYSCTL=y
CONFIG_IOTKIT_SYSINFO=y
CONFIG_ARMSSE_CPUID=y
-CONFIG_VERSATILE=y
-CONFIG_VERSATILE_PCI=y
-CONFIG_VERSATILE_I2C=y
-
CONFIG_PCI_EXPRESS=y
CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
CONFIG_VFIO_PLATFORM=y
@@ -123,6 +109,3 @@ CONFIG_XILINX_AXI=y
CONFIG_PCI_EXPRESS_DESIGNWARE=y
CONFIG_STRONGARM=y
-
-# for realview and versatilepb
-CONFIG_LSI_SCSI_PCI=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 3034252..b76fd7c 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -92,6 +92,29 @@ config PXA2XX
config REALVIEW
bool
+ imply PCI_DEVICES
+ select SMC91C111
+ select LAN9118
+ select A9MPCORE
+ select A15MPCORE
+ select ARM11MPCORE
+ select ARM_TIMER
+ select VERSATILE_PCI
+ select WM8750 # audio codec
+ select LSI_SCSI_PCI
+ select PCI
+ select PL011 # UART
+ select PL031 # RTC
+ select PL041 # audio codec
+ select PL050 # keyboard/mouse
+ select PL061 # GPIO
+ select PL080 # DMA controller
+ select PL110
+ select PL181 # display
+ select PL310 # cache controller
+ select VERSATILE_I2C
+ select DS1338 # I2C RTC+NVRAM
+ select USB_OHCI
config STELLARIS
bool
@@ -115,6 +138,29 @@ config SX1
config VERSATILE
bool
+ select ARM_TIMER # sp804
+ select PFLASH_CFI01
+ select LSI_SCSI_PCI
+ select PL050 # keyboard/mouse
+ select PL080 # DMA controller
+ select PL190 # Vector PIC
+ select REALVIEW
+ select USB_OHCI
+
+config VEXPRESS
+ bool
+ select A9MPCORE
+ select A15MPCORE
+ select ARM_MPTIMER
+ select ARM_TIMER # sp804
+ select LAN9118
+ select PFLASH_CFI01
+ select PL011 # UART
+ select PL041 # audio codec
+ select PL181 # display
+ select REALVIEW
+ select SII9022
+ select VIRTIO_MMIO
config ZYNQ
bool
@@ -194,6 +240,7 @@ config A15MPCORE
config ARM11MPCORE
bool
+ select ARM11SCU
config ARMSSE
bool
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index b0fd556..420641e 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -15,7 +15,8 @@ obj-$(CONFIG_PXA2XX) += gumstix.o spitz.o tosa.o z2.o
obj-$(CONFIG_REALVIEW) += realview.o
obj-$(CONFIG_STELLARIS) += stellaris.o
obj-$(CONFIG_STRONGARM) += collie.o
-obj-$(CONFIG_VERSATILE) += vexpress.o versatilepb.o
+obj-$(CONFIG_VERSATILE) += versatilepb.o
+obj-$(CONFIG_VEXPRESS) += vexpress.o
obj-$(CONFIG_ZYNQ) += xilinx_zynq.o
obj-$(CONFIG_ARM_V7M) += armv7m.o
diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index 34c8c12..a5f3fc0 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -26,6 +26,7 @@ config PL110
config SII9022
bool
depends on I2C
+ select DDC
config SSD0303
bool
diff --git a/hw/i2c/Kconfig b/hw/i2c/Kconfig
index ef1caa6..0004893 100644
--- a/hw/i2c/Kconfig
+++ b/hw/i2c/Kconfig
@@ -12,7 +12,7 @@ config DDC
config VERSATILE_I2C
bool
- select I2C
+ select BITBANG_I2C
config ACPI_SMBUS
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 09/25] hw/arm: Express dependencies of the PXA2xx machines with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (7 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 08/25] hw/arm: Express dependencies of realview, versatile and vexpress " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 10/25] hw/arm: Express dependencies of xilinx-zynq " Thomas Huth
` (15 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Add Kconfig dependencies for the PXA2xx machines (akita, borzoi,
connex and verdex gumstix, tosa, mainstone, spitz, terrier and z2).
This patch is based on earlier work by Ákos Kovács (i.e.
his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 17 +++++----------
hw/arm/Kconfig | 46 +++++++++++++++++++++++++++++++++++++++++
hw/arm/Makefile.objs | 5 ++++-
3 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 2bac13b..1db76f6 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -15,22 +15,20 @@ CONFIG_STELLARIS=y
CONFIG_REALVIEW=y
CONFIG_VERSATILE=y
CONFIG_VEXPRESS=y
+CONFIG_MAINSTONE=y
+CONFIG_GUMSTIX=y
+CONFIG_SPITZ=y
+CONFIG_TOSA=y
+CONFIG_Z2=y
CONFIG_VGA=y
-CONFIG_NAND=y
-CONFIG_ECC=y
-CONFIG_SERIAL=y
-CONFIG_MAX7310=y
CONFIG_TMP421=y
CONFIG_PCA9552=y
-CONFIG_ADS7846=y
-CONFIG_MAX111X=y
CONFIG_SSI_M25P80=y
CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y
CONFIG_FTGMAC100=y
CONFIG_DS1338=y
-CONFIG_MICRODRIVE=y
CONFIG_PLATFORM_BUS=y
CONFIG_VIRTIO_MMIO=y
@@ -38,16 +36,13 @@ CONFIG_NETDUINO2=y
CONFIG_PL330=y
CONFIG_CADENCE=y
-CONFIG_PXA2XX=y
CONFIG_FRAMEBUFFER=y
CONFIG_XILINX_SPIPS=y
CONFIG_ZYNQ_DEVCFG=y
CONFIG_DIGIC=y
-CONFIG_MAINSTONE=y
CONFIG_MPS2=y
CONFIG_RASPI=y
-CONFIG_ZAURUS=y
CONFIG_ZYNQ=y
CONFIG_STM32F2XX_TIMER=y
CONFIG_STM32F2XX_USART=y
@@ -80,8 +75,6 @@ CONFIG_VFIO_PLATFORM=y
CONFIG_VFIO_XGMAC=y
CONFIG_VFIO_AMD_XGBE=y
-CONFIG_SDHCI=y
-
CONFIG_ALLWINNER_A10_PIT=y
CONFIG_ALLWINNER_A10_PIC=y
CONFIG_ALLWINNER_A10=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index b76fd7c..95f2713 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -89,6 +89,50 @@ config OMAP
config PXA2XX
bool
+ select FRAMEBUFFER
+ select I2C
+ select PCI
+ select SERIAL
+ select SD
+ select SSI
+ select USB_OHCI
+
+config GUMSTIX
+ bool
+ select PFLASH_CFI01
+ select SMC91C111
+ select PXA2XX
+
+config TOSA
+ bool
+ select ZAURUS # scoop
+ select MICRODRIVE
+ select PXA2XX
+
+config MAINSTONE
+ bool
+ select PXA2XX
+ select PFLASH_CFI01
+ select SMC91C111
+
+config SPITZ
+ bool
+ select ADS7846 # display
+ select MAX111X # A/D converter
+ select WM8750 # audio codec
+ select MAX7310 # GPIO expander
+ select ZAURUS # scoop
+ select NAND # memory
+ select ECC # Error-correcting for NAND
+ select MICRODRIVE
+ select PXA2XX
+
+config Z2
+ bool
+ select PFLASH_CFI01
+ select WM8750
+ select PL011 # UART
+ select PXA2XX
config REALVIEW
bool
@@ -227,6 +271,8 @@ config MSF2
config ZAURUS
bool
+ select NAND
+ select ECC
config A9MPCORE
bool
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 420641e..93e1160 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -11,7 +11,10 @@ obj-$(CONFIG_NETDUINO2) += netduino2.o
obj-$(CONFIG_NSERIES) += nseries.o
obj-$(CONFIG_SX1) += omap_sx1.o
obj-$(CONFIG_CHEETAH) += palm.o
-obj-$(CONFIG_PXA2XX) += gumstix.o spitz.o tosa.o z2.o
+obj-$(CONFIG_GUMSTIX) += gumstix.o
+obj-$(CONFIG_SPITZ) += spitz.o
+obj-$(CONFIG_TOSA) += tosa.o
+obj-$(CONFIG_Z2) += z2.o
obj-$(CONFIG_REALVIEW) += realview.o
obj-$(CONFIG_STELLARIS) += stellaris.o
obj-$(CONFIG_STRONGARM) += collie.o
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 10/25] hw/arm: Express dependencies of xilinx-zynq with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (8 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 09/25] hw/arm: Express dependencies of the PXA2xx machines " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 11/25] hw/arm: Express dependencies of collie " Thomas Huth
` (14 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Add Kconfig dependencies for the xilinx-zynq-a9 board.
This patch is based on earlier work by Ákos Kovács (i.e.
his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 7 +------
hw/arm/Kconfig | 14 ++++++++++++++
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 1db76f6..5c43bb3 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -15,6 +15,7 @@ CONFIG_STELLARIS=y
CONFIG_REALVIEW=y
CONFIG_VERSATILE=y
CONFIG_VEXPRESS=y
+CONFIG_ZYNQ=y
CONFIG_MAINSTONE=y
CONFIG_GUMSTIX=y
CONFIG_SPITZ=y
@@ -34,16 +35,11 @@ CONFIG_VIRTIO_MMIO=y
CONFIG_NETDUINO2=y
-CONFIG_PL330=y
-CONFIG_CADENCE=y
CONFIG_FRAMEBUFFER=y
-CONFIG_XILINX_SPIPS=y
-CONFIG_ZYNQ_DEVCFG=y
CONFIG_DIGIC=y
CONFIG_MPS2=y
CONFIG_RASPI=y
-CONFIG_ZYNQ=y
CONFIG_STM32F2XX_TIMER=y
CONFIG_STM32F2XX_USART=y
CONFIG_STM32F2XX_SYSCFG=y
@@ -98,7 +94,6 @@ CONFIG_SMBUS_EEPROM=y
CONFIG_GPIO_KEY=y
CONFIG_MSF2=y
CONFIG_FW_CFG_DMA=y
-CONFIG_XILINX_AXI=y
CONFIG_PCI_EXPRESS_DESIGNWARE=y
CONFIG_STRONGARM=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 95f2713..67f1228 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -208,6 +208,20 @@ config VEXPRESS
config ZYNQ
bool
+ select A9MPCORE
+ select CADENCE # UART
+ select PCI
+ select PFLASH_CFI02
+ select PL330
+ select SDHCI
+ select SSI_M25P80
+ select USB_EHCI
+ select USB_EHCI_SYSBUS
+ select XILINX # UART
+ select XILINX_AXI
+ select XILINX_SPI
+ select XILINX_SPIPS
+ select ZYNQ_DEVCFG
config ARM_V7M
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 11/25] hw/arm: Express dependencies of collie with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (9 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 10/25] hw/arm: Express dependencies of xilinx-zynq " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 12/25] hw/arm: Express dependencies of the aspeed boards " Thomas Huth
` (13 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Add Kconfig dependencies for the Strongarm collie machine.
This patch is based on earlier work by Ákos Kovács (i.e.
his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 3 +--
hw/arm/Kconfig | 7 +++++++
hw/arm/Makefile.objs | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 5c43bb3..9851068 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -21,6 +21,7 @@ CONFIG_GUMSTIX=y
CONFIG_SPITZ=y
CONFIG_TOSA=y
CONFIG_Z2=y
+CONFIG_COLLIE=y
CONFIG_VGA=y
CONFIG_TMP421=y
@@ -95,5 +96,3 @@ CONFIG_GPIO_KEY=y
CONFIG_MSF2=y
CONFIG_FW_CFG_DMA=y
CONFIG_PCI_EXPRESS_DESIGNWARE=y
-
-CONFIG_STRONGARM=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 67f1228..39cbda9 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -175,6 +175,13 @@ config STELLARIS
config STRONGARM
bool
+ select PXA2XX
+
+config COLLIE
+ bool
+ select PFLASH_CFI01
+ select ZAURUS # scoop
+ select STRONGARM
config SX1
bool
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 93e1160..053fcb6 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -17,7 +17,7 @@ obj-$(CONFIG_TOSA) += tosa.o
obj-$(CONFIG_Z2) += z2.o
obj-$(CONFIG_REALVIEW) += realview.o
obj-$(CONFIG_STELLARIS) += stellaris.o
-obj-$(CONFIG_STRONGARM) += collie.o
+obj-$(CONFIG_COLLIE) += collie.o
obj-$(CONFIG_VERSATILE) += versatilepb.o
obj-$(CONFIG_VEXPRESS) += vexpress.o
obj-$(CONFIG_ZYNQ) += xilinx_zynq.o
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 12/25] hw/arm: Express dependencies of the aspeed boards with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (10 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 11/25] hw/arm: Express dependencies of collie " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 13/25] hw/arm: Express dependencies of the virt machine " Thomas Huth
` (12 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Dependencies have been determined by looking at hw/arm/aspeed.c
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 7 +------
hw/arm/Kconfig | 10 ++++++++++
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 9851068..b2e31b3 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -22,15 +22,12 @@ CONFIG_SPITZ=y
CONFIG_TOSA=y
CONFIG_Z2=y
CONFIG_COLLIE=y
+CONFIG_ASPEED_SOC=y
CONFIG_VGA=y
-CONFIG_TMP421=y
-CONFIG_PCA9552=y
CONFIG_SSI_M25P80=y
CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y
-CONFIG_FTGMAC100=y
-CONFIG_DS1338=y
CONFIG_PLATFORM_BUS=y
CONFIG_VIRTIO_MMIO=y
@@ -90,8 +87,6 @@ CONFIG_I82801B11=y
CONFIG_ACPI=y
CONFIG_ARM_VIRT=y
CONFIG_SMBIOS=y
-CONFIG_ASPEED_SOC=y
-CONFIG_SMBUS_EEPROM=y
CONFIG_GPIO_KEY=y
CONFIG_MSF2=y
CONFIG_FW_CFG_DMA=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 39cbda9..a4fe2c8 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -267,6 +267,16 @@ config FSL_IMX6
config ASPEED_SOC
bool
+ select DS1338
+ select FTGMAC100
+ select I2C
+ select PCA9552
+ select SERIAL
+ select SMBUS_EEPROM
+ select SSI
+ select SSI_M25P80
+ select TMP105
+ select TMP421
config MPS2
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 13/25] hw/arm: Express dependencies of the virt machine with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (11 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 12/25] hw/arm: Express dependencies of the aspeed boards " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 14/25] hw/arm: Express dependencies of netduino / stm32f2xx " Thomas Huth
` (11 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Dependencies have been determined by looking at hw/arm/virt.c
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 14 +-------------
hw/arm/Kconfig | 19 +++++++++++++++++++
hw/arm/Makefile.objs | 3 ++-
3 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index b2e31b3..9db6808 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -3,6 +3,7 @@
# TODO: ARM_V7M is currently always required - make this more flexible!
CONFIG_ARM_V7M=y
+CONFIG_ARM_VIRT=y
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
@@ -28,8 +29,6 @@ CONFIG_VGA=y
CONFIG_SSI_M25P80=y
CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y
-CONFIG_PLATFORM_BUS=y
-CONFIG_VIRTIO_MMIO=y
CONFIG_NETDUINO2=y
@@ -63,12 +62,6 @@ CONFIG_IOTKIT_SYSCTL=y
CONFIG_IOTKIT_SYSINFO=y
CONFIG_ARMSSE_CPUID=y
-CONFIG_PCI_EXPRESS=y
-CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
-CONFIG_VFIO_PLATFORM=y
-CONFIG_VFIO_XGMAC=y
-CONFIG_VFIO_AMD_XGBE=y
-
CONFIG_ALLWINNER_A10_PIT=y
CONFIG_ALLWINNER_A10_PIC=y
CONFIG_ALLWINNER_A10=y
@@ -84,10 +77,5 @@ CONFIG_PCIE_PORT=y
CONFIG_XIO3130=y
CONFIG_IOH3420=y
CONFIG_I82801B11=y
-CONFIG_ACPI=y
-CONFIG_ARM_VIRT=y
-CONFIG_SMBIOS=y
-CONFIG_GPIO_KEY=y
CONFIG_MSF2=y
-CONFIG_FW_CFG_DMA=y
CONFIG_PCI_EXPRESS_DESIGNWARE=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index a4fe2c8..3d580fa 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -1,5 +1,23 @@
config ARM_VIRT
bool
+ imply PCI_DEVICES
+ imply VFIO_AMD_XGBE
+ imply VFIO_XGMAC
+ select A15MPCORE
+ select ACPI
+ select ARM_SMMUV3
+ select GPIO_KEY
+ select FW_CFG_DMA
+ select PCI_EXPRESS
+ select PCI_EXPRESS_GENERIC_BRIDGE
+ select PFLASH_CFI01
+ select PL011 # UART
+ select PL031 # RTC
+ select PL061 # GPIO
+ select PLATFORM_BUS
+ select SMBIOS
+ select VIRTIO_MMIO
+ select VFIO_PLATFORM
config CHEETAH
bool
@@ -314,6 +332,7 @@ config A9MPCORE
config A15MPCORE
bool
+ select ARM_GIC
config ARM11MPCORE
bool
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 053fcb6..f17187f 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -1,4 +1,5 @@
-obj-y += boot.o sysbus-fdt.o
+obj-y += boot.o
+obj-$(CONFIG_PLATFORM_BUS) += sysbus-fdt.o
obj-$(CONFIG_ARM_VIRT) += virt.o
obj-$(CONFIG_ACPI) += virt-acpi-build.o
obj-$(CONFIG_DIGIC) += digic_boards.o
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 14/25] hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (12 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 13/25] hw/arm: Express dependencies of the virt machine " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-22 18:03 ` Alistair Francis
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 15/25] hw/arm: Express dependencies of allwinner / cubieboard " Thomas Huth
` (10 subsequent siblings)
24 siblings, 1 reply; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Netduino only depends on the stm32f205 SoC which in turn depends on
its components.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 9 +--------
hw/arm/Kconfig | 7 +++++++
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 9db6808..3279fb5 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -24,25 +24,18 @@ CONFIG_TOSA=y
CONFIG_Z2=y
CONFIG_COLLIE=y
CONFIG_ASPEED_SOC=y
+CONFIG_NETDUINO2=y
CONFIG_VGA=y
CONFIG_SSI_M25P80=y
CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y
-CONFIG_NETDUINO2=y
-
CONFIG_FRAMEBUFFER=y
CONFIG_DIGIC=y
CONFIG_MPS2=y
CONFIG_RASPI=y
-CONFIG_STM32F2XX_TIMER=y
-CONFIG_STM32F2XX_USART=y
-CONFIG_STM32F2XX_SYSCFG=y
-CONFIG_STM32F2XX_ADC=y
-CONFIG_STM32F2XX_SPI=y
-CONFIG_STM32F205_SOC=y
CONFIG_NRF51_SOC=y
CONFIG_CMSDK_APB_TIMER=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 3d580fa..5d7dafb 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -81,6 +81,7 @@ config MUSICPAL
config NETDUINO2
bool
+ select STM32F205_SOC
config NSERIES
bool
@@ -262,6 +263,12 @@ config RASPI
config STM32F205_SOC
bool
+ select ARM_V7M
+ select STM32F2XX_TIMER
+ select STM32F2XX_USART
+ select STM32F2XX_SYSCFG
+ select STM32F2XX_ADC
+ select STM32F2XX_SPI
config XLNX_ZYNQMP_ARM
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* Re: [Qemu-devel] [PATCH v2 14/25] hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 14/25] hw/arm: Express dependencies of netduino / stm32f2xx " Thomas Huth
@ 2019-02-22 18:03 ` Alistair Francis
0 siblings, 0 replies; 31+ messages in thread
From: Alistair Francis @ 2019-02-22 18:03 UTC (permalink / raw)
To: Thomas Huth
Cc: Yang Zhong, Paolo Bonzini, qemu-devel@nongnu.org Developers,
Peter Maydell, qemu-arm, Philippe Mathieu-Daudé
On Wed, Feb 13, 2019 at 1:11 AM Thomas Huth <thuth@redhat.com> wrote:
>
> Netduino only depends on the stm32f205 SoC which in turn depends on
> its components.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> default-configs/arm-softmmu.mak | 9 +--------
> hw/arm/Kconfig | 7 +++++++
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 9db6808..3279fb5 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -24,25 +24,18 @@ CONFIG_TOSA=y
> CONFIG_Z2=y
> CONFIG_COLLIE=y
> CONFIG_ASPEED_SOC=y
> +CONFIG_NETDUINO2=y
>
> CONFIG_VGA=y
> CONFIG_SSI_M25P80=y
> CONFIG_ALLWINNER_EMAC=y
> CONFIG_IMX_FEC=y
>
> -CONFIG_NETDUINO2=y
> -
> CONFIG_FRAMEBUFFER=y
>
> CONFIG_DIGIC=y
> CONFIG_MPS2=y
> CONFIG_RASPI=y
> -CONFIG_STM32F2XX_TIMER=y
> -CONFIG_STM32F2XX_USART=y
> -CONFIG_STM32F2XX_SYSCFG=y
> -CONFIG_STM32F2XX_ADC=y
> -CONFIG_STM32F2XX_SPI=y
> -CONFIG_STM32F205_SOC=y
> CONFIG_NRF51_SOC=y
>
> CONFIG_CMSDK_APB_TIMER=y
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 3d580fa..5d7dafb 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -81,6 +81,7 @@ config MUSICPAL
>
> config NETDUINO2
> bool
> + select STM32F205_SOC
>
> config NSERIES
> bool
> @@ -262,6 +263,12 @@ config RASPI
>
> config STM32F205_SOC
> bool
> + select ARM_V7M
> + select STM32F2XX_TIMER
> + select STM32F2XX_USART
> + select STM32F2XX_SYSCFG
> + select STM32F2XX_ADC
> + select STM32F2XX_SPI
>
> config XLNX_ZYNQMP_ARM
> bool
> --
> 1.8.3.1
>
>
^ permalink raw reply [flat|nested] 31+ messages in thread
* [Qemu-devel] [PATCH v2 15/25] hw/arm: Express dependencies of allwinner / cubieboard with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (13 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 14/25] hw/arm: Express dependencies of netduino / stm32f2xx " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 16/25] hw/arm: Express dependencies of the MPS2 boards " Thomas Huth
` (9 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Add dependencies for the Cubitech Cubieboard.
Note that CONFIG_AHCI has a hard dependency on CONFIG_PCI currently,
so PCI is now always selected by AHCI, even for boards that only
want to use AHCI via a sysbus device. We should break up that
dependency later by splitting ahci.c into sysbus and pci parts.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 6 +-----
hw/arm/Kconfig | 9 +++++++++
hw/ide/Kconfig | 2 +-
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 3279fb5..28bb37f 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -4,6 +4,7 @@
CONFIG_ARM_V7M=y
CONFIG_ARM_VIRT=y
+CONFIG_CUBIEBOARD=y
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
@@ -28,7 +29,6 @@ CONFIG_NETDUINO2=y
CONFIG_VGA=y
CONFIG_SSI_M25P80=y
-CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y
CONFIG_FRAMEBUFFER=y
@@ -55,10 +55,6 @@ CONFIG_IOTKIT_SYSCTL=y
CONFIG_IOTKIT_SYSINFO=y
CONFIG_ARMSSE_CPUID=y
-CONFIG_ALLWINNER_A10_PIT=y
-CONFIG_ALLWINNER_A10_PIC=y
-CONFIG_ALLWINNER_A10=y
-
CONFIG_FSL_IMX6=y
CONFIG_FSL_IMX25=y
CONFIG_FSL_IMX7=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 5d7dafb..3d78102 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -24,6 +24,10 @@ config CHEETAH
select OMAP
select TSC210X
+config CUBIEBOARD
+ bool
+ select ALLWINNER_A10
+
config DIGIC
bool
select PTIMER
@@ -257,6 +261,11 @@ config EXYNOS4
config ALLWINNER_A10
bool
+ select AHCI
+ select ALLWINNER_A10_PIT
+ select ALLWINNER_A10_PIC
+ select ALLWINNER_EMAC
+ select SERIAL
config RASPI
bool
diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
index ab47b6a..c457f60 100644
--- a/hw/ide/Kconfig
+++ b/hw/ide/Kconfig
@@ -45,7 +45,7 @@ config MICRODRIVE
config AHCI
bool
default y if PCI_DEVICES
- depends on PCI
+ select PCI # TODO: Split up ahci.c into sysbus and pci parts
select IDE_QDEV
config IDE_SII3112
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 16/25] hw/arm: Express dependencies of the MPS2 boards with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (14 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 15/25] hw/arm: Express dependencies of allwinner / cubieboard " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 17/25] hw/arm: Express dependencies of the raspi machines " Thomas Huth
` (8 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Add Kconfig dependencies for the mps2-an* machines.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 19 +------------------
hw/arm/Kconfig | 17 +++++++++++++++++
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 28bb37f..b530a06 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -26,6 +26,7 @@ CONFIG_Z2=y
CONFIG_COLLIE=y
CONFIG_ASPEED_SOC=y
CONFIG_NETDUINO2=y
+CONFIG_MPS2=y
CONFIG_VGA=y
CONFIG_SSI_M25P80=y
@@ -34,27 +35,9 @@ CONFIG_IMX_FEC=y
CONFIG_FRAMEBUFFER=y
CONFIG_DIGIC=y
-CONFIG_MPS2=y
CONFIG_RASPI=y
CONFIG_NRF51_SOC=y
-CONFIG_CMSDK_APB_TIMER=y
-CONFIG_CMSDK_APB_DUALTIMER=y
-CONFIG_CMSDK_APB_UART=y
-CONFIG_CMSDK_APB_WATCHDOG=y
-
-CONFIG_MPS2_FPGAIO=y
-CONFIG_MPS2_SCC=y
-
-CONFIG_TZ_MPC=y
-CONFIG_TZ_MSC=y
-CONFIG_TZ_PPC=y
-CONFIG_ARMSSE=y
-CONFIG_IOTKIT_SECCTL=y
-CONFIG_IOTKIT_SYSCTL=y
-CONFIG_IOTKIT_SYSINFO=y
-CONFIG_ARMSSE_CPUID=y
-
CONFIG_FSL_IMX6=y
CONFIG_FSL_IMX25=y
CONFIG_FSL_IMX7=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 3d78102..d17bd2f 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -314,6 +314,23 @@ config ASPEED_SOC
config MPS2
bool
+ select ARMSSE
+ select ARMSSE_CPUID
+ select CMSDK_APB_TIMER
+ select CMSDK_APB_DUALTIMER
+ select CMSDK_APB_UART
+ select CMSDK_APB_WATCHDOG
+ select IOTKIT_SECCTL
+ select IOTKIT_SYSCTL
+ select IOTKIT_SYSINFO
+ select LAN9118
+ select MPS2_FPGAIO
+ select MPS2_SCC
+ select PL022 # Serial port
+ select PL080 # DMA controller
+ select TZ_MPC
+ select TZ_MSC
+ select TZ_PPC
config IOTKIT
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 17/25] hw/arm: Express dependencies of the raspi machines with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (15 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 16/25] hw/arm: Express dependencies of the MPS2 boards " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 18/25] hw/arm: Express dependencies of canon-a1100 " Thomas Huth
` (7 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Most of the code is directly controlled by the CONFIG_RASPI switch,
so not much to add here additionally.
Note that CONFIG_SDHCI currently has a hard requirement for PCI, so
we select that switch now always there instead of depending on it.
We should split up sdhci.c into sysbus and pci parts later to get
rid of this hard requirement.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 4 +---
hw/arm/Kconfig | 3 +++
hw/sd/Kconfig | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index b530a06..6605786 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -27,15 +27,13 @@ CONFIG_COLLIE=y
CONFIG_ASPEED_SOC=y
CONFIG_NETDUINO2=y
CONFIG_MPS2=y
+CONFIG_RASPI=y
CONFIG_VGA=y
CONFIG_SSI_M25P80=y
CONFIG_IMX_FEC=y
-CONFIG_FRAMEBUFFER=y
-
CONFIG_DIGIC=y
-CONFIG_RASPI=y
CONFIG_NRF51_SOC=y
CONFIG_FSL_IMX6=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index d17bd2f..bb385a5 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -269,6 +269,9 @@ config ALLWINNER_A10
config RASPI
bool
+ select FRAMEBUFFER
+ select PL011 # UART
+ select SDHCI
config STM32F205_SOC
bool
diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig
index 864f535..29e359b 100644
--- a/hw/sd/Kconfig
+++ b/hw/sd/Kconfig
@@ -13,5 +13,5 @@ config SD
config SDHCI
bool
default y if PCI_DEVICES
- depends on PCI
+ select PCI # TODO: Split up sdhci.c into sysbus and pci parts
select SD
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 18/25] hw/arm: Express dependencies of canon-a1100 with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (16 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 17/25] hw/arm: Express dependencies of the raspi machines " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 19/25] hw/arm: Express dependencies of sabrelite " Thomas Huth
` (6 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Add Kconfig dependencies for the DIGIC / canon-a1100 machine.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 2 +-
hw/arm/Kconfig | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 6605786..20fcbcb 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -28,12 +28,12 @@ CONFIG_ASPEED_SOC=y
CONFIG_NETDUINO2=y
CONFIG_MPS2=y
CONFIG_RASPI=y
+CONFIG_DIGIC=y
CONFIG_VGA=y
CONFIG_SSI_M25P80=y
CONFIG_IMX_FEC=y
-CONFIG_DIGIC=y
CONFIG_NRF51_SOC=y
CONFIG_FSL_IMX6=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index bb385a5..80a3b1f 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -31,6 +31,7 @@ config CUBIEBOARD
config DIGIC
bool
select PTIMER
+ select PFLASH_CFI02
config EXYNOS4
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 19/25] hw/arm: Express dependencies of sabrelite with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (17 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 18/25] hw/arm: Express dependencies of canon-a1100 " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 20/25] hw/arm: Express dependencies of the MSF2 machine " Thomas Huth
` (5 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Add Kconfig dependencies for the Sabrelite / iMX6 machine.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 4 +---
hw/arm/Kconfig | 7 +++++++
hw/arm/Makefile.objs | 3 ++-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 20fcbcb..f6193b1 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -29,6 +29,7 @@ CONFIG_NETDUINO2=y
CONFIG_MPS2=y
CONFIG_RASPI=y
CONFIG_DIGIC=y
+CONFIG_SABRELITE=y
CONFIG_VGA=y
CONFIG_SSI_M25P80=y
@@ -36,13 +37,10 @@ CONFIG_IMX_FEC=y
CONFIG_NRF51_SOC=y
-CONFIG_FSL_IMX6=y
CONFIG_FSL_IMX25=y
CONFIG_FSL_IMX7=y
CONFIG_FSL_IMX6UL=y
-CONFIG_IMX_I2C=y
-
CONFIG_PCIE_PORT=y
CONFIG_XIO3130=y
CONFIG_IOH3420=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 80a3b1f..70fc73f 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -184,6 +184,10 @@ config REALVIEW
select DS1338 # I2C RTC+NVRAM
select USB_OHCI
+config SABRELITE
+ bool
+ select FSL_IMX6
+
config STELLARIS
bool
select ARM_V7M
@@ -302,6 +306,9 @@ config FSL_IMX31
config FSL_IMX6
bool
+ select A9MPCORE
+ select IMX
+ select IMX_I2C
config ASPEED_SOC
bool
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index f17187f..ee9f5c6 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -22,6 +22,7 @@ obj-$(CONFIG_COLLIE) += collie.o
obj-$(CONFIG_VERSATILE) += versatilepb.o
obj-$(CONFIG_VEXPRESS) += vexpress.o
obj-$(CONFIG_ZYNQ) += xilinx_zynq.o
+obj-$(CONFIG_SABRELITE) += sabrelite.o
obj-$(CONFIG_ARM_V7M) += armv7m.o
obj-$(CONFIG_EXYNOS4) += exynos4210.o
@@ -36,7 +37,7 @@ obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zynqmp.o xlnx-zcu102.o
obj-$(CONFIG_XLNX_VERSAL) += xlnx-versal.o xlnx-versal-virt.o
obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o
obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o
-obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o
+obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o
obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o
obj-$(CONFIG_MPS2) += mps2.o
obj-$(CONFIG_MPS2) += mps2-tz.o
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 20/25] hw/arm: Express dependencies of the MSF2 machine with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (18 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 19/25] hw/arm: Express dependencies of sabrelite " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 21/25] hw/arm: Express dependencies for remaining IMX boards " Thomas Huth
` (4 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Add Kconfig dependencies for the emcraft-sf2 machine - we also
distinguis between the machine (CONFIG_EMCRAFT_SF2) and the SoC
(CONFIG_MSF2) now.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 3 +--
hw/arm/Kconfig | 8 ++++++++
hw/arm/Makefile.objs | 3 ++-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index f6193b1..5eceeba 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -30,9 +30,9 @@ CONFIG_MPS2=y
CONFIG_RASPI=y
CONFIG_DIGIC=y
CONFIG_SABRELITE=y
+CONFIG_EMCRAFT_SF2=y
CONFIG_VGA=y
-CONFIG_SSI_M25P80=y
CONFIG_IMX_FEC=y
CONFIG_NRF51_SOC=y
@@ -45,5 +45,4 @@ CONFIG_PCIE_PORT=y
CONFIG_XIO3130=y
CONFIG_IOH3420=y
CONFIG_I82801B11=y
-CONFIG_MSF2=y
CONFIG_PCI_EXPRESS_DESIGNWARE=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 70fc73f..cebb410 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -358,9 +358,17 @@ config FSL_IMX6UL
config NRF51_SOC
bool
+config EMCRAFT_SF2
+ bool
+ select MSF2
+ select SSI_M25P80
+
config MSF2
bool
+ select ARM_V7M
select PTIMER
+ select SERIAL
+ select SSI
config ZAURUS
bool
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index ee9f5c6..29dc7d9 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -4,6 +4,7 @@ obj-$(CONFIG_ARM_VIRT) += virt.o
obj-$(CONFIG_ACPI) += virt-acpi-build.o
obj-$(CONFIG_DIGIC) += digic_boards.o
obj-$(CONFIG_EXYNOS4) += exynos4_boards.o
+obj-$(CONFIG_EMCRAFT_SF2) += msf2-som.o
obj-$(CONFIG_HIGHBANK) += highbank.o
obj-$(CONFIG_INTEGRATOR) += integratorcp.o
obj-$(CONFIG_MAINSTONE) += mainstone.o
@@ -41,7 +42,7 @@ obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o
obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o
obj-$(CONFIG_MPS2) += mps2.o
obj-$(CONFIG_MPS2) += mps2-tz.o
-obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o
+obj-$(CONFIG_MSF2) += msf2-soc.o
obj-$(CONFIG_ARMSSE) += armsse.o
obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o
obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 21/25] hw/arm: Express dependencies for remaining IMX boards with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (19 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 20/25] hw/arm: Express dependencies of the MSF2 machine " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 22/25] hw/arm: Express dependencies of the microbit / nrf51 machine " Thomas Huth
` (3 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
IMX25, IMX7 and IMX6UL were still missing the Kconfig dependencies.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 2 --
hw/arm/Kconfig | 18 ++++++++++++++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 5eceeba..ebe5de6 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -33,7 +33,6 @@ CONFIG_SABRELITE=y
CONFIG_EMCRAFT_SF2=y
CONFIG_VGA=y
-CONFIG_IMX_FEC=y
CONFIG_NRF51_SOC=y
@@ -45,4 +44,3 @@ CONFIG_PCIE_PORT=y
CONFIG_XIO3130=y
CONFIG_IOH3420=y
CONFIG_I82801B11=y
-CONFIG_PCI_EXPRESS_DESIGNWARE=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index cebb410..c2fba8e 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -295,6 +295,10 @@ config XLNX_VERSAL
config FSL_IMX25
bool
+ select IMX
+ select IMX_FEC
+ select IMX_I2C
+ select DS1338
config FSL_IMX31
bool
@@ -309,6 +313,7 @@ config FSL_IMX6
select A9MPCORE
select IMX
select IMX_I2C
+ select SDHCI
config ASPEED_SOC
bool
@@ -348,12 +353,25 @@ config IOTKIT
config FSL_IMX7
bool
+ imply PCI_DEVICES
+ select A15MPCORE
+ select PCI
+ select IMX
+ select IMX_FEC
+ select IMX_I2C
+ select PCI_EXPRESS_DESIGNWARE
+ select SDHCI
config ARM_SMMUV3
bool
config FSL_IMX6UL
bool
+ select A15MPCORE
+ select IMX
+ select IMX_FEC
+ select IMX_I2C
+ select SDHCI
config NRF51_SOC
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 22/25] hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (20 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 21/25] hw/arm: Express dependencies for remaining IMX boards " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 23/25] hw/arm: Express dependencies of the ZynqMP zcu102 " Thomas Huth
` (2 subsequent siblings)
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Add Kconfig dependencies for the NRF51 / microbit machine.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 3 +--
hw/arm/Kconfig | 6 ++++++
hw/arm/Makefile.objs | 3 ++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index ebe5de6..c1bc6ac 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -31,11 +31,10 @@ CONFIG_RASPI=y
CONFIG_DIGIC=y
CONFIG_SABRELITE=y
CONFIG_EMCRAFT_SF2=y
+CONFIG_MICROBIT=y
CONFIG_VGA=y
-CONFIG_NRF51_SOC=y
-
CONFIG_FSL_IMX25=y
CONFIG_FSL_IMX7=y
CONFIG_FSL_IMX6UL=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index c2fba8e..3d96d1b 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -373,8 +373,14 @@ config FSL_IMX6UL
select IMX_I2C
select SDHCI
+config MICROBIT
+ bool
+ select NRF51_SOC
+
config NRF51_SOC
bool
+ select I2C
+ select ARM_V7M
config EMCRAFT_SF2
bool
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 29dc7d9..88b90ca 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -8,6 +8,7 @@ obj-$(CONFIG_EMCRAFT_SF2) += msf2-som.o
obj-$(CONFIG_HIGHBANK) += highbank.o
obj-$(CONFIG_INTEGRATOR) += integratorcp.o
obj-$(CONFIG_MAINSTONE) += mainstone.o
+obj-$(CONFIG_MICROBIT) += microbit.o
obj-$(CONFIG_MUSICPAL) += musicpal.o
obj-$(CONFIG_NETDUINO2) += netduino2.o
obj-$(CONFIG_NSERIES) += nseries.o
@@ -47,4 +48,4 @@ obj-$(CONFIG_ARMSSE) += armsse.o
obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o
obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o
obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o
-obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o microbit.o
+obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 23/25] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (21 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 22/25] hw/arm: Express dependencies of the microbit / nrf51 machine " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 24/25] hw/arm: Express dependencies of the xlnx-versal-virt " Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 25/25] hw/arm: Remove hard-enablement of the remaining PCI devices Thomas Huth
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
This cleans up most settings in default-configs/aarch64-softmmu.mak.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/aarch64-softmmu.mak | 4 ----
hw/arm/Kconfig | 11 +++++++++++
hw/display/Kconfig | 1 +
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/default-configs/aarch64-softmmu.mak b/default-configs/aarch64-softmmu.mak
index 4ea9add..3a4b15e 100644
--- a/default-configs/aarch64-softmmu.mak
+++ b/default-configs/aarch64-softmmu.mak
@@ -3,10 +3,6 @@
# We support all the 32 bit boards so need all their config
include arm-softmmu.mak
-CONFIG_AUX=y
-CONFIG_DDC=y
-CONFIG_DPCD=y
-CONFIG_XLNX_ZYNQMP=y
CONFIG_XLNX_ZYNQMP_ARM=y
CONFIG_XLNX_VERSAL=y
CONFIG_ARM_SMMUV3=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 3d96d1b..721cc07 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -289,6 +289,17 @@ config STM32F205_SOC
config XLNX_ZYNQMP_ARM
bool
+ select AHCI
+ select ARM_GIC
+ select CADENCE
+ select DDC
+ select DPCD
+ select SDHCI
+ select SSI
+ select SSI_M25P80
+ select XILINX_AXI
+ select XILINX_SPIPS
+ select XLNX_ZYNQMP
config XLNX_VERSAL
bool
diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index a5f3fc0..d2ae2f1 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -108,3 +108,4 @@ config VIRTIO_VGA
config DPCD
bool
+ select AUX
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 24/25] hw/arm: Express dependencies of the xlnx-versal-virt machine with Kconfig
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (22 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 23/25] hw/arm: Express dependencies of the ZynqMP zcu102 " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 25/25] hw/arm: Remove hard-enablement of the remaining PCI devices Thomas Huth
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
Dependencies have been determined with trial-and-error and by
looking at the xlnx-versal.c source file.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/Kconfig | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 721cc07..027c063 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -303,6 +303,10 @@ config XLNX_ZYNQMP_ARM
config XLNX_VERSAL
bool
+ select ARM_GIC
+ select PL011
+ select CADENCE
+ select VIRTIO_MMIO
config FSL_IMX25
bool
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread* [Qemu-devel] [PATCH v2 25/25] hw/arm: Remove hard-enablement of the remaining PCI devices
2019-02-13 8:37 [Qemu-devel] [PATCH v2 00/25] Kconfig dependencies for ARM machines Thomas Huth
` (23 preceding siblings ...)
2019-02-13 8:38 ` [Qemu-devel] [PATCH v2 24/25] hw/arm: Express dependencies of the xlnx-versal-virt " Thomas Huth
@ 2019-02-13 8:38 ` Thomas Huth
24 siblings, 0 replies; 31+ messages in thread
From: Thomas Huth @ 2019-02-13 8:38 UTC (permalink / raw)
To: yang.zhong, pbonzini, qemu-devel; +Cc: Peter Maydell, qemu-arm, philmd
The PCI devices should be pulled in by default if PCI_DEVICES
is set, so there is no need anymore to enforce them in the configs
file.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 8 --------
1 file changed, 8 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index c1bc6ac..19c84ac 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -32,14 +32,6 @@ CONFIG_DIGIC=y
CONFIG_SABRELITE=y
CONFIG_EMCRAFT_SF2=y
CONFIG_MICROBIT=y
-
-CONFIG_VGA=y
-
CONFIG_FSL_IMX25=y
CONFIG_FSL_IMX7=y
CONFIG_FSL_IMX6UL=y
-
-CONFIG_PCIE_PORT=y
-CONFIG_XIO3130=y
-CONFIG_IOH3420=y
-CONFIG_I82801B11=y
--
1.8.3.1
^ permalink raw reply related [flat|nested] 31+ messages in thread