diff mbox series

[33/51] ppc: Express dependencies of the Sam460EX machines with kconfig

Message ID 1549562254-41157-34-git-send-email-pbonzini@redhat.com
State New
Headers show
Series Support Kconfig in QEMU | expand

Commit Message

Paolo Bonzini Feb. 7, 2019, 5:57 p.m. UTC 
From: Thomas Huth <thuth@redhat.com>

Most of the dependencies are now directly selected by the SAM460EX
switch. We can drop CONFIG_VGA_CIRRUS since this device is already
selected automatically when CONFIG_PCI_DEVICES is set.

Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 default-configs/ppc-softmmu.mak |  8 --------
 hw/display/Kconfig              |  1 +
 hw/ppc/Kconfig                  | 11 +++++++++++
 3 files changed, 12 insertions(+), 8 deletions(-)

Comments

BALATON Zoltan Feb. 7, 2019, 11:16 p.m. UTC | #1 
On Thu, 7 Feb 2019, Paolo Bonzini wrote:
> From: Thomas Huth <thuth@redhat.com>
>
> Most of the dependencies are now directly selected by the SAM460EX
> switch. We can drop CONFIG_VGA_CIRRUS since this device is already
> selected automatically when CONFIG_PCI_DEVICES is set.
>
> Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
> default-configs/ppc-softmmu.mak |  8 --------
> hw/display/Kconfig              |  1 +
> hw/ppc/Kconfig                  | 11 +++++++++++
> 3 files changed, 12 insertions(+), 8 deletions(-)
>
> diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
> index caaff60..fb43cba 100644
> --- a/default-configs/ppc-softmmu.mak
> +++ b/default-configs/ppc-softmmu.mak
> @@ -25,14 +25,6 @@ CONFIG_PCI_EXPRESS=y
>
> # For Sam460ex
> CONFIG_SAM460EX=y
> -CONFIG_USB_EHCI_SYSBUS=y
> -CONFIG_SM501=y
> -CONFIG_IDE_SII3112=y
> -CONFIG_AT24C=y
> -CONFIG_BITBANG_I2C=y
> -CONFIG_M41T80=y
> -CONFIG_VGA_CIRRUS=y
> -CONFIG_SMBUS_EEPROM=y
>
> # For Macs
> CONFIG_MAC_OLDWORLD=y
> diff --git a/hw/display/Kconfig b/hw/display/Kconfig
> index 0f659e9..69f8a7e 100644
> --- a/hw/display/Kconfig
> +++ b/hw/display/Kconfig
> @@ -29,6 +29,7 @@ config SII9022
> config SSD0303
>     bool
>     depends on I2C
> +    select DDC

What's SSD0303? It's not something sam460ex needs. Are you sure this hunk 
belongs to this patch?

Regards,
BALATON Zoltan

>
> config SSD0323
>     bool
> diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
> index fb77151..664fc31 100644
> --- a/hw/ppc/Kconfig
> +++ b/hw/ppc/Kconfig
> @@ -33,9 +33,20 @@ config PPC440
>
> config PPC4XX
>     bool
> +    select BITBANG_I2C
> +    select PCI
>
> config SAM460EX
>     bool
> +    select PFLASH_CFI01
> +    select IDE_SII3112
> +    select M41T80
> +    select PPC440
> +    select SERIAL
> +    select SM501
> +    select SMBUS_EEPROM
> +    select USB_EHCI_SYSBUS
> +    select USB_OHCI
>
> config PREP
>     bool
>
Thomas Huth Feb. 8, 2019, 4:30 a.m. UTC | #2 
On 2019-02-08 00:16, BALATON Zoltan wrote:
> On Thu, 7 Feb 2019, Paolo Bonzini wrote:
>> From: Thomas Huth <thuth@redhat.com>
>>
>> Most of the dependencies are now directly selected by the SAM460EX
>> switch. We can drop CONFIG_VGA_CIRRUS since this device is already
>> selected automatically when CONFIG_PCI_DEVICES is set.
>>
>> Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
>> Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> ---
>> default-configs/ppc-softmmu.mak |  8 --------
>> hw/display/Kconfig              |  1 +
>> hw/ppc/Kconfig                  | 11 +++++++++++
>> 3 files changed, 12 insertions(+), 8 deletions(-)
>>
>> diff --git a/default-configs/ppc-softmmu.mak
>> b/default-configs/ppc-softmmu.mak
>> index caaff60..fb43cba 100644
>> --- a/default-configs/ppc-softmmu.mak
>> +++ b/default-configs/ppc-softmmu.mak
>> @@ -25,14 +25,6 @@ CONFIG_PCI_EXPRESS=y
>>
>> # For Sam460ex
>> CONFIG_SAM460EX=y
>> -CONFIG_USB_EHCI_SYSBUS=y
>> -CONFIG_SM501=y
>> -CONFIG_IDE_SII3112=y
>> -CONFIG_AT24C=y
>> -CONFIG_BITBANG_I2C=y
>> -CONFIG_M41T80=y
>> -CONFIG_VGA_CIRRUS=y
>> -CONFIG_SMBUS_EEPROM=y
>>
>> # For Macs
>> CONFIG_MAC_OLDWORLD=y
>> diff --git a/hw/display/Kconfig b/hw/display/Kconfig
>> index 0f659e9..69f8a7e 100644
>> --- a/hw/display/Kconfig
>> +++ b/hw/display/Kconfig
>> @@ -29,6 +29,7 @@ config SII9022
>> config SSD0303
>>     bool
>>     depends on I2C
>> +    select DDC
> 
> What's SSD0303? It's not something sam460ex needs. Are you sure this
> hunk belongs to this patch?

That looks like a rebase error, inded. The line should belong to SM501
instead, see my original patch:

https://lists.gnu.org/archive/html/qemu-devel/2019-01/msg08244.html

 Thomas
diff mbox series

Patch

diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index caaff60..fb43cba 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -25,14 +25,6 @@  CONFIG_PCI_EXPRESS=y
 
 # For Sam460ex
 CONFIG_SAM460EX=y
-CONFIG_USB_EHCI_SYSBUS=y
-CONFIG_SM501=y
-CONFIG_IDE_SII3112=y
-CONFIG_AT24C=y
-CONFIG_BITBANG_I2C=y
-CONFIG_M41T80=y
-CONFIG_VGA_CIRRUS=y
-CONFIG_SMBUS_EEPROM=y
 
 # For Macs
 CONFIG_MAC_OLDWORLD=y
diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index 0f659e9..69f8a7e 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -29,6 +29,7 @@  config SII9022
 config SSD0303
     bool
     depends on I2C
+    select DDC
 
 config SSD0323
     bool
diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig
index fb77151..664fc31 100644
--- a/hw/ppc/Kconfig
+++ b/hw/ppc/Kconfig
@@ -33,9 +33,20 @@  config PPC440
 
 config PPC4XX
     bool
+    select BITBANG_I2C
+    select PCI
 
 config SAM460EX
     bool
+    select PFLASH_CFI01
+    select IDE_SII3112
+    select M41T80
+    select PPC440
+    select SERIAL
+    select SM501
+    select SMBUS_EEPROM
+    select USB_EHCI_SYSBUS
+    select USB_OHCI
 
 config PREP
     bool