* [Qemu-devel] [PATCH for-QEMU-4.1 v5 00/29] Kconfig dependencies for ARM machines
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
This series reworks the default-configs/arm-softmmu.mak and
default-configs/aarch64-softmmu.mak files to use the new Kconfig-style
dependencies instead.
Some of the patches are slightly based on the work by Ákos Kovács:
https://lists.nongnu.org/archive/html/qemu-devel/2013-08/msg03730.html
The other patches have been created by looking at the sources and finding
out the dependencies the hard way via trial-and-error (i.e. by enabling
only one machine at a time and checking whether it can be compiled and
started).
v5:
- Rebased the series to the current master branch
- Added "hw/usb/hcd-ohci: Move PCI-related code into a separate file"
patch and got rid of unneeded dependencies to CONFIG_PCI in the
ARM machines that do not have a PCI bus
v4:
- Rebased the series to Paolo's latest kconfig tree
v3:
- Addressed review feedback from v2
- Included patches to clean up the PCI dependencies of AHCI and SDHCI
(so CONFIG_AHCI and CONFIG_SDHCI do not depend on CONFIG_PCI anymore)
- Added an additional patch for the new "musca" machines
v2: Adressed review-feedback from v1
- CONFIG_SDHCI and CONFIG_AHCI now select CONFIG_PCI
- Added switches for MICROBIT and EMCRAFT_SF2
Thomas Huth (29):
hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs
hw/ide/ahci: Add a Kconfig switch for the AHDI-ICH9 device
hw/usb/hcd-ohci: Move PCI-related code into a separate file
hw/arm: Express dependencies of the exynos machines with Kconfig
hw/arm: Express dependencies of the highbank machines with Kconfig
hw/arm: Express dependencies of integratorcp with Kconfig
hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig
hw/arm: Express dependencies of musicpal with Kconfig
hw/arm: Express dependencies of the OMAP machines with Kconfig
hw/arm: Express dependencies of stellaris with Kconfig
hw/arm: Express dependencies of realview, versatile and vexpress with
Kconfig
hw/arm: Express dependencies of the PXA2xx machines with Kconfig
hw/arm: Express dependencies of xilinx-zynq with Kconfig
hw/arm: Express dependencies of collie with Kconfig
hw/arm: Express dependencies of the aspeed boards with Kconfig
hw/arm: Express dependencies of the virt machine with Kconfig
hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig
hw/arm: Express dependencies of allwinner / cubieboard with Kconfig
hw/arm: Express dependencies of the MPS2 boards with Kconfig
hw/arm: Express dependencies of the raspi machines with Kconfig
hw/arm: Express dependencies of canon-a1100 with Kconfig
hw/arm: Express dependencies of sabrelite with Kconfig
hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with
Kconfig
hw/arm: Express dependencies for remaining IMX boards with Kconfig
hw/arm: Express dependencies of the microbit / nrf51 machine with
Kconfig
hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
hw/arm: Express dependencies of the xlnx-versal-virt machine with
Kconfig
hw/arm: Express dependencies of the musca machines with Kconfig
hw/arm: Remove hard-enablement of the remaining PCI devices
default-configs/aarch64-softmmu.mak | 4 -
default-configs/arm-softmmu.mak | 179 +++-------------
hw/arm/Kconfig | 313 +++++++++++++++++++++++++++-
hw/arm/Makefile.objs | 25 ++-
hw/display/Kconfig | 3 +
hw/i2c/Kconfig | 2 +-
hw/ide/Kconfig | 6 +-
hw/ide/Makefile.objs | 2 +-
hw/misc/Kconfig | 2 +
hw/pci/pci-stub.c | 11 +
hw/usb/Kconfig | 6 +-
hw/usb/Makefile.objs | 1 +
hw/usb/hcd-ohci-pci.c | 166 +++++++++++++++
hw/usb/hcd-ohci.c | 244 ++--------------------
hw/usb/hcd-ohci.h | 132 ++++++++++++
15 files changed, 700 insertions(+), 396 deletions(-)
create mode 100644 hw/usb/hcd-ohci-pci.c
create mode 100644 hw/usb/hcd-ohci.h
--
2.21.0
^ permalink raw reply [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 01/29] hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
Some machines have an AHCI adapter, but no PCI. To be able to
compile hw/ide/ahci.c without CONFIG_PCI, we still need the two
functions msi_enabled() and msi_notify() for linking.
This is required for the new Kconfig-like build system, if a user
wants to compile a QEMU binary with just one machine that has AHCI,
but no PCI, like the ARM "cubieboard" for example.
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/pci/pci-stub.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
index b941a0e842..c04a5df651 100644
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/pci-stub.c
@@ -53,3 +53,14 @@ uint16_t pci_requester_id(PCIDevice *dev)
g_assert(false);
return 0;
}
+
+/* Required by ahci.c */
+bool msi_enabled(const PCIDevice *dev)
+{
+ return false;
+}
+
+void msi_notify(PCIDevice *dev, unsigned int vector)
+{
+ g_assert_not_reached();
+}
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 01/29] hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Some machines have an AHCI adapter, but no PCI. To be able to
compile hw/ide/ahci.c without CONFIG_PCI, we still need the two
functions msi_enabled() and msi_notify() for linking.
This is required for the new Kconfig-like build system, if a user
wants to compile a QEMU binary with just one machine that has AHCI,
but no PCI, like the ARM "cubieboard" for example.
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/pci/pci-stub.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
index b941a0e842..c04a5df651 100644
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/pci-stub.c
@@ -53,3 +53,14 @@ uint16_t pci_requester_id(PCIDevice *dev)
g_assert(false);
return 0;
}
+
+/* Required by ahci.c */
+bool msi_enabled(const PCIDevice *dev)
+{
+ return false;
+}
+
+void msi_notify(PCIDevice *dev, unsigned int vector)
+{
+ g_assert_not_reached();
+}
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 01/29] hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs
@ 2019-04-25 14:06 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 14:06 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Some machines have an AHCI adapter, but no PCI. To be able to
> compile hw/ide/ahci.c without CONFIG_PCI, we still need the two
> functions msi_enabled() and msi_notify() for linking.
> This is required for the new Kconfig-like build system, if a user
> wants to compile a QEMU binary with just one machine that has AHCI,
> but no PCI, like the ARM "cubieboard" for example.
>
> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> hw/pci/pci-stub.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
> index b941a0e842..c04a5df651 100644
> --- a/hw/pci/pci-stub.c
> +++ b/hw/pci/pci-stub.c
> @@ -53,3 +53,14 @@ uint16_t pci_requester_id(PCIDevice *dev)
> g_assert(false);
> return 0;
> }
> +
> +/* Required by ahci.c */
> +bool msi_enabled(const PCIDevice *dev)
> +{
> + return false;
> +}
> +
> +void msi_notify(PCIDevice *dev, unsigned int vector)
> +{
> + g_assert_not_reached();
> +}
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 01/29] hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs
@ 2019-04-25 14:06 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 14:06 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Some machines have an AHCI adapter, but no PCI. To be able to
> compile hw/ide/ahci.c without CONFIG_PCI, we still need the two
> functions msi_enabled() and msi_notify() for linking.
> This is required for the new Kconfig-like build system, if a user
> wants to compile a QEMU binary with just one machine that has AHCI,
> but no PCI, like the ARM "cubieboard" for example.
>
> Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> hw/pci/pci-stub.c | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
> index b941a0e842..c04a5df651 100644
> --- a/hw/pci/pci-stub.c
> +++ b/hw/pci/pci-stub.c
> @@ -53,3 +53,14 @@ uint16_t pci_requester_id(PCIDevice *dev)
> g_assert(false);
> return 0;
> }
> +
> +/* Required by ahci.c */
> +bool msi_enabled(const PCIDevice *dev)
> +{
> + return false;
> +}
> +
> +void msi_notify(PCIDevice *dev, unsigned int vector)
> +{
> + g_assert_not_reached();
> +}
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 02/29] hw/ide/ahci: Add a Kconfig switch for the AHDI-ICH9 device
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
Some of our machines (like the ARM cubieboard) use CONFIG_AHCI for an AHCI
sysbus device, but do not use CONFIG_PCI since they do not feature a PCI
bus. With CONFIG_AHCI but without CONFIG_PCI, currently linking fails:
../hw/ide/ich.o: In function `pci_ich9_ahci_realize':
hw/ide/ich.c:124: undefined reference to `pci_allocate_irq'
hw/ide/ich.c:126: undefined reference to `pci_register_bar'
hw/ide/ich.c:128: undefined reference to `pci_register_bar'
hw/ide/ich.c:131: undefined reference to `pci_add_capability'
hw/ide/ich.c:147: undefined reference to `msi_init'
../hw/ide/ich.o: In function `pci_ich9_uninit':
hw/ide/ich.c:158: undefined reference to `msi_uninit'
../hw/ide/ich.o:(.data.rel+0x50): undefined reference to `vmstate_pci_device'
We must only compile ich.c if CONFIG_PCI is available, too, so introduce a
new config switch for this device.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/ide/Kconfig | 6 +++++-
hw/ide/Makefile.objs | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
index ab47b6a7a3..5d9106b1ac 100644
--- a/hw/ide/Kconfig
+++ b/hw/ide/Kconfig
@@ -43,10 +43,14 @@ config MICRODRIVE
select IDE_QDEV
config AHCI
+ bool
+ select IDE_QDEV
+
+config AHCI_ICH9
bool
default y if PCI_DEVICES
depends on PCI
- select IDE_QDEV
+ select AHCI
config IDE_SII3112
bool
diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs
index a142add90e..faf04e0209 100644
--- a/hw/ide/Makefile.objs
+++ b/hw/ide/Makefile.objs
@@ -9,6 +9,6 @@ common-obj-$(CONFIG_IDE_MMIO) += mmio.o
common-obj-$(CONFIG_IDE_VIA) += via.o
common-obj-$(CONFIG_MICRODRIVE) += microdrive.o
common-obj-$(CONFIG_AHCI) += ahci.o
-common-obj-$(CONFIG_AHCI) += ich.o
+common-obj-$(CONFIG_AHCI_ICH9) += ich.o
common-obj-$(CONFIG_ALLWINNER_A10) += ahci-allwinner.o
common-obj-$(CONFIG_IDE_SII3112) += sii3112.o
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 02/29] hw/ide/ahci: Add a Kconfig switch for the AHDI-ICH9 device
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Some of our machines (like the ARM cubieboard) use CONFIG_AHCI for an AHCI
sysbus device, but do not use CONFIG_PCI since they do not feature a PCI
bus. With CONFIG_AHCI but without CONFIG_PCI, currently linking fails:
../hw/ide/ich.o: In function `pci_ich9_ahci_realize':
hw/ide/ich.c:124: undefined reference to `pci_allocate_irq'
hw/ide/ich.c:126: undefined reference to `pci_register_bar'
hw/ide/ich.c:128: undefined reference to `pci_register_bar'
hw/ide/ich.c:131: undefined reference to `pci_add_capability'
hw/ide/ich.c:147: undefined reference to `msi_init'
../hw/ide/ich.o: In function `pci_ich9_uninit':
hw/ide/ich.c:158: undefined reference to `msi_uninit'
../hw/ide/ich.o:(.data.rel+0x50): undefined reference to `vmstate_pci_device'
We must only compile ich.c if CONFIG_PCI is available, too, so introduce a
new config switch for this device.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/ide/Kconfig | 6 +++++-
hw/ide/Makefile.objs | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
index ab47b6a7a3..5d9106b1ac 100644
--- a/hw/ide/Kconfig
+++ b/hw/ide/Kconfig
@@ -43,10 +43,14 @@ config MICRODRIVE
select IDE_QDEV
config AHCI
+ bool
+ select IDE_QDEV
+
+config AHCI_ICH9
bool
default y if PCI_DEVICES
depends on PCI
- select IDE_QDEV
+ select AHCI
config IDE_SII3112
bool
diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs
index a142add90e..faf04e0209 100644
--- a/hw/ide/Makefile.objs
+++ b/hw/ide/Makefile.objs
@@ -9,6 +9,6 @@ common-obj-$(CONFIG_IDE_MMIO) += mmio.o
common-obj-$(CONFIG_IDE_VIA) += via.o
common-obj-$(CONFIG_MICRODRIVE) += microdrive.o
common-obj-$(CONFIG_AHCI) += ahci.o
-common-obj-$(CONFIG_AHCI) += ich.o
+common-obj-$(CONFIG_AHCI_ICH9) += ich.o
common-obj-$(CONFIG_ALLWINNER_A10) += ahci-allwinner.o
common-obj-$(CONFIG_IDE_SII3112) += sii3112.o
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 02/29] hw/ide/ahci: Add a Kconfig switch for the AHDI-ICH9 device
@ 2019-04-20 10:31 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-20 10:31 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Some of our machines (like the ARM cubieboard) use CONFIG_AHCI for an AHCI
> sysbus device, but do not use CONFIG_PCI since they do not feature a PCI
> bus. With CONFIG_AHCI but without CONFIG_PCI, currently linking fails:
>
> ../hw/ide/ich.o: In function `pci_ich9_ahci_realize':
> hw/ide/ich.c:124: undefined reference to `pci_allocate_irq'
> hw/ide/ich.c:126: undefined reference to `pci_register_bar'
> hw/ide/ich.c:128: undefined reference to `pci_register_bar'
> hw/ide/ich.c:131: undefined reference to `pci_add_capability'
> hw/ide/ich.c:147: undefined reference to `msi_init'
> ../hw/ide/ich.o: In function `pci_ich9_uninit':
> hw/ide/ich.c:158: undefined reference to `msi_uninit'
> ../hw/ide/ich.o:(.data.rel+0x50): undefined reference to `vmstate_pci_device'
>
> We must only compile ich.c if CONFIG_PCI is available, too, so introduce a
> new config switch for this device.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/ide/Kconfig | 6 +++++-
> hw/ide/Makefile.objs | 2 +-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
> index ab47b6a7a3..5d9106b1ac 100644
> --- a/hw/ide/Kconfig
> +++ b/hw/ide/Kconfig
> @@ -43,10 +43,14 @@ config MICRODRIVE
> select IDE_QDEV
>
> config AHCI
> + bool
> + select IDE_QDEV
> +
> +config AHCI_ICH9
> bool
> default y if PCI_DEVICES
> depends on PCI
> - select IDE_QDEV
> + select AHCI
>
> config IDE_SII3112
> bool
> diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs
> index a142add90e..faf04e0209 100644
> --- a/hw/ide/Makefile.objs
> +++ b/hw/ide/Makefile.objs
> @@ -9,6 +9,6 @@ common-obj-$(CONFIG_IDE_MMIO) += mmio.o
> common-obj-$(CONFIG_IDE_VIA) += via.o
> common-obj-$(CONFIG_MICRODRIVE) += microdrive.o
> common-obj-$(CONFIG_AHCI) += ahci.o
> -common-obj-$(CONFIG_AHCI) += ich.o
> +common-obj-$(CONFIG_AHCI_ICH9) += ich.o
> common-obj-$(CONFIG_ALLWINNER_A10) += ahci-allwinner.o
> common-obj-$(CONFIG_IDE_SII3112) += sii3112.o
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 02/29] hw/ide/ahci: Add a Kconfig switch for the AHDI-ICH9 device
@ 2019-04-20 10:31 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-20 10:31 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Some of our machines (like the ARM cubieboard) use CONFIG_AHCI for an AHCI
> sysbus device, but do not use CONFIG_PCI since they do not feature a PCI
> bus. With CONFIG_AHCI but without CONFIG_PCI, currently linking fails:
>
> ../hw/ide/ich.o: In function `pci_ich9_ahci_realize':
> hw/ide/ich.c:124: undefined reference to `pci_allocate_irq'
> hw/ide/ich.c:126: undefined reference to `pci_register_bar'
> hw/ide/ich.c:128: undefined reference to `pci_register_bar'
> hw/ide/ich.c:131: undefined reference to `pci_add_capability'
> hw/ide/ich.c:147: undefined reference to `msi_init'
> ../hw/ide/ich.o: In function `pci_ich9_uninit':
> hw/ide/ich.c:158: undefined reference to `msi_uninit'
> ../hw/ide/ich.o:(.data.rel+0x50): undefined reference to `vmstate_pci_device'
>
> We must only compile ich.c if CONFIG_PCI is available, too, so introduce a
> new config switch for this device.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/ide/Kconfig | 6 +++++-
> hw/ide/Makefile.objs | 2 +-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ide/Kconfig b/hw/ide/Kconfig
> index ab47b6a7a3..5d9106b1ac 100644
> --- a/hw/ide/Kconfig
> +++ b/hw/ide/Kconfig
> @@ -43,10 +43,14 @@ config MICRODRIVE
> select IDE_QDEV
>
> config AHCI
> + bool
> + select IDE_QDEV
> +
> +config AHCI_ICH9
> bool
> default y if PCI_DEVICES
> depends on PCI
> - select IDE_QDEV
> + select AHCI
>
> config IDE_SII3112
> bool
> diff --git a/hw/ide/Makefile.objs b/hw/ide/Makefile.objs
> index a142add90e..faf04e0209 100644
> --- a/hw/ide/Makefile.objs
> +++ b/hw/ide/Makefile.objs
> @@ -9,6 +9,6 @@ common-obj-$(CONFIG_IDE_MMIO) += mmio.o
> common-obj-$(CONFIG_IDE_VIA) += via.o
> common-obj-$(CONFIG_MICRODRIVE) += microdrive.o
> common-obj-$(CONFIG_AHCI) += ahci.o
> -common-obj-$(CONFIG_AHCI) += ich.o
> +common-obj-$(CONFIG_AHCI_ICH9) += ich.o
> common-obj-$(CONFIG_ALLWINNER_A10) += ahci-allwinner.o
> common-obj-$(CONFIG_IDE_SII3112) += sii3112.o
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 02/29] hw/ide/ahci: Add a Kconfig switch for the AHDI-ICH9 device
@ 2019-04-25 13:19 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 13:19 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/20/19 12:31 PM, Philippe Mathieu-Daudé wrote:
> On 4/18/19 8:00 PM, Thomas Huth wrote:
>> Some of our machines (like the ARM cubieboard) use CONFIG_AHCI for an AHCI
>> sysbus device, but do not use CONFIG_PCI since they do not feature a PCI
>> bus. With CONFIG_AHCI but without CONFIG_PCI, currently linking fails:
>>
>> ../hw/ide/ich.o: In function `pci_ich9_ahci_realize':
>> hw/ide/ich.c:124: undefined reference to `pci_allocate_irq'
>> hw/ide/ich.c:126: undefined reference to `pci_register_bar'
>> hw/ide/ich.c:128: undefined reference to `pci_register_bar'
>> hw/ide/ich.c:131: undefined reference to `pci_add_capability'
>> hw/ide/ich.c:147: undefined reference to `msi_init'
>> ../hw/ide/ich.o: In function `pci_ich9_uninit':
>> hw/ide/ich.c:158: undefined reference to `msi_uninit'
>> ../hw/ide/ich.o:(.data.rel+0x50): undefined reference to `vmstate_pci_device'
>>
>> We must only compile ich.c if CONFIG_PCI is available, too, so introduce a
>> new config switch for this device.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Oops, "AHCI" in patch subject (D -> C).
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 02/29] hw/ide/ahci: Add a Kconfig switch for the AHDI-ICH9 device
@ 2019-04-25 13:19 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 13:19 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/20/19 12:31 PM, Philippe Mathieu-Daudé wrote:
> On 4/18/19 8:00 PM, Thomas Huth wrote:
>> Some of our machines (like the ARM cubieboard) use CONFIG_AHCI for an AHCI
>> sysbus device, but do not use CONFIG_PCI since they do not feature a PCI
>> bus. With CONFIG_AHCI but without CONFIG_PCI, currently linking fails:
>>
>> ../hw/ide/ich.o: In function `pci_ich9_ahci_realize':
>> hw/ide/ich.c:124: undefined reference to `pci_allocate_irq'
>> hw/ide/ich.c:126: undefined reference to `pci_register_bar'
>> hw/ide/ich.c:128: undefined reference to `pci_register_bar'
>> hw/ide/ich.c:131: undefined reference to `pci_add_capability'
>> hw/ide/ich.c:147: undefined reference to `msi_init'
>> ../hw/ide/ich.o: In function `pci_ich9_uninit':
>> hw/ide/ich.c:158: undefined reference to `msi_uninit'
>> ../hw/ide/ich.o:(.data.rel+0x50): undefined reference to `vmstate_pci_device'
>>
>> We must only compile ich.c if CONFIG_PCI is available, too, so introduce a
>> new config switch for this device.
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Oops, "AHCI" in patch subject (D -> C).
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 03/29] hw/usb/hcd-ohci: Move PCI-related code into a separate file
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
Some machines (like the pxa2xx-based ARM machines) only have a sysbus
OHCI controller, but no PCI. With the new Kconfig-style build system,
it will soon be possible to create QEMU binaries that only contain
such PCI-less machines. However, the two OHCI controllers, for sysbus
and for PCI, are currently both located in one file, so the PCI code
is still required for linking here. Move the OHCI-PCI device code
into a separate file, so that it is possible to use the sysbus OHCI
device also without the PCI dependency.
Apart from moving code to a new file (and a new header), this patch
might also fix one subtle bug: The ohci_die() function always assumed
to be running with a OHCI-PCI controller and called some PCI-specific
functions - but if I got the code right, ohci_die() might also get
called for the sysbus-OHCI device, so it likely failed in that case.
I've changed this part of the code now, so that there are two ohci_die()
implementations now, one for sysbus and one for PCI.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/usb/Kconfig | 6 +-
hw/usb/Makefile.objs | 1 +
hw/usb/hcd-ohci-pci.c | 166 ++++++++++++++++++++++++++++
hw/usb/hcd-ohci.c | 244 +++---------------------------------------
hw/usb/hcd-ohci.h | 132 +++++++++++++++++++++++
5 files changed, 321 insertions(+), 228 deletions(-)
create mode 100644 hw/usb/hcd-ohci-pci.c
create mode 100644 hw/usb/hcd-ohci.h
diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig
index a1b7acb12a..564305e283 100644
--- a/hw/usb/Kconfig
+++ b/hw/usb/Kconfig
@@ -8,10 +8,14 @@ config USB_UHCI
select USB
config USB_OHCI
+ bool
+ select USB
+
+config USB_OHCI_PCI
bool
default y if PCI_DEVICES
depends on PCI
- select USB
+ select USB_OHCI
config USB_EHCI
bool
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 2b929649ac..81688f6e70 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -5,6 +5,7 @@ common-obj-$(CONFIG_USB) += desc.o desc-msos.o
# usb host adapters
common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
+common-obj-$(CONFIG_USB_OHCI_PCI) += hcd-ohci-pci.o
common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o
common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci.o hcd-ehci-sysbus.o
common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c
new file mode 100644
index 0000000000..e972df35c9
--- /dev/null
+++ b/hw/usb/hcd-ohci-pci.c
@@ -0,0 +1,166 @@
+/*
+ * QEMU USB OHCI Emulation
+ * Copyright (c) 2004 Gianni Tedesco
+ * Copyright (c) 2006 CodeSourcery
+ * Copyright (c) 2006 Openedhand Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/hw.h"
+#include "qapi/error.h"
+#include "qemu/timer.h"
+#include "hw/usb.h"
+#include "hw/pci/pci.h"
+#include "hw/sysbus.h"
+#include "hw/qdev-dma.h"
+#include "trace.h"
+#include "hcd-ohci.h"
+
+#define TYPE_PCI_OHCI "pci-ohci"
+#define PCI_OHCI(obj) OBJECT_CHECK(OHCIPCIState, (obj), TYPE_PCI_OHCI)
+
+typedef struct {
+ /*< private >*/
+ PCIDevice parent_obj;
+ /*< public >*/
+
+ OHCIState state;
+ char *masterbus;
+ uint32_t num_ports;
+ uint32_t firstport;
+} OHCIPCIState;
+
+/**
+ * A typical O/EHCI will stop operating, set itself into error state
+ * (which can be queried by MMIO) and will set PERR in its config
+ * space to signal that it got an error
+ */
+static void ohci_pci_die(OHCIState *ohci)
+{
+ OHCIPCIState *dev = container_of(ohci, OHCIPCIState, state);
+
+ trace_usb_ohci_die();
+
+ ohci_set_interrupt(ohci, OHCI_INTR_UE);
+ ohci_bus_stop(ohci);
+ pci_set_word(dev->parent_obj.config + PCI_STATUS,
+ PCI_STATUS_DETECTED_PARITY);
+}
+
+static void usb_ohci_realize_pci(PCIDevice *dev, Error **errp)
+{
+ Error *err = NULL;
+ OHCIPCIState *ohci = PCI_OHCI(dev);
+
+ dev->config[PCI_CLASS_PROG] = 0x10; /* OHCI */
+ dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */
+
+ usb_ohci_init(&ohci->state, DEVICE(dev), ohci->num_ports, 0,
+ ohci->masterbus, ohci->firstport,
+ pci_get_address_space(dev), ohci_pci_die, &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+
+ ohci->state.irq = pci_allocate_irq(dev);
+ pci_register_bar(dev, 0, 0, &ohci->state.mem);
+}
+
+static void usb_ohci_exit(PCIDevice *dev)
+{
+ OHCIPCIState *ohci = PCI_OHCI(dev);
+ OHCIState *s = &ohci->state;
+
+ trace_usb_ohci_exit(s->name);
+ ohci_bus_stop(s);
+
+ if (s->async_td) {
+ usb_cancel_packet(&s->usb_packet);
+ s->async_td = 0;
+ }
+ ohci_stop_endpoints(s);
+
+ if (!ohci->masterbus) {
+ usb_bus_release(&s->bus);
+ }
+
+ timer_del(s->eof_timer);
+ timer_free(s->eof_timer);
+}
+
+static void usb_ohci_reset_pci(DeviceState *d)
+{
+ PCIDevice *dev = PCI_DEVICE(d);
+ OHCIPCIState *ohci = PCI_OHCI(dev);
+ OHCIState *s = &ohci->state;
+
+ ohci_hard_reset(s);
+}
+
+static Property ohci_pci_properties[] = {
+ DEFINE_PROP_STRING("masterbus", OHCIPCIState, masterbus),
+ DEFINE_PROP_UINT32("num-ports", OHCIPCIState, num_ports, 3),
+ DEFINE_PROP_UINT32("firstport", OHCIPCIState, firstport, 0),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static const VMStateDescription vmstate_ohci = {
+ .name = "ohci",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_PCI_DEVICE(parent_obj, OHCIPCIState),
+ VMSTATE_STRUCT(state, OHCIPCIState, 1, vmstate_ohci_state, OHCIState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static void ohci_pci_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+
+ k->realize = usb_ohci_realize_pci;
+ k->exit = usb_ohci_exit;
+ k->vendor_id = PCI_VENDOR_ID_APPLE;
+ k->device_id = PCI_DEVICE_ID_APPLE_IPID_USB;
+ k->class_id = PCI_CLASS_SERIAL_USB;
+ set_bit(DEVICE_CATEGORY_USB, dc->categories);
+ dc->desc = "Apple USB Controller";
+ dc->props = ohci_pci_properties;
+ dc->hotpluggable = false;
+ dc->vmsd = &vmstate_ohci;
+ dc->reset = usb_ohci_reset_pci;
+}
+
+static const TypeInfo ohci_pci_info = {
+ .name = TYPE_PCI_OHCI,
+ .parent = TYPE_PCI_DEVICE,
+ .instance_size = sizeof(OHCIPCIState),
+ .class_init = ohci_pci_class_init,
+ .interfaces = (InterfaceInfo[]) {
+ { INTERFACE_CONVENTIONAL_PCI_DEVICE },
+ { },
+ },
+};
+
+static void ohci_pci_register_types(void)
+{
+ type_register_static(&ohci_pci_info);
+}
+
+type_init(ohci_pci_register_types)
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index 81cf5ab7a5..343816d561 100644
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -30,86 +30,19 @@
#include "qapi/error.h"
#include "qemu/timer.h"
#include "hw/usb.h"
-#include "hw/pci/pci.h"
#include "hw/sysbus.h"
#include "hw/qdev-dma.h"
#include "trace.h"
+#include "hcd-ohci.h"
/* This causes frames to occur 1000x slower */
//#define OHCI_TIME_WARP 1
-/* Number of Downstream Ports on the root hub. */
-
-#define OHCI_MAX_PORTS 15
-
#define ED_LINK_LIMIT 32
static int64_t usb_frame_time;
static int64_t usb_bit_time;
-typedef struct OHCIPort {
- USBPort port;
- uint32_t ctrl;
-} OHCIPort;
-
-typedef struct {
- USBBus bus;
- qemu_irq irq;
- MemoryRegion mem;
- AddressSpace *as;
- uint32_t num_ports;
- const char *name;
-
- QEMUTimer *eof_timer;
- int64_t sof_time;
-
- /* OHCI state */
- /* Control partition */
- uint32_t ctl, status;
- uint32_t intr_status;
- uint32_t intr;
-
- /* memory pointer partition */
- uint32_t hcca;
- uint32_t ctrl_head, ctrl_cur;
- uint32_t bulk_head, bulk_cur;
- uint32_t per_cur;
- uint32_t done;
- int32_t done_count;
-
- /* Frame counter partition */
- uint16_t fsmps;
- uint8_t fit;
- uint16_t fi;
- uint8_t frt;
- uint16_t frame_number;
- uint16_t padding;
- uint32_t pstart;
- uint32_t lst;
-
- /* Root Hub partition */
- uint32_t rhdesc_a, rhdesc_b;
- uint32_t rhstatus;
- OHCIPort rhport[OHCI_MAX_PORTS];
-
- /* PXA27x Non-OHCI events */
- uint32_t hstatus;
- uint32_t hmask;
- uint32_t hreset;
- uint32_t htest;
-
- /* SM501 local memory offset */
- dma_addr_t localmem_base;
-
- /* Active packets. */
- uint32_t old_ctl;
- USBPacket usb_packet;
- uint8_t usb_buf[8192];
- uint32_t async_td;
- bool async_complete;
-
-} OHCIState;
-
/* Host Controller Communications Area */
struct ohci_hcca {
uint32_t intr[32];
@@ -122,7 +55,6 @@ struct ohci_hcca {
#define ED_WBACK_OFFSET offsetof(struct ohci_ed, head)
#define ED_WBACK_SIZE 4
-static void ohci_bus_stop(OHCIState *ohci);
static void ohci_async_cancel_device(OHCIState *ohci, USBDevice *dev);
/* Bitfields for the first word of an Endpoint Desciptor. */
@@ -229,16 +161,6 @@ struct ohci_iso_td {
#define OHCI_STATUS_OCR (1<<3)
#define OHCI_STATUS_SOC ((1<<6)|(1<<7))
-#define OHCI_INTR_SO (1U<<0) /* Scheduling overrun */
-#define OHCI_INTR_WD (1U<<1) /* HcDoneHead writeback */
-#define OHCI_INTR_SF (1U<<2) /* Start of frame */
-#define OHCI_INTR_RD (1U<<3) /* Resume detect */
-#define OHCI_INTR_UE (1U<<4) /* Unrecoverable error */
-#define OHCI_INTR_FNO (1U<<5) /* Frame number overflow */
-#define OHCI_INTR_RHSC (1U<<6) /* Root hub status change */
-#define OHCI_INTR_OC (1U<<30) /* Ownership change */
-#define OHCI_INTR_MIE (1U<<31) /* Master Interrupt Enable */
-
#define OHCI_HCCA_SIZE 0x100
#define OHCI_HCCA_MASK 0xffffff00
@@ -302,25 +224,9 @@ struct ohci_iso_td {
#define OHCI_HRESET_FSBIR (1 << 0)
-static void ohci_die(OHCIState *ohci);
-
-/* Update IRQ levels */
-static inline void ohci_intr_update(OHCIState *ohci)
+static inline void ohci_die(OHCIState *ohci)
{
- int level = 0;
-
- if ((ohci->intr & OHCI_INTR_MIE) &&
- (ohci->intr_status & ohci->intr))
- level = 1;
-
- qemu_set_irq(ohci->irq, level);
-}
-
-/* Set an interrupt */
-static inline void ohci_set_interrupt(OHCIState *ohci, uint32_t intr)
-{
- ohci->intr_status |= intr;
- ohci_intr_update(ohci);
+ ohci->ohci_die(ohci);
}
/* Attach or detach a device on a root hub port. */
@@ -426,7 +332,7 @@ static USBDevice *ohci_find_device(OHCIState *ohci, uint8_t addr)
return NULL;
}
-static void ohci_stop_endpoints(OHCIState *ohci)
+void ohci_stop_endpoints(OHCIState *ohci)
{
USBDevice *dev;
int i, j;
@@ -498,7 +404,7 @@ static void ohci_soft_reset(OHCIState *ohci)
ohci->lst = OHCI_LS_THRESH;
}
-static void ohci_hard_reset(OHCIState *ohci)
+void ohci_hard_reset(OHCIState *ohci)
{
ohci_soft_reset(ohci);
ohci->ctl = 0;
@@ -1372,7 +1278,7 @@ static int ohci_bus_start(OHCIState *ohci)
}
/* Stop sending SOF tokens on the bus */
-static void ohci_bus_stop(OHCIState *ohci)
+void ohci_bus_stop(OHCIState *ohci)
{
trace_usb_ohci_stop(ohci->name);
timer_del(ohci->eof_timer);
@@ -1852,15 +1758,16 @@ static USBPortOps ohci_port_ops = {
static USBBusOps ohci_bus_ops = {
};
-static void usb_ohci_init(OHCIState *ohci, DeviceState *dev,
- uint32_t num_ports, dma_addr_t localmem_base,
- char *masterbus, uint32_t firstport,
- AddressSpace *as, Error **errp)
+void usb_ohci_init(OHCIState *ohci, DeviceState *dev, uint32_t num_ports,
+ dma_addr_t localmem_base, char *masterbus,
+ uint32_t firstport, AddressSpace *as,
+ void (*ohci_die_func)(OHCIState *ohci), Error **errp)
{
Error *err = NULL;
int i;
ohci->as = as;
+ ohci->ohci_die = ohci_die_func;
if (num_ports > OHCI_MAX_PORTS) {
error_setg(errp, "OHCI num-ports=%u is too big (limit is %u ports)",
@@ -1919,85 +1826,16 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState *dev,
ohci_frame_boundary, ohci);
}
-#define TYPE_PCI_OHCI "pci-ohci"
-#define PCI_OHCI(obj) OBJECT_CHECK(OHCIPCIState, (obj), TYPE_PCI_OHCI)
-
-typedef struct {
- /*< private >*/
- PCIDevice parent_obj;
- /*< public >*/
-
- OHCIState state;
- char *masterbus;
- uint32_t num_ports;
- uint32_t firstport;
-} OHCIPCIState;
-
-/** A typical O/EHCI will stop operating, set itself into error state
- * (which can be queried by MMIO) and will set PERR in its config
- * space to signal that it got an error
+/**
+ * A typical O/EHCI will stop operating, set itself into error state
+ * (which can be queried by MMIO) to signal that it got an error
*/
-static void ohci_die(OHCIState *ohci)
+static void ohci_sysbus_die(OHCIState *ohci)
{
- OHCIPCIState *dev = container_of(ohci, OHCIPCIState, state);
-
trace_usb_ohci_die();
ohci_set_interrupt(ohci, OHCI_INTR_UE);
ohci_bus_stop(ohci);
- pci_set_word(dev->parent_obj.config + PCI_STATUS,
- PCI_STATUS_DETECTED_PARITY);
-}
-
-static void usb_ohci_realize_pci(PCIDevice *dev, Error **errp)
-{
- Error *err = NULL;
- OHCIPCIState *ohci = PCI_OHCI(dev);
-
- dev->config[PCI_CLASS_PROG] = 0x10; /* OHCI */
- dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */
-
- usb_ohci_init(&ohci->state, DEVICE(dev), ohci->num_ports, 0,
- ohci->masterbus, ohci->firstport,
- pci_get_address_space(dev), &err);
- if (err) {
- error_propagate(errp, err);
- return;
- }
-
- ohci->state.irq = pci_allocate_irq(dev);
- pci_register_bar(dev, 0, 0, &ohci->state.mem);
-}
-
-static void usb_ohci_exit(PCIDevice *dev)
-{
- OHCIPCIState *ohci = PCI_OHCI(dev);
- OHCIState *s = &ohci->state;
-
- trace_usb_ohci_exit(s->name);
- ohci_bus_stop(s);
-
- if (s->async_td) {
- usb_cancel_packet(&s->usb_packet);
- s->async_td = 0;
- }
- ohci_stop_endpoints(s);
-
- if (!ohci->masterbus) {
- usb_bus_release(&s->bus);
- }
-
- timer_del(s->eof_timer);
- timer_free(s->eof_timer);
-}
-
-static void usb_ohci_reset_pci(DeviceState *d)
-{
- PCIDevice *dev = PCI_DEVICE(d);
- OHCIPCIState *ohci = PCI_OHCI(dev);
- OHCIState *s = &ohci->state;
-
- ohci_hard_reset(s);
}
#define TYPE_SYSBUS_OHCI "sysbus-ohci"
@@ -2023,7 +1861,7 @@ static void ohci_realize_pxa(DeviceState *dev, Error **errp)
usb_ohci_init(&s->ohci, dev, s->num_ports, s->dma_offset,
s->masterbus, s->firstport,
- &address_space_memory, &err);
+ &address_space_memory, ohci_sysbus_die, &err);
if (err) {
error_propagate(errp, err);
return;
@@ -2040,13 +1878,6 @@ static void usb_ohci_reset_sysbus(DeviceState *dev)
ohci_hard_reset(ohci);
}
-static Property ohci_pci_properties[] = {
- DEFINE_PROP_STRING("masterbus", OHCIPCIState, masterbus),
- DEFINE_PROP_UINT32("num-ports", OHCIPCIState, num_ports, 3),
- DEFINE_PROP_UINT32("firstport", OHCIPCIState, firstport, 0),
- DEFINE_PROP_END_OF_LIST(),
-};
-
static const VMStateDescription vmstate_ohci_state_port = {
.name = "ohci-core/port",
.version_id = 1,
@@ -2075,7 +1906,7 @@ static const VMStateDescription vmstate_ohci_eof_timer = {
},
};
-static const VMStateDescription vmstate_ohci_state = {
+const VMStateDescription vmstate_ohci_state = {
.name = "ohci-core",
.version_id = 1,
.minimum_version_id = 1,
@@ -2122,46 +1953,6 @@ static const VMStateDescription vmstate_ohci_state = {
}
};
-static const VMStateDescription vmstate_ohci = {
- .name = "ohci",
- .version_id = 1,
- .minimum_version_id = 1,
- .fields = (VMStateField[]) {
- VMSTATE_PCI_DEVICE(parent_obj, OHCIPCIState),
- VMSTATE_STRUCT(state, OHCIPCIState, 1, vmstate_ohci_state, OHCIState),
- VMSTATE_END_OF_LIST()
- }
-};
-
-static void ohci_pci_class_init(ObjectClass *klass, void *data)
-{
- DeviceClass *dc = DEVICE_CLASS(klass);
- PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
-
- k->realize = usb_ohci_realize_pci;
- k->exit = usb_ohci_exit;
- k->vendor_id = PCI_VENDOR_ID_APPLE;
- k->device_id = PCI_DEVICE_ID_APPLE_IPID_USB;
- k->class_id = PCI_CLASS_SERIAL_USB;
- set_bit(DEVICE_CATEGORY_USB, dc->categories);
- dc->desc = "Apple USB Controller";
- dc->props = ohci_pci_properties;
- dc->hotpluggable = false;
- dc->vmsd = &vmstate_ohci;
- dc->reset = usb_ohci_reset_pci;
-}
-
-static const TypeInfo ohci_pci_info = {
- .name = TYPE_PCI_OHCI,
- .parent = TYPE_PCI_DEVICE,
- .instance_size = sizeof(OHCIPCIState),
- .class_init = ohci_pci_class_init,
- .interfaces = (InterfaceInfo[]) {
- { INTERFACE_CONVENTIONAL_PCI_DEVICE },
- { },
- },
-};
-
static Property ohci_sysbus_properties[] = {
DEFINE_PROP_STRING("masterbus", OHCISysBusState, masterbus),
DEFINE_PROP_UINT32("num-ports", OHCISysBusState, num_ports, 3),
@@ -2190,7 +1981,6 @@ static const TypeInfo ohci_sysbus_info = {
static void ohci_register_types(void)
{
- type_register_static(&ohci_pci_info);
type_register_static(&ohci_sysbus_info);
}
diff --git a/hw/usb/hcd-ohci.h b/hw/usb/hcd-ohci.h
new file mode 100644
index 0000000000..481ceba7ff
--- /dev/null
+++ b/hw/usb/hcd-ohci.h
@@ -0,0 +1,132 @@
+/*
+ * QEMU USB OHCI Emulation
+ * Copyright (c) 2004 Gianni Tedesco
+ * Copyright (c) 2006 CodeSourcery
+ * Copyright (c) 2006 Openedhand Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef HCD_OHCI_H
+#define HCD_OHCI_H
+
+#include "sysemu/dma.h"
+
+/* Number of Downstream Ports on the root hub: */
+#define OHCI_MAX_PORTS 15
+
+typedef struct OHCIPort {
+ USBPort port;
+ uint32_t ctrl;
+} OHCIPort;
+
+typedef struct OHCIState {
+ USBBus bus;
+ qemu_irq irq;
+ MemoryRegion mem;
+ AddressSpace *as;
+ uint32_t num_ports;
+ const char *name;
+
+ QEMUTimer *eof_timer;
+ int64_t sof_time;
+
+ /* OHCI state */
+ /* Control partition */
+ uint32_t ctl, status;
+ uint32_t intr_status;
+ uint32_t intr;
+
+ /* memory pointer partition */
+ uint32_t hcca;
+ uint32_t ctrl_head, ctrl_cur;
+ uint32_t bulk_head, bulk_cur;
+ uint32_t per_cur;
+ uint32_t done;
+ int32_t done_count;
+
+ /* Frame counter partition */
+ uint16_t fsmps;
+ uint8_t fit;
+ uint16_t fi;
+ uint8_t frt;
+ uint16_t frame_number;
+ uint16_t padding;
+ uint32_t pstart;
+ uint32_t lst;
+
+ /* Root Hub partition */
+ uint32_t rhdesc_a, rhdesc_b;
+ uint32_t rhstatus;
+ OHCIPort rhport[OHCI_MAX_PORTS];
+
+ /* PXA27x Non-OHCI events */
+ uint32_t hstatus;
+ uint32_t hmask;
+ uint32_t hreset;
+ uint32_t htest;
+
+ /* SM501 local memory offset */
+ dma_addr_t localmem_base;
+
+ /* Active packets. */
+ uint32_t old_ctl;
+ USBPacket usb_packet;
+ uint8_t usb_buf[8192];
+ uint32_t async_td;
+ bool async_complete;
+
+ void (*ohci_die)(struct OHCIState *ohci);
+} OHCIState;
+
+extern const VMStateDescription vmstate_ohci_state;
+
+#define OHCI_INTR_SO (1U << 0) /* Scheduling overrun */
+#define OHCI_INTR_WD (1U << 1) /* HcDoneHead writeback */
+#define OHCI_INTR_SF (1U << 2) /* Start of frame */
+#define OHCI_INTR_RD (1U << 3) /* Resume detect */
+#define OHCI_INTR_UE (1U << 4) /* Unrecoverable error */
+#define OHCI_INTR_FNO (1U << 5) /* Frame number overflow */
+#define OHCI_INTR_RHSC (1U << 6) /* Root hub status change */
+#define OHCI_INTR_OC (1U << 30) /* Ownership change */
+#define OHCI_INTR_MIE (1U << 31) /* Master Interrupt Enable */
+
+/* Update IRQ levels */
+static inline void ohci_intr_update(OHCIState *ohci)
+{
+ int level = 0;
+
+ if ((ohci->intr & OHCI_INTR_MIE) &&
+ (ohci->intr_status & ohci->intr))
+ level = 1;
+
+ qemu_set_irq(ohci->irq, level);
+}
+
+/* Set an interrupt */
+static inline void ohci_set_interrupt(OHCIState *ohci, uint32_t intr)
+{
+ ohci->intr_status |= intr;
+ ohci_intr_update(ohci);
+}
+
+void usb_ohci_init(OHCIState *ohci, DeviceState *dev, uint32_t num_ports,
+ dma_addr_t localmem_base, char *masterbus,
+ uint32_t firstport, AddressSpace *as,
+ void (*ohci_die_func)(OHCIState *ohci), Error **errp);
+void ohci_hard_reset(OHCIState *ohci);
+void ohci_bus_stop(OHCIState *ohci);
+void ohci_stop_endpoints(OHCIState *ohci);
+
+#endif
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 03/29] hw/usb/hcd-ohci: Move PCI-related code into a separate file
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Some machines (like the pxa2xx-based ARM machines) only have a sysbus
OHCI controller, but no PCI. With the new Kconfig-style build system,
it will soon be possible to create QEMU binaries that only contain
such PCI-less machines. However, the two OHCI controllers, for sysbus
and for PCI, are currently both located in one file, so the PCI code
is still required for linking here. Move the OHCI-PCI device code
into a separate file, so that it is possible to use the sysbus OHCI
device also without the PCI dependency.
Apart from moving code to a new file (and a new header), this patch
might also fix one subtle bug: The ohci_die() function always assumed
to be running with a OHCI-PCI controller and called some PCI-specific
functions - but if I got the code right, ohci_die() might also get
called for the sysbus-OHCI device, so it likely failed in that case.
I've changed this part of the code now, so that there are two ohci_die()
implementations now, one for sysbus and one for PCI.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/usb/Kconfig | 6 +-
hw/usb/Makefile.objs | 1 +
hw/usb/hcd-ohci-pci.c | 166 ++++++++++++++++++++++++++++
hw/usb/hcd-ohci.c | 244 +++---------------------------------------
hw/usb/hcd-ohci.h | 132 +++++++++++++++++++++++
5 files changed, 321 insertions(+), 228 deletions(-)
create mode 100644 hw/usb/hcd-ohci-pci.c
create mode 100644 hw/usb/hcd-ohci.h
diff --git a/hw/usb/Kconfig b/hw/usb/Kconfig
index a1b7acb12a..564305e283 100644
--- a/hw/usb/Kconfig
+++ b/hw/usb/Kconfig
@@ -8,10 +8,14 @@ config USB_UHCI
select USB
config USB_OHCI
+ bool
+ select USB
+
+config USB_OHCI_PCI
bool
default y if PCI_DEVICES
depends on PCI
- select USB
+ select USB_OHCI
config USB_EHCI
bool
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 2b929649ac..81688f6e70 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -5,6 +5,7 @@ common-obj-$(CONFIG_USB) += desc.o desc-msos.o
# usb host adapters
common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
+common-obj-$(CONFIG_USB_OHCI_PCI) += hcd-ohci-pci.o
common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o
common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci.o hcd-ehci-sysbus.o
common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
diff --git a/hw/usb/hcd-ohci-pci.c b/hw/usb/hcd-ohci-pci.c
new file mode 100644
index 0000000000..e972df35c9
--- /dev/null
+++ b/hw/usb/hcd-ohci-pci.c
@@ -0,0 +1,166 @@
+/*
+ * QEMU USB OHCI Emulation
+ * Copyright (c) 2004 Gianni Tedesco
+ * Copyright (c) 2006 CodeSourcery
+ * Copyright (c) 2006 Openedhand Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "qemu/osdep.h"
+#include "hw/hw.h"
+#include "qapi/error.h"
+#include "qemu/timer.h"
+#include "hw/usb.h"
+#include "hw/pci/pci.h"
+#include "hw/sysbus.h"
+#include "hw/qdev-dma.h"
+#include "trace.h"
+#include "hcd-ohci.h"
+
+#define TYPE_PCI_OHCI "pci-ohci"
+#define PCI_OHCI(obj) OBJECT_CHECK(OHCIPCIState, (obj), TYPE_PCI_OHCI)
+
+typedef struct {
+ /*< private >*/
+ PCIDevice parent_obj;
+ /*< public >*/
+
+ OHCIState state;
+ char *masterbus;
+ uint32_t num_ports;
+ uint32_t firstport;
+} OHCIPCIState;
+
+/**
+ * A typical O/EHCI will stop operating, set itself into error state
+ * (which can be queried by MMIO) and will set PERR in its config
+ * space to signal that it got an error
+ */
+static void ohci_pci_die(OHCIState *ohci)
+{
+ OHCIPCIState *dev = container_of(ohci, OHCIPCIState, state);
+
+ trace_usb_ohci_die();
+
+ ohci_set_interrupt(ohci, OHCI_INTR_UE);
+ ohci_bus_stop(ohci);
+ pci_set_word(dev->parent_obj.config + PCI_STATUS,
+ PCI_STATUS_DETECTED_PARITY);
+}
+
+static void usb_ohci_realize_pci(PCIDevice *dev, Error **errp)
+{
+ Error *err = NULL;
+ OHCIPCIState *ohci = PCI_OHCI(dev);
+
+ dev->config[PCI_CLASS_PROG] = 0x10; /* OHCI */
+ dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */
+
+ usb_ohci_init(&ohci->state, DEVICE(dev), ohci->num_ports, 0,
+ ohci->masterbus, ohci->firstport,
+ pci_get_address_space(dev), ohci_pci_die, &err);
+ if (err) {
+ error_propagate(errp, err);
+ return;
+ }
+
+ ohci->state.irq = pci_allocate_irq(dev);
+ pci_register_bar(dev, 0, 0, &ohci->state.mem);
+}
+
+static void usb_ohci_exit(PCIDevice *dev)
+{
+ OHCIPCIState *ohci = PCI_OHCI(dev);
+ OHCIState *s = &ohci->state;
+
+ trace_usb_ohci_exit(s->name);
+ ohci_bus_stop(s);
+
+ if (s->async_td) {
+ usb_cancel_packet(&s->usb_packet);
+ s->async_td = 0;
+ }
+ ohci_stop_endpoints(s);
+
+ if (!ohci->masterbus) {
+ usb_bus_release(&s->bus);
+ }
+
+ timer_del(s->eof_timer);
+ timer_free(s->eof_timer);
+}
+
+static void usb_ohci_reset_pci(DeviceState *d)
+{
+ PCIDevice *dev = PCI_DEVICE(d);
+ OHCIPCIState *ohci = PCI_OHCI(dev);
+ OHCIState *s = &ohci->state;
+
+ ohci_hard_reset(s);
+}
+
+static Property ohci_pci_properties[] = {
+ DEFINE_PROP_STRING("masterbus", OHCIPCIState, masterbus),
+ DEFINE_PROP_UINT32("num-ports", OHCIPCIState, num_ports, 3),
+ DEFINE_PROP_UINT32("firstport", OHCIPCIState, firstport, 0),
+ DEFINE_PROP_END_OF_LIST(),
+};
+
+static const VMStateDescription vmstate_ohci = {
+ .name = "ohci",
+ .version_id = 1,
+ .minimum_version_id = 1,
+ .fields = (VMStateField[]) {
+ VMSTATE_PCI_DEVICE(parent_obj, OHCIPCIState),
+ VMSTATE_STRUCT(state, OHCIPCIState, 1, vmstate_ohci_state, OHCIState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static void ohci_pci_class_init(ObjectClass *klass, void *data)
+{
+ DeviceClass *dc = DEVICE_CLASS(klass);
+ PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
+
+ k->realize = usb_ohci_realize_pci;
+ k->exit = usb_ohci_exit;
+ k->vendor_id = PCI_VENDOR_ID_APPLE;
+ k->device_id = PCI_DEVICE_ID_APPLE_IPID_USB;
+ k->class_id = PCI_CLASS_SERIAL_USB;
+ set_bit(DEVICE_CATEGORY_USB, dc->categories);
+ dc->desc = "Apple USB Controller";
+ dc->props = ohci_pci_properties;
+ dc->hotpluggable = false;
+ dc->vmsd = &vmstate_ohci;
+ dc->reset = usb_ohci_reset_pci;
+}
+
+static const TypeInfo ohci_pci_info = {
+ .name = TYPE_PCI_OHCI,
+ .parent = TYPE_PCI_DEVICE,
+ .instance_size = sizeof(OHCIPCIState),
+ .class_init = ohci_pci_class_init,
+ .interfaces = (InterfaceInfo[]) {
+ { INTERFACE_CONVENTIONAL_PCI_DEVICE },
+ { },
+ },
+};
+
+static void ohci_pci_register_types(void)
+{
+ type_register_static(&ohci_pci_info);
+}
+
+type_init(ohci_pci_register_types)
diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index 81cf5ab7a5..343816d561 100644
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -30,86 +30,19 @@
#include "qapi/error.h"
#include "qemu/timer.h"
#include "hw/usb.h"
-#include "hw/pci/pci.h"
#include "hw/sysbus.h"
#include "hw/qdev-dma.h"
#include "trace.h"
+#include "hcd-ohci.h"
/* This causes frames to occur 1000x slower */
//#define OHCI_TIME_WARP 1
-/* Number of Downstream Ports on the root hub. */
-
-#define OHCI_MAX_PORTS 15
-
#define ED_LINK_LIMIT 32
static int64_t usb_frame_time;
static int64_t usb_bit_time;
-typedef struct OHCIPort {
- USBPort port;
- uint32_t ctrl;
-} OHCIPort;
-
-typedef struct {
- USBBus bus;
- qemu_irq irq;
- MemoryRegion mem;
- AddressSpace *as;
- uint32_t num_ports;
- const char *name;
-
- QEMUTimer *eof_timer;
- int64_t sof_time;
-
- /* OHCI state */
- /* Control partition */
- uint32_t ctl, status;
- uint32_t intr_status;
- uint32_t intr;
-
- /* memory pointer partition */
- uint32_t hcca;
- uint32_t ctrl_head, ctrl_cur;
- uint32_t bulk_head, bulk_cur;
- uint32_t per_cur;
- uint32_t done;
- int32_t done_count;
-
- /* Frame counter partition */
- uint16_t fsmps;
- uint8_t fit;
- uint16_t fi;
- uint8_t frt;
- uint16_t frame_number;
- uint16_t padding;
- uint32_t pstart;
- uint32_t lst;
-
- /* Root Hub partition */
- uint32_t rhdesc_a, rhdesc_b;
- uint32_t rhstatus;
- OHCIPort rhport[OHCI_MAX_PORTS];
-
- /* PXA27x Non-OHCI events */
- uint32_t hstatus;
- uint32_t hmask;
- uint32_t hreset;
- uint32_t htest;
-
- /* SM501 local memory offset */
- dma_addr_t localmem_base;
-
- /* Active packets. */
- uint32_t old_ctl;
- USBPacket usb_packet;
- uint8_t usb_buf[8192];
- uint32_t async_td;
- bool async_complete;
-
-} OHCIState;
-
/* Host Controller Communications Area */
struct ohci_hcca {
uint32_t intr[32];
@@ -122,7 +55,6 @@ struct ohci_hcca {
#define ED_WBACK_OFFSET offsetof(struct ohci_ed, head)
#define ED_WBACK_SIZE 4
-static void ohci_bus_stop(OHCIState *ohci);
static void ohci_async_cancel_device(OHCIState *ohci, USBDevice *dev);
/* Bitfields for the first word of an Endpoint Desciptor. */
@@ -229,16 +161,6 @@ struct ohci_iso_td {
#define OHCI_STATUS_OCR (1<<3)
#define OHCI_STATUS_SOC ((1<<6)|(1<<7))
-#define OHCI_INTR_SO (1U<<0) /* Scheduling overrun */
-#define OHCI_INTR_WD (1U<<1) /* HcDoneHead writeback */
-#define OHCI_INTR_SF (1U<<2) /* Start of frame */
-#define OHCI_INTR_RD (1U<<3) /* Resume detect */
-#define OHCI_INTR_UE (1U<<4) /* Unrecoverable error */
-#define OHCI_INTR_FNO (1U<<5) /* Frame number overflow */
-#define OHCI_INTR_RHSC (1U<<6) /* Root hub status change */
-#define OHCI_INTR_OC (1U<<30) /* Ownership change */
-#define OHCI_INTR_MIE (1U<<31) /* Master Interrupt Enable */
-
#define OHCI_HCCA_SIZE 0x100
#define OHCI_HCCA_MASK 0xffffff00
@@ -302,25 +224,9 @@ struct ohci_iso_td {
#define OHCI_HRESET_FSBIR (1 << 0)
-static void ohci_die(OHCIState *ohci);
-
-/* Update IRQ levels */
-static inline void ohci_intr_update(OHCIState *ohci)
+static inline void ohci_die(OHCIState *ohci)
{
- int level = 0;
-
- if ((ohci->intr & OHCI_INTR_MIE) &&
- (ohci->intr_status & ohci->intr))
- level = 1;
-
- qemu_set_irq(ohci->irq, level);
-}
-
-/* Set an interrupt */
-static inline void ohci_set_interrupt(OHCIState *ohci, uint32_t intr)
-{
- ohci->intr_status |= intr;
- ohci_intr_update(ohci);
+ ohci->ohci_die(ohci);
}
/* Attach or detach a device on a root hub port. */
@@ -426,7 +332,7 @@ static USBDevice *ohci_find_device(OHCIState *ohci, uint8_t addr)
return NULL;
}
-static void ohci_stop_endpoints(OHCIState *ohci)
+void ohci_stop_endpoints(OHCIState *ohci)
{
USBDevice *dev;
int i, j;
@@ -498,7 +404,7 @@ static void ohci_soft_reset(OHCIState *ohci)
ohci->lst = OHCI_LS_THRESH;
}
-static void ohci_hard_reset(OHCIState *ohci)
+void ohci_hard_reset(OHCIState *ohci)
{
ohci_soft_reset(ohci);
ohci->ctl = 0;
@@ -1372,7 +1278,7 @@ static int ohci_bus_start(OHCIState *ohci)
}
/* Stop sending SOF tokens on the bus */
-static void ohci_bus_stop(OHCIState *ohci)
+void ohci_bus_stop(OHCIState *ohci)
{
trace_usb_ohci_stop(ohci->name);
timer_del(ohci->eof_timer);
@@ -1852,15 +1758,16 @@ static USBPortOps ohci_port_ops = {
static USBBusOps ohci_bus_ops = {
};
-static void usb_ohci_init(OHCIState *ohci, DeviceState *dev,
- uint32_t num_ports, dma_addr_t localmem_base,
- char *masterbus, uint32_t firstport,
- AddressSpace *as, Error **errp)
+void usb_ohci_init(OHCIState *ohci, DeviceState *dev, uint32_t num_ports,
+ dma_addr_t localmem_base, char *masterbus,
+ uint32_t firstport, AddressSpace *as,
+ void (*ohci_die_func)(OHCIState *ohci), Error **errp)
{
Error *err = NULL;
int i;
ohci->as = as;
+ ohci->ohci_die = ohci_die_func;
if (num_ports > OHCI_MAX_PORTS) {
error_setg(errp, "OHCI num-ports=%u is too big (limit is %u ports)",
@@ -1919,85 +1826,16 @@ static void usb_ohci_init(OHCIState *ohci, DeviceState *dev,
ohci_frame_boundary, ohci);
}
-#define TYPE_PCI_OHCI "pci-ohci"
-#define PCI_OHCI(obj) OBJECT_CHECK(OHCIPCIState, (obj), TYPE_PCI_OHCI)
-
-typedef struct {
- /*< private >*/
- PCIDevice parent_obj;
- /*< public >*/
-
- OHCIState state;
- char *masterbus;
- uint32_t num_ports;
- uint32_t firstport;
-} OHCIPCIState;
-
-/** A typical O/EHCI will stop operating, set itself into error state
- * (which can be queried by MMIO) and will set PERR in its config
- * space to signal that it got an error
+/**
+ * A typical O/EHCI will stop operating, set itself into error state
+ * (which can be queried by MMIO) to signal that it got an error
*/
-static void ohci_die(OHCIState *ohci)
+static void ohci_sysbus_die(OHCIState *ohci)
{
- OHCIPCIState *dev = container_of(ohci, OHCIPCIState, state);
-
trace_usb_ohci_die();
ohci_set_interrupt(ohci, OHCI_INTR_UE);
ohci_bus_stop(ohci);
- pci_set_word(dev->parent_obj.config + PCI_STATUS,
- PCI_STATUS_DETECTED_PARITY);
-}
-
-static void usb_ohci_realize_pci(PCIDevice *dev, Error **errp)
-{
- Error *err = NULL;
- OHCIPCIState *ohci = PCI_OHCI(dev);
-
- dev->config[PCI_CLASS_PROG] = 0x10; /* OHCI */
- dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */
-
- usb_ohci_init(&ohci->state, DEVICE(dev), ohci->num_ports, 0,
- ohci->masterbus, ohci->firstport,
- pci_get_address_space(dev), &err);
- if (err) {
- error_propagate(errp, err);
- return;
- }
-
- ohci->state.irq = pci_allocate_irq(dev);
- pci_register_bar(dev, 0, 0, &ohci->state.mem);
-}
-
-static void usb_ohci_exit(PCIDevice *dev)
-{
- OHCIPCIState *ohci = PCI_OHCI(dev);
- OHCIState *s = &ohci->state;
-
- trace_usb_ohci_exit(s->name);
- ohci_bus_stop(s);
-
- if (s->async_td) {
- usb_cancel_packet(&s->usb_packet);
- s->async_td = 0;
- }
- ohci_stop_endpoints(s);
-
- if (!ohci->masterbus) {
- usb_bus_release(&s->bus);
- }
-
- timer_del(s->eof_timer);
- timer_free(s->eof_timer);
-}
-
-static void usb_ohci_reset_pci(DeviceState *d)
-{
- PCIDevice *dev = PCI_DEVICE(d);
- OHCIPCIState *ohci = PCI_OHCI(dev);
- OHCIState *s = &ohci->state;
-
- ohci_hard_reset(s);
}
#define TYPE_SYSBUS_OHCI "sysbus-ohci"
@@ -2023,7 +1861,7 @@ static void ohci_realize_pxa(DeviceState *dev, Error **errp)
usb_ohci_init(&s->ohci, dev, s->num_ports, s->dma_offset,
s->masterbus, s->firstport,
- &address_space_memory, &err);
+ &address_space_memory, ohci_sysbus_die, &err);
if (err) {
error_propagate(errp, err);
return;
@@ -2040,13 +1878,6 @@ static void usb_ohci_reset_sysbus(DeviceState *dev)
ohci_hard_reset(ohci);
}
-static Property ohci_pci_properties[] = {
- DEFINE_PROP_STRING("masterbus", OHCIPCIState, masterbus),
- DEFINE_PROP_UINT32("num-ports", OHCIPCIState, num_ports, 3),
- DEFINE_PROP_UINT32("firstport", OHCIPCIState, firstport, 0),
- DEFINE_PROP_END_OF_LIST(),
-};
-
static const VMStateDescription vmstate_ohci_state_port = {
.name = "ohci-core/port",
.version_id = 1,
@@ -2075,7 +1906,7 @@ static const VMStateDescription vmstate_ohci_eof_timer = {
},
};
-static const VMStateDescription vmstate_ohci_state = {
+const VMStateDescription vmstate_ohci_state = {
.name = "ohci-core",
.version_id = 1,
.minimum_version_id = 1,
@@ -2122,46 +1953,6 @@ static const VMStateDescription vmstate_ohci_state = {
}
};
-static const VMStateDescription vmstate_ohci = {
- .name = "ohci",
- .version_id = 1,
- .minimum_version_id = 1,
- .fields = (VMStateField[]) {
- VMSTATE_PCI_DEVICE(parent_obj, OHCIPCIState),
- VMSTATE_STRUCT(state, OHCIPCIState, 1, vmstate_ohci_state, OHCIState),
- VMSTATE_END_OF_LIST()
- }
-};
-
-static void ohci_pci_class_init(ObjectClass *klass, void *data)
-{
- DeviceClass *dc = DEVICE_CLASS(klass);
- PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
-
- k->realize = usb_ohci_realize_pci;
- k->exit = usb_ohci_exit;
- k->vendor_id = PCI_VENDOR_ID_APPLE;
- k->device_id = PCI_DEVICE_ID_APPLE_IPID_USB;
- k->class_id = PCI_CLASS_SERIAL_USB;
- set_bit(DEVICE_CATEGORY_USB, dc->categories);
- dc->desc = "Apple USB Controller";
- dc->props = ohci_pci_properties;
- dc->hotpluggable = false;
- dc->vmsd = &vmstate_ohci;
- dc->reset = usb_ohci_reset_pci;
-}
-
-static const TypeInfo ohci_pci_info = {
- .name = TYPE_PCI_OHCI,
- .parent = TYPE_PCI_DEVICE,
- .instance_size = sizeof(OHCIPCIState),
- .class_init = ohci_pci_class_init,
- .interfaces = (InterfaceInfo[]) {
- { INTERFACE_CONVENTIONAL_PCI_DEVICE },
- { },
- },
-};
-
static Property ohci_sysbus_properties[] = {
DEFINE_PROP_STRING("masterbus", OHCISysBusState, masterbus),
DEFINE_PROP_UINT32("num-ports", OHCISysBusState, num_ports, 3),
@@ -2190,7 +1981,6 @@ static const TypeInfo ohci_sysbus_info = {
static void ohci_register_types(void)
{
- type_register_static(&ohci_pci_info);
type_register_static(&ohci_sysbus_info);
}
diff --git a/hw/usb/hcd-ohci.h b/hw/usb/hcd-ohci.h
new file mode 100644
index 0000000000..481ceba7ff
--- /dev/null
+++ b/hw/usb/hcd-ohci.h
@@ -0,0 +1,132 @@
+/*
+ * QEMU USB OHCI Emulation
+ * Copyright (c) 2004 Gianni Tedesco
+ * Copyright (c) 2006 CodeSourcery
+ * Copyright (c) 2006 Openedhand Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef HCD_OHCI_H
+#define HCD_OHCI_H
+
+#include "sysemu/dma.h"
+
+/* Number of Downstream Ports on the root hub: */
+#define OHCI_MAX_PORTS 15
+
+typedef struct OHCIPort {
+ USBPort port;
+ uint32_t ctrl;
+} OHCIPort;
+
+typedef struct OHCIState {
+ USBBus bus;
+ qemu_irq irq;
+ MemoryRegion mem;
+ AddressSpace *as;
+ uint32_t num_ports;
+ const char *name;
+
+ QEMUTimer *eof_timer;
+ int64_t sof_time;
+
+ /* OHCI state */
+ /* Control partition */
+ uint32_t ctl, status;
+ uint32_t intr_status;
+ uint32_t intr;
+
+ /* memory pointer partition */
+ uint32_t hcca;
+ uint32_t ctrl_head, ctrl_cur;
+ uint32_t bulk_head, bulk_cur;
+ uint32_t per_cur;
+ uint32_t done;
+ int32_t done_count;
+
+ /* Frame counter partition */
+ uint16_t fsmps;
+ uint8_t fit;
+ uint16_t fi;
+ uint8_t frt;
+ uint16_t frame_number;
+ uint16_t padding;
+ uint32_t pstart;
+ uint32_t lst;
+
+ /* Root Hub partition */
+ uint32_t rhdesc_a, rhdesc_b;
+ uint32_t rhstatus;
+ OHCIPort rhport[OHCI_MAX_PORTS];
+
+ /* PXA27x Non-OHCI events */
+ uint32_t hstatus;
+ uint32_t hmask;
+ uint32_t hreset;
+ uint32_t htest;
+
+ /* SM501 local memory offset */
+ dma_addr_t localmem_base;
+
+ /* Active packets. */
+ uint32_t old_ctl;
+ USBPacket usb_packet;
+ uint8_t usb_buf[8192];
+ uint32_t async_td;
+ bool async_complete;
+
+ void (*ohci_die)(struct OHCIState *ohci);
+} OHCIState;
+
+extern const VMStateDescription vmstate_ohci_state;
+
+#define OHCI_INTR_SO (1U << 0) /* Scheduling overrun */
+#define OHCI_INTR_WD (1U << 1) /* HcDoneHead writeback */
+#define OHCI_INTR_SF (1U << 2) /* Start of frame */
+#define OHCI_INTR_RD (1U << 3) /* Resume detect */
+#define OHCI_INTR_UE (1U << 4) /* Unrecoverable error */
+#define OHCI_INTR_FNO (1U << 5) /* Frame number overflow */
+#define OHCI_INTR_RHSC (1U << 6) /* Root hub status change */
+#define OHCI_INTR_OC (1U << 30) /* Ownership change */
+#define OHCI_INTR_MIE (1U << 31) /* Master Interrupt Enable */
+
+/* Update IRQ levels */
+static inline void ohci_intr_update(OHCIState *ohci)
+{
+ int level = 0;
+
+ if ((ohci->intr & OHCI_INTR_MIE) &&
+ (ohci->intr_status & ohci->intr))
+ level = 1;
+
+ qemu_set_irq(ohci->irq, level);
+}
+
+/* Set an interrupt */
+static inline void ohci_set_interrupt(OHCIState *ohci, uint32_t intr)
+{
+ ohci->intr_status |= intr;
+ ohci_intr_update(ohci);
+}
+
+void usb_ohci_init(OHCIState *ohci, DeviceState *dev, uint32_t num_ports,
+ dma_addr_t localmem_base, char *masterbus,
+ uint32_t firstport, AddressSpace *as,
+ void (*ohci_die_func)(OHCIState *ohci), Error **errp);
+void ohci_hard_reset(OHCIState *ohci);
+void ohci_bus_stop(OHCIState *ohci);
+void ohci_stop_endpoints(OHCIState *ohci);
+
+#endif
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 04/29] hw/arm: Express dependencies of the exynos machines with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 | 17 ++++++-----------
hw/arm/Kconfig | 10 ++++++++++
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 613d19a06d..2a11e76cc7 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -1,8 +1,14 @@
# Default configuration for arm-softmmu
+# TODO: ARM_V7M is currently always required - make this more flexible!
+CONFIG_ARM_V7M=y
+
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
CONFIG_PCI_TESTDEV=y
+
+CONFIG_EXYNOS4=y
+
CONFIG_VGA=y
CONFIG_NAND=y
CONFIG_ECC=y
@@ -26,7 +32,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
@@ -36,21 +41,15 @@ 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
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
@@ -61,11 +60,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
@@ -73,7 +70,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
@@ -123,7 +119,6 @@ CONFIG_VERSATILE_I2C=y
CONFIG_PCI_EXPRESS=y
CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
-CONFIG_SDHCI=y
CONFIG_INTEGRATOR=y
CONFIG_INTEGRATOR_DEBUG=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index d298fbdc89..acd07b2add 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -8,7 +8,13 @@ config DIGIC
config EXYNOS4
bool
+ select A9MPCORE
+ select I2C
+ select LAN9118
+ select PL310 # cache controller
select PTIMER
+ select SDHCI
+ select USB_EHCI_SYSBUS
config HIGHBANK
bool
@@ -104,6 +110,10 @@ config ZAURUS
config A9MPCORE
bool
+ select A9_GTIMER
+ select A9SCU # snoop control unit
+ select ARM_GIC
+ select ARM_MPTIMER
config A15MPCORE
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 04/29] hw/arm: Express dependencies of the exynos machines with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 | 17 ++++++-----------
hw/arm/Kconfig | 10 ++++++++++
2 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 613d19a06d..2a11e76cc7 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -1,8 +1,14 @@
# Default configuration for arm-softmmu
+# TODO: ARM_V7M is currently always required - make this more flexible!
+CONFIG_ARM_V7M=y
+
CONFIG_PCI=y
CONFIG_PCI_DEVICES=y
CONFIG_PCI_TESTDEV=y
+
+CONFIG_EXYNOS4=y
+
CONFIG_VGA=y
CONFIG_NAND=y
CONFIG_ECC=y
@@ -26,7 +32,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
@@ -36,21 +41,15 @@ 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
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
@@ -61,11 +60,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
@@ -73,7 +70,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
@@ -123,7 +119,6 @@ CONFIG_VERSATILE_I2C=y
CONFIG_PCI_EXPRESS=y
CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
-CONFIG_SDHCI=y
CONFIG_INTEGRATOR=y
CONFIG_INTEGRATOR_DEBUG=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index d298fbdc89..acd07b2add 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -8,7 +8,13 @@ config DIGIC
config EXYNOS4
bool
+ select A9MPCORE
+ select I2C
+ select LAN9118
+ select PL310 # cache controller
select PTIMER
+ select SDHCI
+ select USB_EHCI_SYSBUS
config HIGHBANK
bool
@@ -104,6 +110,10 @@ config ZAURUS
config A9MPCORE
bool
+ select A9_GTIMER
+ select A9SCU # snoop control unit
+ select ARM_GIC
+ select ARM_MPTIMER
config A15MPCORE
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 04/29] hw/arm: Express dependencies of the exynos machines with Kconfig
@ 2019-04-25 14:23 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 14:23 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 | 17 ++++++-----------
> hw/arm/Kconfig | 10 ++++++++++
> 2 files changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 613d19a06d..2a11e76cc7 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -1,8 +1,14 @@
> # Default configuration for arm-softmmu
>
> +# TODO: ARM_V7M is currently always required - make this more flexible!
> +CONFIG_ARM_V7M=y
> +
> CONFIG_PCI=y
> CONFIG_PCI_DEVICES=y
> CONFIG_PCI_TESTDEV=y
> +
> +CONFIG_EXYNOS4=y
> +
> CONFIG_VGA=y
> CONFIG_NAND=y
> CONFIG_ECC=y
> @@ -26,7 +32,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
> @@ -36,21 +41,15 @@ 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
>
> 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
> @@ -61,11 +60,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
> @@ -73,7 +70,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
> @@ -123,7 +119,6 @@ CONFIG_VERSATILE_I2C=y
> CONFIG_PCI_EXPRESS=y
> CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
>
> -CONFIG_SDHCI=y
> CONFIG_INTEGRATOR=y
> CONFIG_INTEGRATOR_DEBUG=y
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index d298fbdc89..acd07b2add 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -8,7 +8,13 @@ config DIGIC
>
> config EXYNOS4
> bool
> + select A9MPCORE
> + select I2C
> + select LAN9118
> + select PL310 # cache controller
> select PTIMER
> + select SDHCI
> + select USB_EHCI_SYSBUS
Same comment here, you disable selectors that are required by other
machines (That would fail to build if disable EXYNOS4).
Since you add them to each machine later,
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> config HIGHBANK
> bool
> @@ -104,6 +110,10 @@ config ZAURUS
>
> config A9MPCORE
> bool
> + select A9_GTIMER
> + select A9SCU # snoop control unit
> + select ARM_GIC
> + select ARM_MPTIMER
>
> config A15MPCORE
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 04/29] hw/arm: Express dependencies of the exynos machines with Kconfig
@ 2019-04-25 14:23 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 14:23 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 | 17 ++++++-----------
> hw/arm/Kconfig | 10 ++++++++++
> 2 files changed, 16 insertions(+), 11 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 613d19a06d..2a11e76cc7 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -1,8 +1,14 @@
> # Default configuration for arm-softmmu
>
> +# TODO: ARM_V7M is currently always required - make this more flexible!
> +CONFIG_ARM_V7M=y
> +
> CONFIG_PCI=y
> CONFIG_PCI_DEVICES=y
> CONFIG_PCI_TESTDEV=y
> +
> +CONFIG_EXYNOS4=y
> +
> CONFIG_VGA=y
> CONFIG_NAND=y
> CONFIG_ECC=y
> @@ -26,7 +32,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
> @@ -36,21 +41,15 @@ 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
>
> 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
> @@ -61,11 +60,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
> @@ -73,7 +70,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
> @@ -123,7 +119,6 @@ CONFIG_VERSATILE_I2C=y
> CONFIG_PCI_EXPRESS=y
> CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
>
> -CONFIG_SDHCI=y
> CONFIG_INTEGRATOR=y
> CONFIG_INTEGRATOR_DEBUG=y
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index d298fbdc89..acd07b2add 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -8,7 +8,13 @@ config DIGIC
>
> config EXYNOS4
> bool
> + select A9MPCORE
> + select I2C
> + select LAN9118
> + select PL310 # cache controller
> select PTIMER
> + select SDHCI
> + select USB_EHCI_SYSBUS
Same comment here, you disable selectors that are required by other
machines (That would fail to build if disable EXYNOS4).
Since you add them to each machine later,
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> config HIGHBANK
> bool
> @@ -104,6 +110,10 @@ config ZAURUS
>
> config A9MPCORE
> bool
> + select A9_GTIMER
> + select A9SCU # snoop control unit
> + select ARM_GIC
> + select ARM_MPTIMER
>
> config A15MPCORE
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 05/29] hw/arm: Express dependencies of the highbank machines with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 | 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
+ select PL011 # UART
+ select PL022 # Serial port
+ select PL031 # RTC
+ select PL061 # GPIO
+ select PL310 # cache controller
+ select XGMAC # ethernet
config INTEGRATOR
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 05/29] hw/arm: Express dependencies of the highbank machines with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 | 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
+ select PL011 # UART
+ select PL022 # Serial port
+ select PL031 # RTC
+ select PL061 # GPIO
+ select PL310 # cache controller
+ select XGMAC # ethernet
config INTEGRATOR
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 05/29] hw/arm: Express dependencies of the highbank machines with Kconfig
@ 2019-04-25 14:25 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 14:25 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 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).
>
> 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
> + select PL011 # UART
> + select PL022 # Serial port
> + select PL031 # RTC
> + select PL061 # GPIO
> + select PL310 # cache controller
> + select XGMAC # ethernet
Similarly to my comment on patch 6 of this series:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> config INTEGRATOR
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 05/29] hw/arm: Express dependencies of the highbank machines with Kconfig
@ 2019-04-25 14:25 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 14:25 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 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).
>
> 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
> + select PL011 # UART
> + select PL022 # Serial port
> + select PL031 # RTC
> + select PL061 # GPIO
> + select PL310 # cache controller
> + select XGMAC # ethernet
Similarly to my comment on patch 6 of this series:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> config INTEGRATOR
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 06/29] hw/arm: Express dependencies of integratorcp with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 | 8 +-------
hw/arm/Kconfig | 8 ++++++++
hw/display/Kconfig | 1 +
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 50a4be3cad..6195b75f48 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -9,6 +9,7 @@ CONFIG_PCI_TESTDEV=y
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
+CONFIG_INTEGRATOR=y
CONFIG_VGA=y
CONFIG_NAND=y
@@ -33,7 +34,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
@@ -50,10 +50,7 @@ CONFIG_ARM11MPCORE=y
CONFIG_NETDUINO2=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
@@ -113,9 +110,6 @@ CONFIG_VERSATILE_I2C=y
CONFIG_PCI_EXPRESS=y
CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
-CONFIG_INTEGRATOR=y
-CONFIG_INTEGRATOR_DEBUG=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 0ba377ac18..ad3b1f9b40 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -32,6 +32,14 @@ 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 SMC91C111
config MAINSTONE
bool
diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index 72be57a403..a11815c9af 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -21,6 +21,7 @@ config JAZZ_LED
config PL110
bool
+ select FRAMEBUFFER
config SII9022
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 06/29] hw/arm: Express dependencies of integratorcp with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 | 8 +-------
hw/arm/Kconfig | 8 ++++++++
hw/display/Kconfig | 1 +
3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 50a4be3cad..6195b75f48 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -9,6 +9,7 @@ CONFIG_PCI_TESTDEV=y
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
+CONFIG_INTEGRATOR=y
CONFIG_VGA=y
CONFIG_NAND=y
@@ -33,7 +34,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
@@ -50,10 +50,7 @@ CONFIG_ARM11MPCORE=y
CONFIG_NETDUINO2=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
@@ -113,9 +110,6 @@ CONFIG_VERSATILE_I2C=y
CONFIG_PCI_EXPRESS=y
CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
-CONFIG_INTEGRATOR=y
-CONFIG_INTEGRATOR_DEBUG=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 0ba377ac18..ad3b1f9b40 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -32,6 +32,14 @@ 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 SMC91C111
config MAINSTONE
bool
diff --git a/hw/display/Kconfig b/hw/display/Kconfig
index 72be57a403..a11815c9af 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -21,6 +21,7 @@ config JAZZ_LED
config PL110
bool
+ select FRAMEBUFFER
config SII9022
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 06/29] hw/arm: Express dependencies of integratorcp with Kconfig
@ 2019-04-25 14:14 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 14:14 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Hi Thomas,
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 | 8 +-------
> hw/arm/Kconfig | 8 ++++++++
> hw/display/Kconfig | 1 +
> 3 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 50a4be3cad..6195b75f48 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -9,6 +9,7 @@ CONFIG_PCI_TESTDEV=y
>
> CONFIG_EXYNOS4=y
> CONFIG_HIGHBANK=y
> +CONFIG_INTEGRATOR=y
>
> CONFIG_VGA=y
> CONFIG_NAND=y
> @@ -33,7 +34,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
> @@ -50,10 +50,7 @@ CONFIG_ARM11MPCORE=y
> CONFIG_NETDUINO2=y
>
> CONFIG_PL041=y
> -CONFIG_PL050=y
You remove this device but it is used by the realview/versatile/vexpress
(you add it to these machines later in patch 11).
> CONFIG_PL080=y
> -CONFIG_PL110=y
Ditto,
> -CONFIG_PL181=y
Ditto.
> CONFIG_PL190=y
> CONFIG_PL330=y
> CONFIG_CADENCE=y
> @@ -113,9 +110,6 @@ CONFIG_VERSATILE_I2C=y
> CONFIG_PCI_EXPRESS=y
> CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
>
> -CONFIG_INTEGRATOR=y
> -CONFIG_INTEGRATOR_DEBUG=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 0ba377ac18..ad3b1f9b40 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -32,6 +32,14 @@ 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 SMC91C111
>
> config MAINSTONE
> bool
> diff --git a/hw/display/Kconfig b/hw/display/Kconfig
> index 72be57a403..a11815c9af 100644
> --- a/hw/display/Kconfig
> +++ b/hw/display/Kconfig
> @@ -21,6 +21,7 @@ config JAZZ_LED
>
> config PL110
> bool
> + select FRAMEBUFFER
>
> config SII9022
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 06/29] hw/arm: Express dependencies of integratorcp with Kconfig
@ 2019-04-25 14:14 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 14:14 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
Hi Thomas,
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 | 8 +-------
> hw/arm/Kconfig | 8 ++++++++
> hw/display/Kconfig | 1 +
> 3 files changed, 10 insertions(+), 7 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 50a4be3cad..6195b75f48 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -9,6 +9,7 @@ CONFIG_PCI_TESTDEV=y
>
> CONFIG_EXYNOS4=y
> CONFIG_HIGHBANK=y
> +CONFIG_INTEGRATOR=y
>
> CONFIG_VGA=y
> CONFIG_NAND=y
> @@ -33,7 +34,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
> @@ -50,10 +50,7 @@ CONFIG_ARM11MPCORE=y
> CONFIG_NETDUINO2=y
>
> CONFIG_PL041=y
> -CONFIG_PL050=y
You remove this device but it is used by the realview/versatile/vexpress
(you add it to these machines later in patch 11).
> CONFIG_PL080=y
> -CONFIG_PL110=y
Ditto,
> -CONFIG_PL181=y
Ditto.
> CONFIG_PL190=y
> CONFIG_PL330=y
> CONFIG_CADENCE=y
> @@ -113,9 +110,6 @@ CONFIG_VERSATILE_I2C=y
> CONFIG_PCI_EXPRESS=y
> CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
>
> -CONFIG_INTEGRATOR=y
> -CONFIG_INTEGRATOR_DEBUG=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 0ba377ac18..ad3b1f9b40 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -32,6 +32,14 @@ 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 SMC91C111
>
> config MAINSTONE
> bool
> diff --git a/hw/display/Kconfig b/hw/display/Kconfig
> index 72be57a403..a11815c9af 100644
> --- a/hw/display/Kconfig
> +++ b/hw/display/Kconfig
> @@ -21,6 +21,7 @@ config JAZZ_LED
>
> config PL110
> bool
> + select FRAMEBUFFER
>
> config SII9022
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 06/29] hw/arm: Express dependencies of integratorcp with Kconfig
@ 2019-04-25 14:22 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 14:22 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/25/19 4:14 PM, Philippe Mathieu-Daudé wrote:
> Hi Thomas,
>
> On 4/18/19 8:00 PM, Thomas Huth wrote:
>> 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 | 8 +-------
>> hw/arm/Kconfig | 8 ++++++++
>> hw/display/Kconfig | 1 +
>> 3 files changed, 10 insertions(+), 7 deletions(-)
>>
>> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
>> index 50a4be3cad..6195b75f48 100644
>> --- a/default-configs/arm-softmmu.mak
>> +++ b/default-configs/arm-softmmu.mak
>> @@ -9,6 +9,7 @@ CONFIG_PCI_TESTDEV=y
>>
>> CONFIG_EXYNOS4=y
>> CONFIG_HIGHBANK=y
>> +CONFIG_INTEGRATOR=y
>>
>> CONFIG_VGA=y
>> CONFIG_NAND=y
>> @@ -33,7 +34,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
>> @@ -50,10 +50,7 @@ CONFIG_ARM11MPCORE=y
>> CONFIG_NETDUINO2=y
>>
>> CONFIG_PL041=y
>> -CONFIG_PL050=y
>
> You remove this device but it is used by the realview/versatile/vexpress
> (you add it to these machines later in patch 11).
My worry is the unlikely event of someone checking out a new branch
after this patch and before patch 11, and disable CONFIG_INTEGRATOR,
then these 3 machines would fail to build.
Since it is very unlikely:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
>> CONFIG_PL080=y
>> -CONFIG_PL110=y
>
> Ditto,
>
>> -CONFIG_PL181=y
>
> Ditto.
>
>> CONFIG_PL190=y
>> CONFIG_PL330=y
>> CONFIG_CADENCE=y
>> @@ -113,9 +110,6 @@ CONFIG_VERSATILE_I2C=y
>> CONFIG_PCI_EXPRESS=y
>> CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
>>
>> -CONFIG_INTEGRATOR=y
>> -CONFIG_INTEGRATOR_DEBUG=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 0ba377ac18..ad3b1f9b40 100644
>> --- a/hw/arm/Kconfig
>> +++ b/hw/arm/Kconfig
>> @@ -32,6 +32,14 @@ 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 SMC91C111
>>
>> config MAINSTONE
>> bool
>> diff --git a/hw/display/Kconfig b/hw/display/Kconfig
>> index 72be57a403..a11815c9af 100644
>> --- a/hw/display/Kconfig
>> +++ b/hw/display/Kconfig
>> @@ -21,6 +21,7 @@ config JAZZ_LED
>>
>> config PL110
>> bool
>> + select FRAMEBUFFER
>>
>> config SII9022
>> bool
>>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 06/29] hw/arm: Express dependencies of integratorcp with Kconfig
@ 2019-04-25 14:22 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 14:22 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/25/19 4:14 PM, Philippe Mathieu-Daudé wrote:
> Hi Thomas,
>
> On 4/18/19 8:00 PM, Thomas Huth wrote:
>> 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 | 8 +-------
>> hw/arm/Kconfig | 8 ++++++++
>> hw/display/Kconfig | 1 +
>> 3 files changed, 10 insertions(+), 7 deletions(-)
>>
>> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
>> index 50a4be3cad..6195b75f48 100644
>> --- a/default-configs/arm-softmmu.mak
>> +++ b/default-configs/arm-softmmu.mak
>> @@ -9,6 +9,7 @@ CONFIG_PCI_TESTDEV=y
>>
>> CONFIG_EXYNOS4=y
>> CONFIG_HIGHBANK=y
>> +CONFIG_INTEGRATOR=y
>>
>> CONFIG_VGA=y
>> CONFIG_NAND=y
>> @@ -33,7 +34,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
>> @@ -50,10 +50,7 @@ CONFIG_ARM11MPCORE=y
>> CONFIG_NETDUINO2=y
>>
>> CONFIG_PL041=y
>> -CONFIG_PL050=y
>
> You remove this device but it is used by the realview/versatile/vexpress
> (you add it to these machines later in patch 11).
My worry is the unlikely event of someone checking out a new branch
after this patch and before patch 11, and disable CONFIG_INTEGRATOR,
then these 3 machines would fail to build.
Since it is very unlikely:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
>> CONFIG_PL080=y
>> -CONFIG_PL110=y
>
> Ditto,
>
>> -CONFIG_PL181=y
>
> Ditto.
>
>> CONFIG_PL190=y
>> CONFIG_PL330=y
>> CONFIG_CADENCE=y
>> @@ -113,9 +110,6 @@ CONFIG_VERSATILE_I2C=y
>> CONFIG_PCI_EXPRESS=y
>> CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
>>
>> -CONFIG_INTEGRATOR=y
>> -CONFIG_INTEGRATOR_DEBUG=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 0ba377ac18..ad3b1f9b40 100644
>> --- a/hw/arm/Kconfig
>> +++ b/hw/arm/Kconfig
>> @@ -32,6 +32,14 @@ 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 SMC91C111
>>
>> config MAINSTONE
>> bool
>> diff --git a/hw/display/Kconfig b/hw/display/Kconfig
>> index 72be57a403..a11815c9af 100644
>> --- a/hw/display/Kconfig
>> +++ b/hw/display/Kconfig
>> @@ -21,6 +21,7 @@ config JAZZ_LED
>>
>> config PL110
>> bool
>> + select FRAMEBUFFER
>>
>> config SII9022
>> bool
>>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 06/29] hw/arm: Express dependencies of integratorcp with Kconfig
@ 2019-04-25 14:29 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-25 14:29 UTC (permalink / raw)
To: Philippe Mathieu-Daudé,
yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 25/04/2019 16.22, Philippe Mathieu-Daudé wrote:
> On 4/25/19 4:14 PM, Philippe Mathieu-Daudé wrote:
>> Hi Thomas,
>>
>> On 4/18/19 8:00 PM, Thomas Huth wrote:
>>> 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 | 8 +-------
>>> hw/arm/Kconfig | 8 ++++++++
>>> hw/display/Kconfig | 1 +
>>> 3 files changed, 10 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
>>> index 50a4be3cad..6195b75f48 100644
>>> --- a/default-configs/arm-softmmu.mak
>>> +++ b/default-configs/arm-softmmu.mak
>>> @@ -9,6 +9,7 @@ CONFIG_PCI_TESTDEV=y
>>>
>>> CONFIG_EXYNOS4=y
>>> CONFIG_HIGHBANK=y
>>> +CONFIG_INTEGRATOR=y
>>>
>>> CONFIG_VGA=y
>>> CONFIG_NAND=y
>>> @@ -33,7 +34,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
>>> @@ -50,10 +50,7 @@ CONFIG_ARM11MPCORE=y
>>> CONFIG_NETDUINO2=y
>>>
>>> CONFIG_PL041=y
>>> -CONFIG_PL050=y
>>
>> You remove this device but it is used by the realview/versatile/vexpress
>> (you add it to these machines later in patch 11).
>
> My worry is the unlikely event of someone checking out a new branch
> after this patch and before patch 11, and disable CONFIG_INTEGRATOR,
> then these 3 machines would fail to build.
Yeah, the basic idea in this series is that you can not easily do
partial qemu-system-arm builds anyway as long as not all boards are
converted. So I think this should be ok.
> Since it is very unlikely:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Thanks!
Thomas
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 06/29] hw/arm: Express dependencies of integratorcp with Kconfig
@ 2019-04-25 14:29 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-25 14:29 UTC (permalink / raw)
To: Philippe Mathieu-Daudé,
yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 25/04/2019 16.22, Philippe Mathieu-Daudé wrote:
> On 4/25/19 4:14 PM, Philippe Mathieu-Daudé wrote:
>> Hi Thomas,
>>
>> On 4/18/19 8:00 PM, Thomas Huth wrote:
>>> 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 | 8 +-------
>>> hw/arm/Kconfig | 8 ++++++++
>>> hw/display/Kconfig | 1 +
>>> 3 files changed, 10 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
>>> index 50a4be3cad..6195b75f48 100644
>>> --- a/default-configs/arm-softmmu.mak
>>> +++ b/default-configs/arm-softmmu.mak
>>> @@ -9,6 +9,7 @@ CONFIG_PCI_TESTDEV=y
>>>
>>> CONFIG_EXYNOS4=y
>>> CONFIG_HIGHBANK=y
>>> +CONFIG_INTEGRATOR=y
>>>
>>> CONFIG_VGA=y
>>> CONFIG_NAND=y
>>> @@ -33,7 +34,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
>>> @@ -50,10 +50,7 @@ CONFIG_ARM11MPCORE=y
>>> CONFIG_NETDUINO2=y
>>>
>>> CONFIG_PL041=y
>>> -CONFIG_PL050=y
>>
>> You remove this device but it is used by the realview/versatile/vexpress
>> (you add it to these machines later in patch 11).
>
> My worry is the unlikely event of someone checking out a new branch
> after this patch and before patch 11, and disable CONFIG_INTEGRATOR,
> then these 3 machines would fail to build.
Yeah, the basic idea in this series is that you can not easily do
partial qemu-system-arm builds anyway as long as not all boards are
converted. So I think this should be ok.
> Since it is very unlikely:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Thanks!
Thomas
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 07/29] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 | 4 ++++
hw/misc/Kconfig | 2 ++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 6195b75f48..7f94811ccb 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -10,6 +10,7 @@ CONFIG_PCI_TESTDEV=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_MUSCA=y
@@ -115,7 +115,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 ad3b1f9b40..9087b7d714 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -98,6 +98,10 @@ config FSL_IMX25
config FSL_IMX31
bool
+ select SERIAL
+ select IMX
+ select IMX_I2C
+ select LAN9118
config FSL_IMX6
bool
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 5f67d0d6d9..385e1b0cec 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 07/29] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 | 4 ++++
hw/misc/Kconfig | 2 ++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 6195b75f48..7f94811ccb 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -10,6 +10,7 @@ CONFIG_PCI_TESTDEV=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_MUSCA=y
@@ -115,7 +115,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 ad3b1f9b40..9087b7d714 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -98,6 +98,10 @@ config FSL_IMX25
config FSL_IMX31
bool
+ select SERIAL
+ select IMX
+ select IMX_I2C
+ select LAN9118
config FSL_IMX6
bool
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 5f67d0d6d9..385e1b0cec 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 07/29] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig
@ 2019-04-19 3:58 ` Chubb, Peter (Data61, Kensington NSW)
0 siblings, 0 replies; 148+ messages in thread
From: Chubb, Peter (Data61, Kensington NSW) @ 2019-04-19 3:58 UTC (permalink / raw)
To: Thomas Huth
Cc: yang.zhong, Peter Maydell, qemu-devel, pbonzini,
Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
>>>>> "Thomas" == Thomas Huth <thuth@redhat.com> writes:
Thomas> Add Kconfig dependencies for the fsl-imx31 / kzm machine.
Thomas> This patch is slightly based on earlier work by Ákos Kovács
Thomas> (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Thomas> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Peter Chubb <peter.chubb@data61.csiro.au>
--
Dr Peter Chubb Tel: +61 2 9490 5852 http://ts.data61.csiro.au/
Trustworthy Systems Group Data61, CSIRO (formerly NICTA)
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 07/29] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig
@ 2019-04-19 3:58 ` Chubb, Peter (Data61, Kensington NSW)
0 siblings, 0 replies; 148+ messages in thread
From: Chubb, Peter (Data61, Kensington NSW) @ 2019-04-19 3:58 UTC (permalink / raw)
To: Thomas Huth
Cc: Peter Maydell, Michael S. Tsirkin, qemu-devel, Gerd Hoffmann,
Edgar E . Iglesias, Subbaraya Sundeep, yang.zhong, Rob Herring,
qemu-block, Andrey Smirnov, Peter Chubb, Joel Stanley,
Antony Pavlov, Alistair Francis, Beniamino Galvani, qemu-arm,
Jan Kiszka, Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Jean-Christophe Dubois, Igor Mitsyanko,
pbonzini
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="UTF-8", Size: 531 bytes --]
>>>>> "Thomas" == Thomas Huth <thuth@redhat.com> writes:
Thomas> Add Kconfig dependencies for the fsl-imx31 / kzm machine.
Thomas> This patch is slightly based on earlier work by Ákos Kovács
Thomas> (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Thomas> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Peter Chubb <peter.chubb@data61.csiro.au>
--
Dr Peter Chubb Tel: +61 2 9490 5852 http://ts.data61.csiro.au/
Trustworthy Systems Group Data61, CSIRO (formerly NICTA)
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 07/29] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig
@ 2019-04-25 14:27 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 14:27 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 | 4 ++++
> hw/misc/Kconfig | 2 ++
> 3 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 6195b75f48..7f94811ccb 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -10,6 +10,7 @@ CONFIG_PCI_TESTDEV=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_MUSCA=y
> @@ -115,7 +115,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 ad3b1f9b40..9087b7d714 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -98,6 +98,10 @@ config FSL_IMX25
>
> config FSL_IMX31
> bool
> + select SERIAL
> + select IMX
> + select IMX_I2C
> + select LAN9118
Similarly to my comment on patch 6 of this series:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> config FSL_IMX6
> bool
> diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
> index 5f67d0d6d9..385e1b0cec 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 07/29] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig
@ 2019-04-25 14:27 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 14:27 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 | 4 ++++
> hw/misc/Kconfig | 2 ++
> 3 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 6195b75f48..7f94811ccb 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -10,6 +10,7 @@ CONFIG_PCI_TESTDEV=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_MUSCA=y
> @@ -115,7 +115,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 ad3b1f9b40..9087b7d714 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -98,6 +98,10 @@ config FSL_IMX25
>
> config FSL_IMX31
> bool
> + select SERIAL
> + select IMX
> + select IMX_I2C
> + select LAN9118
Similarly to my comment on patch 6 of this series:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> config FSL_IMX6
> bool
> diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
> index 5f67d0d6d9..385e1b0cec 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 08/29] hw/arm: Express dependencies of musicpal with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 | 5 +++++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 7f94811ccb..0a4d293f8a 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -11,13 +11,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
@@ -40,7 +40,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
@@ -137,7 +134,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 9087b7d714..b9f3c3c232 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -46,7 +46,12 @@ config MAINSTONE
config MUSICPAL
bool
+ select BITBANG_I2C
+ select MARVELL_88W8618
select PTIMER
+ select PFLASH_CFI02
+ select SERIAL
+ select WM8750
config NETDUINO2
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 08/29] hw/arm: Express dependencies of musicpal with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 | 5 +++++
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 7f94811ccb..0a4d293f8a 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -11,13 +11,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
@@ -40,7 +40,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
@@ -137,7 +134,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 9087b7d714..b9f3c3c232 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -46,7 +46,12 @@ config MAINSTONE
config MUSICPAL
bool
+ select BITBANG_I2C
+ select MARVELL_88W8618
select PTIMER
+ select PFLASH_CFI02
+ select SERIAL
+ select WM8750
config NETDUINO2
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 08/29] hw/arm: Express dependencies of musicpal with Kconfig
@ 2019-04-25 16:05 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:05 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 6 +-----
> hw/arm/Kconfig | 5 +++++
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 7f94811ccb..0a4d293f8a 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -11,13 +11,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
> @@ -40,7 +40,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
> @@ -137,7 +134,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 9087b7d714..b9f3c3c232 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -46,7 +46,12 @@ config MAINSTONE
>
> config MUSICPAL
> bool
> + select BITBANG_I2C
> + select MARVELL_88W8618
> select PTIMER
> + select PFLASH_CFI02
> + select SERIAL
> + select WM8750
>
> config NETDUINO2
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 08/29] hw/arm: Express dependencies of musicpal with Kconfig
@ 2019-04-25 16:05 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:05 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 6 +-----
> hw/arm/Kconfig | 5 +++++
> 2 files changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 7f94811ccb..0a4d293f8a 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -11,13 +11,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
> @@ -40,7 +40,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
> @@ -137,7 +134,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 9087b7d714..b9f3c3c232 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -46,7 +46,12 @@ config MAINSTONE
>
> config MUSICPAL
> bool
> + select BITBANG_I2C
> + select MARVELL_88W8618
> select PTIMER
> + select PFLASH_CFI02
> + select SERIAL
> + select WM8750
>
> config NETDUINO2
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 09/29] hw/arm: Express dependencies of the OMAP machines with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 | 17 ++++-------------
hw/arm/Kconfig | 25 +++++++++++++++++++++++++
hw/arm/Makefile.objs | 3 ++-
3 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 0a4d293f8a..b7ed3c530b 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -12,16 +12,16 @@ CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
CONFIG_FSL_IMX31=y
CONFIG_MUSICPAL=y
+CONFIG_MUSCA=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
@@ -39,9 +39,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,15 +59,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_MUSCA=y
-CONFIG_NSERIES=y
CONFIG_RASPI=y
CONFIG_REALVIEW=y
CONFIG_ZAURUS=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index b9f3c3c232..71126254ff 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -2,6 +2,11 @@ config ARM_VIRT
bool
imply VFIO_PLATFORM
+config CHEETAH
+ bool
+ select OMAP
+ select TSC210X
+
config DIGIC
bool
select PTIMER
@@ -58,9 +63,25 @@ 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 SD
+ select SERIAL
config PXA2XX
bool
@@ -74,6 +95,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 fa57c7c770..8302b8df1d 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 09/29] hw/arm: Express dependencies of the OMAP machines with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 | 17 ++++-------------
hw/arm/Kconfig | 25 +++++++++++++++++++++++++
hw/arm/Makefile.objs | 3 ++-
3 files changed, 31 insertions(+), 14 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 0a4d293f8a..b7ed3c530b 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -12,16 +12,16 @@ CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
CONFIG_FSL_IMX31=y
CONFIG_MUSICPAL=y
+CONFIG_MUSCA=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
@@ -39,9 +39,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,15 +59,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_MUSCA=y
-CONFIG_NSERIES=y
CONFIG_RASPI=y
CONFIG_REALVIEW=y
CONFIG_ZAURUS=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index b9f3c3c232..71126254ff 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -2,6 +2,11 @@ config ARM_VIRT
bool
imply VFIO_PLATFORM
+config CHEETAH
+ bool
+ select OMAP
+ select TSC210X
+
config DIGIC
bool
select PTIMER
@@ -58,9 +63,25 @@ 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 SD
+ select SERIAL
config PXA2XX
bool
@@ -74,6 +95,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 fa57c7c770..8302b8df1d 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 09/29] hw/arm: Express dependencies of the OMAP machines with Kconfig
@ 2019-04-25 22:41 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 22:41 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 | 17 ++++-------------
> hw/arm/Kconfig | 25 +++++++++++++++++++++++++
> hw/arm/Makefile.objs | 3 ++-
> 3 files changed, 31 insertions(+), 14 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 0a4d293f8a..b7ed3c530b 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -12,16 +12,16 @@ CONFIG_HIGHBANK=y
> CONFIG_INTEGRATOR=y
> CONFIG_FSL_IMX31=y
> CONFIG_MUSICPAL=y
> +CONFIG_MUSCA=y
> +CONFIG_CHEETAH=y
I can't find a working Cheetah option rom, but could test some asm.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> +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
> @@ -39,9 +39,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,15 +59,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_MUSCA=y
> -CONFIG_NSERIES=y
> CONFIG_RASPI=y
> CONFIG_REALVIEW=y
> CONFIG_ZAURUS=y
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index b9f3c3c232..71126254ff 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -2,6 +2,11 @@ config ARM_VIRT
> bool
> imply VFIO_PLATFORM
>
> +config CHEETAH
> + bool
> + select OMAP
> + select TSC210X
> +
> config DIGIC
> bool
> select PTIMER
> @@ -58,9 +63,25 @@ 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 SD
> + select SERIAL
>
> config PXA2XX
> bool
> @@ -74,6 +95,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 fa57c7c770..8302b8df1d 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 09/29] hw/arm: Express dependencies of the OMAP machines with Kconfig
@ 2019-04-25 22:41 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 22:41 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 | 17 ++++-------------
> hw/arm/Kconfig | 25 +++++++++++++++++++++++++
> hw/arm/Makefile.objs | 3 ++-
> 3 files changed, 31 insertions(+), 14 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 0a4d293f8a..b7ed3c530b 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -12,16 +12,16 @@ CONFIG_HIGHBANK=y
> CONFIG_INTEGRATOR=y
> CONFIG_FSL_IMX31=y
> CONFIG_MUSICPAL=y
> +CONFIG_MUSCA=y
> +CONFIG_CHEETAH=y
I can't find a working Cheetah option rom, but could test some asm.
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> +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
> @@ -39,9 +39,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,15 +59,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_MUSCA=y
> -CONFIG_NSERIES=y
> CONFIG_RASPI=y
> CONFIG_REALVIEW=y
> CONFIG_ZAURUS=y
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index b9f3c3c232..71126254ff 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -2,6 +2,11 @@ config ARM_VIRT
> bool
> imply VFIO_PLATFORM
>
> +config CHEETAH
> + bool
> + select OMAP
> + select TSC210X
> +
> config DIGIC
> bool
> select PTIMER
> @@ -58,9 +63,25 @@ 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 SD
> + select SERIAL
>
> config PXA2XX
> bool
> @@ -74,6 +95,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 fa57c7c770..8302b8df1d 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 b7ed3c530b..3f82d635e4 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -16,6 +16,7 @@ CONFIG_MUSCA=y
CONFIG_CHEETAH=y
CONFIG_SX1=y
CONFIG_NSERIES=y
+CONFIG_STELLARIS=y
CONFIG_VGA=y
CONFIG_NAND=y
@@ -24,16 +25,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 71126254ff..b91503f5a6 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -91,6 +91,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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 b7ed3c530b..3f82d635e4 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -16,6 +16,7 @@ CONFIG_MUSCA=y
CONFIG_CHEETAH=y
CONFIG_SX1=y
CONFIG_NSERIES=y
+CONFIG_STELLARIS=y
CONFIG_VGA=y
CONFIG_NAND=y
@@ -24,16 +25,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 71126254ff..b91503f5a6 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -91,6 +91,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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
@ 2019-04-25 21:41 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 21:41 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Hi Thomas,
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 b7ed3c530b..3f82d635e4 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -16,6 +16,7 @@ CONFIG_MUSCA=y
> CONFIG_CHEETAH=y
> CONFIG_SX1=y
> CONFIG_NSERIES=y
> +CONFIG_STELLARIS=y
>
> CONFIG_VGA=y
> CONFIG_NAND=y
> @@ -24,16 +25,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 71126254ff..b91503f5a6 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -91,6 +91,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
This one misses CMSDK_APB_WATCHDOG:
$ qemu-system-aarch64 -M lm3s811evb
qemu-system-aarch64: Unknown device 'luminary-watchdog' for default sysbus
Aborted (core dumped)
(gdb) bt
#1 0x00007fbee955d895 in abort () at /lib64/libc.so.6
#2 0x0000560905068f6a in qdev_create (bus=0x0, name=0x5609053b9e5a
"luminary-watchdog") at /source/qemu/hw/core/qdev.c:131
#3 0x0000560904ec1afc in stellaris_init (ms=0x560906d82c00,
board=0x5609056e79e0 <stellaris_boards>) at
/source/qemu/hw/arm/stellaris.c:1344
#4 0x0000560904ec22ff in lm3s811evb_init (machine=0x560906d82c00) at
/source/qemu/hw/arm/stellaris.c:1468
#5 0x000056090507326a in machine_run_board_init
(machine=0x560906d82c00) at /source/qemu/hw/core/machine.c:1030
It works with the following snippet:
-- >8 --
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
@@ -200,6 +200,7 @@ config STELLARIS
select SSI_SD
select STELLARIS_INPUT
select STELLARIS_ENET # ethernet
+ select CMSDK_APB_WATCHDOG # Luminary
---
>
> config STRONGARM
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
@ 2019-04-25 21:41 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 21:41 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
Hi Thomas,
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 b7ed3c530b..3f82d635e4 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -16,6 +16,7 @@ CONFIG_MUSCA=y
> CONFIG_CHEETAH=y
> CONFIG_SX1=y
> CONFIG_NSERIES=y
> +CONFIG_STELLARIS=y
>
> CONFIG_VGA=y
> CONFIG_NAND=y
> @@ -24,16 +25,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 71126254ff..b91503f5a6 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -91,6 +91,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
This one misses CMSDK_APB_WATCHDOG:
$ qemu-system-aarch64 -M lm3s811evb
qemu-system-aarch64: Unknown device 'luminary-watchdog' for default sysbus
Aborted (core dumped)
(gdb) bt
#1 0x00007fbee955d895 in abort () at /lib64/libc.so.6
#2 0x0000560905068f6a in qdev_create (bus=0x0, name=0x5609053b9e5a
"luminary-watchdog") at /source/qemu/hw/core/qdev.c:131
#3 0x0000560904ec1afc in stellaris_init (ms=0x560906d82c00,
board=0x5609056e79e0 <stellaris_boards>) at
/source/qemu/hw/arm/stellaris.c:1344
#4 0x0000560904ec22ff in lm3s811evb_init (machine=0x560906d82c00) at
/source/qemu/hw/arm/stellaris.c:1468
#5 0x000056090507326a in machine_run_board_init
(machine=0x560906d82c00) at /source/qemu/hw/core/machine.c:1030
It works with the following snippet:
-- >8 --
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
@@ -200,6 +200,7 @@ config STELLARIS
select SSI_SD
select STELLARIS_INPUT
select STELLARIS_ENET # ethernet
+ select CMSDK_APB_WATCHDOG # Luminary
---
>
> config STRONGARM
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
@ 2019-04-29 19:25 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-29 19:25 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 25/04/2019 23.41, Philippe Mathieu-Daudé wrote:
> Hi Thomas,
>
> On 4/18/19 8:00 PM, Thomas Huth wrote:
>> 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 b7ed3c530b..3f82d635e4 100644
>> --- a/default-configs/arm-softmmu.mak
>> +++ b/default-configs/arm-softmmu.mak
>> @@ -16,6 +16,7 @@ CONFIG_MUSCA=y
>> CONFIG_CHEETAH=y
>> CONFIG_SX1=y
>> CONFIG_NSERIES=y
>> +CONFIG_STELLARIS=y
>>
>> CONFIG_VGA=y
>> CONFIG_NAND=y
>> @@ -24,16 +25,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 71126254ff..b91503f5a6 100644
>> --- a/hw/arm/Kconfig
>> +++ b/hw/arm/Kconfig
>> @@ -91,6 +91,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
>
> This one misses CMSDK_APB_WATCHDOG:
>
> $ qemu-system-aarch64 -M lm3s811evb
> qemu-system-aarch64: Unknown device 'luminary-watchdog' for default sysbus
> Aborted (core dumped)
Oh, well, looks like this has just been added recently in commit
566528f823d1a2e9e, likely after I assembled and tested the initial
version of this patch...
Thanks for catching it, I'll apply your fix in v6!
Thomas
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
@ 2019-04-29 19:25 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-29 19:25 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 25/04/2019 23.41, Philippe Mathieu-Daudé wrote:
> Hi Thomas,
>
> On 4/18/19 8:00 PM, Thomas Huth wrote:
>> 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 b7ed3c530b..3f82d635e4 100644
>> --- a/default-configs/arm-softmmu.mak
>> +++ b/default-configs/arm-softmmu.mak
>> @@ -16,6 +16,7 @@ CONFIG_MUSCA=y
>> CONFIG_CHEETAH=y
>> CONFIG_SX1=y
>> CONFIG_NSERIES=y
>> +CONFIG_STELLARIS=y
>>
>> CONFIG_VGA=y
>> CONFIG_NAND=y
>> @@ -24,16 +25,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 71126254ff..b91503f5a6 100644
>> --- a/hw/arm/Kconfig
>> +++ b/hw/arm/Kconfig
>> @@ -91,6 +91,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
>
> This one misses CMSDK_APB_WATCHDOG:
>
> $ qemu-system-aarch64 -M lm3s811evb
> qemu-system-aarch64: Unknown device 'luminary-watchdog' for default sysbus
> Aborted (core dumped)
Oh, well, looks like this has just been added recently in commit
566528f823d1a2e9e, likely after I assembled and tested the initial
version of this patch...
Thanks for catching it, I'll apply your fix in v6!
Thomas
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
@ 2019-04-29 20:56 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-29 20:56 UTC (permalink / raw)
To: Thomas Huth, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/29/19 9:25 PM, Thomas Huth wrote:
> On 25/04/2019 23.41, Philippe Mathieu-Daudé wrote:
>> Hi Thomas,
>>
>> On 4/18/19 8:00 PM, Thomas Huth wrote:
>>> 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 b7ed3c530b..3f82d635e4 100644
>>> --- a/default-configs/arm-softmmu.mak
>>> +++ b/default-configs/arm-softmmu.mak
>>> @@ -16,6 +16,7 @@ CONFIG_MUSCA=y
>>> CONFIG_CHEETAH=y
>>> CONFIG_SX1=y
>>> CONFIG_NSERIES=y
>>> +CONFIG_STELLARIS=y
>>>
>>> CONFIG_VGA=y
>>> CONFIG_NAND=y
>>> @@ -24,16 +25,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 71126254ff..b91503f5a6 100644
>>> --- a/hw/arm/Kconfig
>>> +++ b/hw/arm/Kconfig
>>> @@ -91,6 +91,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
>>
>> This one misses CMSDK_APB_WATCHDOG:
>>
>> $ qemu-system-aarch64 -M lm3s811evb
>> qemu-system-aarch64: Unknown device 'luminary-watchdog' for default sysbus
>> Aborted (core dumped)
>
> Oh, well, looks like this has just been added recently in commit
> 566528f823d1a2e9e, likely after I assembled and tested the initial
> version of this patch...
Ah yes, correct! This happens when we take too long to review a series,
and since this one is huge, I was keeping procrastinating...
> Thanks for catching it, I'll apply your fix in v6!
>
> Thomas
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
@ 2019-04-29 20:56 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-29 20:56 UTC (permalink / raw)
To: Thomas Huth, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/29/19 9:25 PM, Thomas Huth wrote:
> On 25/04/2019 23.41, Philippe Mathieu-Daudé wrote:
>> Hi Thomas,
>>
>> On 4/18/19 8:00 PM, Thomas Huth wrote:
>>> 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 b7ed3c530b..3f82d635e4 100644
>>> --- a/default-configs/arm-softmmu.mak
>>> +++ b/default-configs/arm-softmmu.mak
>>> @@ -16,6 +16,7 @@ CONFIG_MUSCA=y
>>> CONFIG_CHEETAH=y
>>> CONFIG_SX1=y
>>> CONFIG_NSERIES=y
>>> +CONFIG_STELLARIS=y
>>>
>>> CONFIG_VGA=y
>>> CONFIG_NAND=y
>>> @@ -24,16 +25,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 71126254ff..b91503f5a6 100644
>>> --- a/hw/arm/Kconfig
>>> +++ b/hw/arm/Kconfig
>>> @@ -91,6 +91,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
>>
>> This one misses CMSDK_APB_WATCHDOG:
>>
>> $ qemu-system-aarch64 -M lm3s811evb
>> qemu-system-aarch64: Unknown device 'luminary-watchdog' for default sysbus
>> Aborted (core dumped)
>
> Oh, well, looks like this has just been added recently in commit
> 566528f823d1a2e9e, likely after I assembled and tested the initial
> version of this patch...
Ah yes, correct! This happens when we take too long to review a series,
and since this one is huge, I was keeping procrastinating...
> Thanks for catching it, I'll apply your fix in v6!
>
> Thomas
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 11/29] hw/arm: Express dependencies of realview, versatile and vexpress with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 | 24 ++++-------------
hw/arm/Kconfig | 48 +++++++++++++++++++++++++++++++++
hw/arm/Makefile.objs | 3 ++-
hw/display/Kconfig | 1 +
hw/i2c/Kconfig | 2 +-
5 files changed, 57 insertions(+), 21 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 3f82d635e4..df7d9421e0 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -3,9 +3,8 @@
# TODO: ARM_V7M is currently always required - make this more flexible!
CONFIG_ARM_V7M=y
-CONFIG_PCI=y
-CONFIG_PCI_DEVICES=y
-CONFIG_PCI_TESTDEV=y
+# CONFIG_PCI_DEVICES=n
+# CONFIG_TEST_DEVICES=n
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
@@ -17,6 +16,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
@@ -25,8 +27,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
@@ -38,13 +38,8 @@ CONFIG_MICRODRIVE=y
CONFIG_PLATFORM_BUS=y
CONFIG_VIRTIO_MMIO=y
-CONFIG_ARM11MPCORE=y
-
CONFIG_NETDUINO2=y
-CONFIG_PL041=y
-CONFIG_PL080=y
-CONFIG_PL190=y
CONFIG_PL330=y
CONFIG_CADENCE=y
CONFIG_PXA2XX=y
@@ -52,12 +47,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
@@ -86,10 +79,6 @@ CONFIG_IOTKIT_SYSINFO=y
CONFIG_ARMSSE_CPUID=y
CONFIG_ARMSSE_MHU=y
-CONFIG_VERSATILE=y
-CONFIG_VERSATILE_PCI=y
-CONFIG_VERSATILE_I2C=y
-
CONFIG_PCI_EXPRESS=y
CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
@@ -120,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 b91503f5a6..b786cfc5bd 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -88,6 +88,30 @@ config PXA2XX
config REALVIEW
bool
+ imply PCI_DEVICES
+ imply PCI_TESTDEV
+ 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
@@ -111,6 +135,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
@@ -183,6 +230,7 @@ config A15MPCORE
config ARM11MPCORE
bool
+ select ARM11SCU
config ARMSSE
bool
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 8302b8df1d..bd0b45a799 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 a11815c9af..0577e68c8e 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 820b24de5b..aee961541c 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 11/29] hw/arm: Express dependencies of realview, versatile and vexpress with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 | 24 ++++-------------
hw/arm/Kconfig | 48 +++++++++++++++++++++++++++++++++
hw/arm/Makefile.objs | 3 ++-
hw/display/Kconfig | 1 +
hw/i2c/Kconfig | 2 +-
5 files changed, 57 insertions(+), 21 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 3f82d635e4..df7d9421e0 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -3,9 +3,8 @@
# TODO: ARM_V7M is currently always required - make this more flexible!
CONFIG_ARM_V7M=y
-CONFIG_PCI=y
-CONFIG_PCI_DEVICES=y
-CONFIG_PCI_TESTDEV=y
+# CONFIG_PCI_DEVICES=n
+# CONFIG_TEST_DEVICES=n
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
@@ -17,6 +16,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
@@ -25,8 +27,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
@@ -38,13 +38,8 @@ CONFIG_MICRODRIVE=y
CONFIG_PLATFORM_BUS=y
CONFIG_VIRTIO_MMIO=y
-CONFIG_ARM11MPCORE=y
-
CONFIG_NETDUINO2=y
-CONFIG_PL041=y
-CONFIG_PL080=y
-CONFIG_PL190=y
CONFIG_PL330=y
CONFIG_CADENCE=y
CONFIG_PXA2XX=y
@@ -52,12 +47,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
@@ -86,10 +79,6 @@ CONFIG_IOTKIT_SYSINFO=y
CONFIG_ARMSSE_CPUID=y
CONFIG_ARMSSE_MHU=y
-CONFIG_VERSATILE=y
-CONFIG_VERSATILE_PCI=y
-CONFIG_VERSATILE_I2C=y
-
CONFIG_PCI_EXPRESS=y
CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
@@ -120,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 b91503f5a6..b786cfc5bd 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -88,6 +88,30 @@ config PXA2XX
config REALVIEW
bool
+ imply PCI_DEVICES
+ imply PCI_TESTDEV
+ 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
@@ -111,6 +135,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
@@ -183,6 +230,7 @@ config A15MPCORE
config ARM11MPCORE
bool
+ select ARM11SCU
config ARMSSE
bool
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 8302b8df1d..bd0b45a799 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 a11815c9af..0577e68c8e 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 820b24de5b..aee961541c 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 11/29] hw/arm: Express dependencies of realview, versatile and vexpress with Kconfig
@ 2019-04-25 22:28 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 22:28 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Hi Thomas,
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 | 24 ++++-------------
> hw/arm/Kconfig | 48 +++++++++++++++++++++++++++++++++
> hw/arm/Makefile.objs | 3 ++-
> hw/display/Kconfig | 1 +
> hw/i2c/Kconfig | 2 +-
> 5 files changed, 57 insertions(+), 21 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 3f82d635e4..df7d9421e0 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -3,9 +3,8 @@
> # TODO: ARM_V7M is currently always required - make this more flexible!
> CONFIG_ARM_V7M=y
>
> -CONFIG_PCI=y
> -CONFIG_PCI_DEVICES=y
> -CONFIG_PCI_TESTDEV=y
> +# CONFIG_PCI_DEVICES=n
> +# CONFIG_TEST_DEVICES=n
>
> CONFIG_EXYNOS4=y
> CONFIG_HIGHBANK=y
> @@ -17,6 +16,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
> @@ -25,8 +27,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
> @@ -38,13 +38,8 @@ CONFIG_MICRODRIVE=y
> CONFIG_PLATFORM_BUS=y
> CONFIG_VIRTIO_MMIO=y
>
> -CONFIG_ARM11MPCORE=y
> -
> CONFIG_NETDUINO2=y
>
> -CONFIG_PL041=y
> -CONFIG_PL080=y
> -CONFIG_PL190=y
> CONFIG_PL330=y
> CONFIG_CADENCE=y
> CONFIG_PXA2XX=y
> @@ -52,12 +47,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
> @@ -86,10 +79,6 @@ CONFIG_IOTKIT_SYSINFO=y
> CONFIG_ARMSSE_CPUID=y
> CONFIG_ARMSSE_MHU=y
>
> -CONFIG_VERSATILE=y
> -CONFIG_VERSATILE_PCI=y
> -CONFIG_VERSATILE_I2C=y
> -
> CONFIG_PCI_EXPRESS=y
> CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
>
> @@ -120,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 b91503f5a6..b786cfc5bd 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -88,6 +88,30 @@ config PXA2XX
>
> config REALVIEW
> bool
> + imply PCI_DEVICES
> + imply PCI_TESTDEV
> + select SMC91C111
> + select LAN9118
> + select A9MPCORE
> + select A15MPCORE
> + select ARM11MPCORE
> + select ARM_TIMER
> + select VERSATILE_PCI
REALVIEW selects VERSATILE_PCI/I2C ...
> + 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
> @@ -111,6 +135,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
VERSATILE selects 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
Ditto.
I'd prefer to have a clearer boards/soc separation,
but this works, so we can improve this later:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> + select SII9022
> + select VIRTIO_MMIO
>
> config ZYNQ
> bool
> @@ -183,6 +230,7 @@ config A15MPCORE
>
> config ARM11MPCORE
> bool
> + select ARM11SCU
>
> config ARMSSE
> bool
> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> index 8302b8df1d..bd0b45a799 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 a11815c9af..0577e68c8e 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 820b24de5b..aee961541c 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 11/29] hw/arm: Express dependencies of realview, versatile and vexpress with Kconfig
@ 2019-04-25 22:28 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 22:28 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
Hi Thomas,
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 | 24 ++++-------------
> hw/arm/Kconfig | 48 +++++++++++++++++++++++++++++++++
> hw/arm/Makefile.objs | 3 ++-
> hw/display/Kconfig | 1 +
> hw/i2c/Kconfig | 2 +-
> 5 files changed, 57 insertions(+), 21 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 3f82d635e4..df7d9421e0 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -3,9 +3,8 @@
> # TODO: ARM_V7M is currently always required - make this more flexible!
> CONFIG_ARM_V7M=y
>
> -CONFIG_PCI=y
> -CONFIG_PCI_DEVICES=y
> -CONFIG_PCI_TESTDEV=y
> +# CONFIG_PCI_DEVICES=n
> +# CONFIG_TEST_DEVICES=n
>
> CONFIG_EXYNOS4=y
> CONFIG_HIGHBANK=y
> @@ -17,6 +16,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
> @@ -25,8 +27,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
> @@ -38,13 +38,8 @@ CONFIG_MICRODRIVE=y
> CONFIG_PLATFORM_BUS=y
> CONFIG_VIRTIO_MMIO=y
>
> -CONFIG_ARM11MPCORE=y
> -
> CONFIG_NETDUINO2=y
>
> -CONFIG_PL041=y
> -CONFIG_PL080=y
> -CONFIG_PL190=y
> CONFIG_PL330=y
> CONFIG_CADENCE=y
> CONFIG_PXA2XX=y
> @@ -52,12 +47,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
> @@ -86,10 +79,6 @@ CONFIG_IOTKIT_SYSINFO=y
> CONFIG_ARMSSE_CPUID=y
> CONFIG_ARMSSE_MHU=y
>
> -CONFIG_VERSATILE=y
> -CONFIG_VERSATILE_PCI=y
> -CONFIG_VERSATILE_I2C=y
> -
> CONFIG_PCI_EXPRESS=y
> CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
>
> @@ -120,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 b91503f5a6..b786cfc5bd 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -88,6 +88,30 @@ config PXA2XX
>
> config REALVIEW
> bool
> + imply PCI_DEVICES
> + imply PCI_TESTDEV
> + select SMC91C111
> + select LAN9118
> + select A9MPCORE
> + select A15MPCORE
> + select ARM11MPCORE
> + select ARM_TIMER
> + select VERSATILE_PCI
REALVIEW selects VERSATILE_PCI/I2C ...
> + 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
> @@ -111,6 +135,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
VERSATILE selects 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
Ditto.
I'd prefer to have a clearer boards/soc separation,
but this works, so we can improve this later:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> + select SII9022
> + select VIRTIO_MMIO
>
> config ZYNQ
> bool
> @@ -183,6 +230,7 @@ config A15MPCORE
>
> config ARM11MPCORE
> bool
> + select ARM11SCU
>
> config ARMSSE
> bool
> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> index 8302b8df1d..bd0b45a799 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 a11815c9af..0577e68c8e 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 820b24de5b..aee961541c 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 12/29] hw/arm: Express dependencies of the PXA2xx machines with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 | 15 ++++--------
hw/arm/Kconfig | 42 +++++++++++++++++++++++++++++++++
hw/arm/Makefile.objs | 5 +++-
3 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index df7d9421e0..f39a854f2e 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -19,22 +19,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
@@ -42,16 +40,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
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index b786cfc5bd..101de74260 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -48,6 +48,9 @@ config INTEGRATOR
config MAINSTONE
bool
+ select PXA2XX
+ select PFLASH_CFI01
+ select SMC91C111
config MUSICPAL
bool
@@ -85,6 +88,43 @@ config OMAP
config PXA2XX
bool
+ select FRAMEBUFFER
+ select I2C
+ 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 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
@@ -217,6 +257,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 bd0b45a799..00328d1b0b 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 12/29] hw/arm: Express dependencies of the PXA2xx machines with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 | 15 ++++--------
hw/arm/Kconfig | 42 +++++++++++++++++++++++++++++++++
hw/arm/Makefile.objs | 5 +++-
3 files changed, 51 insertions(+), 11 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index df7d9421e0..f39a854f2e 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -19,22 +19,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
@@ -42,16 +40,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
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index b786cfc5bd..101de74260 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -48,6 +48,9 @@ config INTEGRATOR
config MAINSTONE
bool
+ select PXA2XX
+ select PFLASH_CFI01
+ select SMC91C111
config MUSICPAL
bool
@@ -85,6 +88,43 @@ config OMAP
config PXA2XX
bool
+ select FRAMEBUFFER
+ select I2C
+ 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 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
@@ -217,6 +257,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 bd0b45a799..00328d1b0b 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 12/29] hw/arm: Express dependencies of the PXA2xx machines with Kconfig
@ 2019-04-25 16:03 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:03 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 15 ++++--------
> hw/arm/Kconfig | 42 +++++++++++++++++++++++++++++++++
> hw/arm/Makefile.objs | 5 +++-
> 3 files changed, 51 insertions(+), 11 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index df7d9421e0..f39a854f2e 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -19,22 +19,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
>
> @@ -42,16 +40,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
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index b786cfc5bd..101de74260 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -48,6 +48,9 @@ config INTEGRATOR
>
> config MAINSTONE
> bool
> + select PXA2XX
> + select PFLASH_CFI01
> + select SMC91C111
>
> config MUSICPAL
> bool
> @@ -85,6 +88,43 @@ config OMAP
>
> config PXA2XX
> bool
> + select FRAMEBUFFER
> + select I2C
> + 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 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
> @@ -217,6 +257,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 bd0b45a799..00328d1b0b 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 12/29] hw/arm: Express dependencies of the PXA2xx machines with Kconfig
@ 2019-04-25 16:03 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:03 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 15 ++++--------
> hw/arm/Kconfig | 42 +++++++++++++++++++++++++++++++++
> hw/arm/Makefile.objs | 5 +++-
> 3 files changed, 51 insertions(+), 11 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index df7d9421e0..f39a854f2e 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -19,22 +19,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
>
> @@ -42,16 +40,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
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index b786cfc5bd..101de74260 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -48,6 +48,9 @@ config INTEGRATOR
>
> config MAINSTONE
> bool
> + select PXA2XX
> + select PFLASH_CFI01
> + select SMC91C111
>
> config MUSICPAL
> bool
> @@ -85,6 +88,43 @@ config OMAP
>
> config PXA2XX
> bool
> + select FRAMEBUFFER
> + select I2C
> + 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 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
> @@ -217,6 +257,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 bd0b45a799..00328d1b0b 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 13/29] hw/arm: Express dependencies of xilinx-zynq with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 | 12 ++++++++++++
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index f39a854f2e..af78e7c892 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -19,6 +19,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
@@ -38,16 +39,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
@@ -100,7 +96,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 101de74260..785e383411 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -201,6 +201,18 @@ config VEXPRESS
config ZYNQ
bool
+ select A9MPCORE
+ select CADENCE # UART
+ select PFLASH_CFI02
+ select PL330
+ select SDHCI
+ select SSI_M25P80
+ select USB_EHCI_SYSBUS
+ select XILINX # UART
+ select XILINX_AXI
+ select XILINX_SPI
+ select XILINX_SPIPS
+ select ZYNQ_DEVCFG
config ARM_V7M
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 13/29] hw/arm: Express dependencies of xilinx-zynq with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 | 12 ++++++++++++
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index f39a854f2e..af78e7c892 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -19,6 +19,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
@@ -38,16 +39,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
@@ -100,7 +96,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 101de74260..785e383411 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -201,6 +201,18 @@ config VEXPRESS
config ZYNQ
bool
+ select A9MPCORE
+ select CADENCE # UART
+ select PFLASH_CFI02
+ select PL330
+ select SDHCI
+ select SSI_M25P80
+ select USB_EHCI_SYSBUS
+ select XILINX # UART
+ select XILINX_AXI
+ select XILINX_SPI
+ select XILINX_SPIPS
+ select ZYNQ_DEVCFG
config ARM_V7M
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 13/29] hw/arm: Express dependencies of xilinx-zynq with Kconfig
@ 2019-04-19 21:09 ` Alistair Francis
0 siblings, 0 replies; 148+ messages in thread
From: Alistair Francis @ 2019-04-19 21:09 UTC (permalink / raw)
To: Thomas Huth
Cc: Yang Zhong, Peter Maydell, qemu-devel@nongnu.org Developers,
Paolo Bonzini, Michael S. Tsirkin, Gerd Hoffmann,
Edgar E . Iglesias, Jean-Christophe Dubois, Rob Herring,
Qemu-block, Andrey Smirnov, Joel Stanley, Antony Pavlov,
Alistair Francis, Beniamino Galvani, qemu-arm, Peter Chubb,
Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Subbaraya Sundeep, Igor Mitsyanko,
Jan Kiszka
On Thu, Apr 18, 2019 at 11:18 AM Thomas Huth <thuth@redhat.com> wrote:
>
> 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>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> default-configs/arm-softmmu.mak | 7 +------
> hw/arm/Kconfig | 12 ++++++++++++
> 2 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index f39a854f2e..af78e7c892 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -19,6 +19,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
> @@ -38,16 +39,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
> @@ -100,7 +96,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 101de74260..785e383411 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -201,6 +201,18 @@ config VEXPRESS
>
> config ZYNQ
> bool
> + select A9MPCORE
> + select CADENCE # UART
> + select PFLASH_CFI02
> + select PL330
> + select SDHCI
> + select SSI_M25P80
> + select USB_EHCI_SYSBUS
> + select XILINX # UART
> + select XILINX_AXI
> + select XILINX_SPI
> + select XILINX_SPIPS
> + select ZYNQ_DEVCFG
>
> config ARM_V7M
> bool
> --
> 2.21.0
>
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 13/29] hw/arm: Express dependencies of xilinx-zynq with Kconfig
@ 2019-04-19 21:09 ` Alistair Francis
0 siblings, 0 replies; 148+ messages in thread
From: Alistair Francis @ 2019-04-19 21:09 UTC (permalink / raw)
To: Thomas Huth
Cc: Peter Maydell, Jan Kiszka, Michael S. Tsirkin,
qemu-devel@nongnu.org Developers, Gerd Hoffmann,
Edgar E . Iglesias, Subbaraya Sundeep, Yang Zhong, Rob Herring,
Qemu-block, Andrey Smirnov, Antony Pavlov, Joel Stanley,
Alistair Francis, Beniamino Galvani, qemu-arm, Peter Chubb,
Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Jean-Christophe Dubois, Igor Mitsyanko,
Paolo Bonzini
On Thu, Apr 18, 2019 at 11:18 AM Thomas Huth <thuth@redhat.com> wrote:
>
> 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>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> default-configs/arm-softmmu.mak | 7 +------
> hw/arm/Kconfig | 12 ++++++++++++
> 2 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index f39a854f2e..af78e7c892 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -19,6 +19,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
> @@ -38,16 +39,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
> @@ -100,7 +96,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 101de74260..785e383411 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -201,6 +201,18 @@ config VEXPRESS
>
> config ZYNQ
> bool
> + select A9MPCORE
> + select CADENCE # UART
> + select PFLASH_CFI02
> + select PL330
> + select SDHCI
> + select SSI_M25P80
> + select USB_EHCI_SYSBUS
> + select XILINX # UART
> + select XILINX_AXI
> + select XILINX_SPI
> + select XILINX_SPIPS
> + select ZYNQ_DEVCFG
>
> config ARM_V7M
> bool
> --
> 2.21.0
>
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 13/29] hw/arm: Express dependencies of xilinx-zynq with Kconfig
@ 2019-04-25 16:17 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:17 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 7 +------
> hw/arm/Kconfig | 12 ++++++++++++
> 2 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index f39a854f2e..af78e7c892 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -19,6 +19,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
> @@ -38,16 +39,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
> @@ -100,7 +96,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 101de74260..785e383411 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -201,6 +201,18 @@ config VEXPRESS
>
> config ZYNQ
> bool
> + select A9MPCORE
> + select CADENCE # UART
> + select PFLASH_CFI02
> + select PL330
> + select SDHCI
> + select SSI_M25P80
> + select USB_EHCI_SYSBUS
> + select XILINX # UART
> + select XILINX_AXI
> + select XILINX_SPI
> + select XILINX_SPIPS
> + select ZYNQ_DEVCFG
>
> config ARM_V7M
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 13/29] hw/arm: Express dependencies of xilinx-zynq with Kconfig
@ 2019-04-25 16:17 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:17 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 7 +------
> hw/arm/Kconfig | 12 ++++++++++++
> 2 files changed, 13 insertions(+), 6 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index f39a854f2e..af78e7c892 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -19,6 +19,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
> @@ -38,16 +39,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
> @@ -100,7 +96,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 101de74260..785e383411 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -201,6 +201,18 @@ config VEXPRESS
>
> config ZYNQ
> bool
> + select A9MPCORE
> + select CADENCE # UART
> + select PFLASH_CFI02
> + select PL330
> + select SDHCI
> + select SSI_M25P80
> + select USB_EHCI_SYSBUS
> + select XILINX # UART
> + select XILINX_AXI
> + select XILINX_SPI
> + select XILINX_SPIPS
> + select ZYNQ_DEVCFG
>
> config ARM_V7M
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 14/29] hw/arm: Express dependencies of collie with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 af78e7c892..25e8f717ac 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -25,6 +25,7 @@ CONFIG_GUMSTIX=y
CONFIG_SPITZ=y
CONFIG_TOSA=y
CONFIG_Z2=y
+CONFIG_COLLIE=y
CONFIG_VGA=y
CONFIG_TMP421=y
@@ -97,5 +98,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 785e383411..325133c129 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -168,6 +168,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 00328d1b0b..729e711b87 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 14/29] hw/arm: Express dependencies of collie with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 af78e7c892..25e8f717ac 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -25,6 +25,7 @@ CONFIG_GUMSTIX=y
CONFIG_SPITZ=y
CONFIG_TOSA=y
CONFIG_Z2=y
+CONFIG_COLLIE=y
CONFIG_VGA=y
CONFIG_TMP421=y
@@ -97,5 +98,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 785e383411..325133c129 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -168,6 +168,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 00328d1b0b..729e711b87 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 14/29] hw/arm: Express dependencies of collie with Kconfig
@ 2019-04-25 15:58 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 15:58 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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 af78e7c892..25e8f717ac 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -25,6 +25,7 @@ CONFIG_GUMSTIX=y
> CONFIG_SPITZ=y
> CONFIG_TOSA=y
> CONFIG_Z2=y
> +CONFIG_COLLIE=y
>
> CONFIG_VGA=y
> CONFIG_TMP421=y
> @@ -97,5 +98,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 785e383411..325133c129 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -168,6 +168,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 00328d1b0b..729e711b87 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 14/29] hw/arm: Express dependencies of collie with Kconfig
@ 2019-04-25 15:58 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 15:58 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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 af78e7c892..25e8f717ac 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -25,6 +25,7 @@ CONFIG_GUMSTIX=y
> CONFIG_SPITZ=y
> CONFIG_TOSA=y
> CONFIG_Z2=y
> +CONFIG_COLLIE=y
>
> CONFIG_VGA=y
> CONFIG_TMP421=y
> @@ -97,5 +98,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 785e383411..325133c129 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -168,6 +168,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 00328d1b0b..729e711b87 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 15/29] hw/arm: Express dependencies of the aspeed boards with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 25e8f717ac..2580584281 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -26,15 +26,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
@@ -92,8 +89,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 325133c129..abeaa54d88 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -254,6 +254,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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 15/29] hw/arm: Express dependencies of the aspeed boards with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 25e8f717ac..2580584281 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -26,15 +26,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
@@ -92,8 +89,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 325133c129..abeaa54d88 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -254,6 +254,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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 15/29] hw/arm: Express dependencies of the aspeed boards with Kconfig
@ 2019-04-19 8:12 ` Cédric Le Goater
0 siblings, 0 replies; 148+ messages in thread
From: Cédric Le Goater @ 2019-04-19 8:12 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Michael S. Tsirkin, Andrew Jeffery, Igor Mitsyanko,
Andrey Smirnov, Rob Herring, qemu-arm, Andrzej Zaborowski,
John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Dependencies have been determined by looking at hw/arm/aspeed.c
Looks correct to me.
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Thanks Thomas,
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 25e8f717ac..2580584281 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -26,15 +26,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
>
> @@ -92,8 +89,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 325133c129..abeaa54d88 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -254,6 +254,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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 15/29] hw/arm: Express dependencies of the aspeed boards with Kconfig
@ 2019-04-19 8:12 ` Cédric Le Goater
0 siblings, 0 replies; 148+ messages in thread
From: Cédric Le Goater @ 2019-04-19 8:12 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Subbaraya Sundeep, Gerd Hoffmann, qemu-block,
Michael S. Tsirkin, Andrew Jeffery, John Snow, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Igor Mitsyanko, qemu-arm, Peter Chubb,
Antony Pavlov, Edgar E . Iglesias, Jan Kiszka, Andrey Smirnov,
Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Dependencies have been determined by looking at hw/arm/aspeed.c
Looks correct to me.
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Thanks Thomas,
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 25e8f717ac..2580584281 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -26,15 +26,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
>
> @@ -92,8 +89,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 325133c129..abeaa54d88 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -254,6 +254,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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 15/29] hw/arm: Express dependencies of the aspeed boards with Kconfig
@ 2019-04-25 16:25 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:25 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Dependencies have been determined by looking at hw/arm/aspeed.c
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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 25e8f717ac..2580584281 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -26,15 +26,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
>
> @@ -92,8 +89,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 325133c129..abeaa54d88 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -254,6 +254,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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 15/29] hw/arm: Express dependencies of the aspeed boards with Kconfig
@ 2019-04-25 16:25 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:25 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Dependencies have been determined by looking at hw/arm/aspeed.c
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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 25e8f717ac..2580584281 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -26,15 +26,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
>
> @@ -92,8 +89,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 325133c129..abeaa54d88 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -254,6 +254,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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
Dependencies have been determined by looking at hw/arm/virt.c
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 11 +----------
hw/arm/Kconfig | 19 +++++++++++++++++++
hw/arm/Makefile.objs | 3 ++-
3 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 2580584281..f440a2b1cd 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y
# CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n
+CONFIG_ARM_VIRT=y
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
@@ -32,8 +33,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
@@ -68,9 +67,6 @@ CONFIG_IOTKIT_SYSINFO=y
CONFIG_ARMSSE_CPUID=y
CONFIG_ARMSSE_MHU=y
-CONFIG_PCI_EXPRESS=y
-CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
-
CONFIG_ALLWINNER_A10_PIT=y
CONFIG_ALLWINNER_A10_PIC=y
CONFIG_ALLWINNER_A10=y
@@ -86,10 +82,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 abeaa54d88..4d0febf644 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -1,6 +1,24 @@
config ARM_VIRT
bool
+ imply PCI_DEVICES
+ imply TEST_DEVICES
+ imply VFIO_AMD_XGBE
imply VFIO_PLATFORM
+ 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
config CHEETAH
bool
@@ -298,6 +316,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 729e711b87..4f591ca487 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Dependencies have been determined by looking at hw/arm/virt.c
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 11 +----------
hw/arm/Kconfig | 19 +++++++++++++++++++
hw/arm/Makefile.objs | 3 ++-
3 files changed, 22 insertions(+), 11 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 2580584281..f440a2b1cd 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y
# CONFIG_PCI_DEVICES=n
# CONFIG_TEST_DEVICES=n
+CONFIG_ARM_VIRT=y
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
@@ -32,8 +33,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
@@ -68,9 +67,6 @@ CONFIG_IOTKIT_SYSINFO=y
CONFIG_ARMSSE_CPUID=y
CONFIG_ARMSSE_MHU=y
-CONFIG_PCI_EXPRESS=y
-CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
-
CONFIG_ALLWINNER_A10_PIT=y
CONFIG_ALLWINNER_A10_PIC=y
CONFIG_ALLWINNER_A10=y
@@ -86,10 +82,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 abeaa54d88..4d0febf644 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -1,6 +1,24 @@
config ARM_VIRT
bool
+ imply PCI_DEVICES
+ imply TEST_DEVICES
+ imply VFIO_AMD_XGBE
imply VFIO_PLATFORM
+ 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
config CHEETAH
bool
@@ -298,6 +316,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 729e711b87..4f591ca487 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
@ 2019-04-25 15:53 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 15:53 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Hi Thomas,
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Dependencies have been determined by looking at hw/arm/virt.c
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 11 +----------
> hw/arm/Kconfig | 19 +++++++++++++++++++
> hw/arm/Makefile.objs | 3 ++-
> 3 files changed, 22 insertions(+), 11 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 2580584281..f440a2b1cd 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y
> # CONFIG_PCI_DEVICES=n
> # CONFIG_TEST_DEVICES=n
>
> +CONFIG_ARM_VIRT=y
> CONFIG_EXYNOS4=y
> CONFIG_HIGHBANK=y
> CONFIG_INTEGRATOR=y
> @@ -32,8 +33,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
>
> @@ -68,9 +67,6 @@ CONFIG_IOTKIT_SYSINFO=y
> CONFIG_ARMSSE_CPUID=y
> CONFIG_ARMSSE_MHU=y
>
> -CONFIG_PCI_EXPRESS=y
> -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
> -
> CONFIG_ALLWINNER_A10_PIT=y
> CONFIG_ALLWINNER_A10_PIC=y
> CONFIG_ALLWINNER_A10=y
> @@ -86,10 +82,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 abeaa54d88..4d0febf644 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -1,6 +1,24 @@
> config ARM_VIRT
> bool
> + imply PCI_DEVICES
Without -nodefaults I get:
qemu-system-aarch64: Unsupported NIC model: virtio-net-pci
This is expected.
> + imply TEST_DEVICES
> + imply VFIO_AMD_XGBE
> imply VFIO_PLATFORM
> + imply VFIO_XGMAC
> + select A15MPCORE
> + select ACPI
> + select ARM_SMMUV3
You forgot to remove ARM_SMMUV3 from default-configs/aarch64-softmmu.mak.
With it removed:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> + 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
>
> config CHEETAH
> bool
> @@ -298,6 +316,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 729e711b87..4f591ca487 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
@ 2019-04-25 15:53 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 15:53 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
Hi Thomas,
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Dependencies have been determined by looking at hw/arm/virt.c
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 11 +----------
> hw/arm/Kconfig | 19 +++++++++++++++++++
> hw/arm/Makefile.objs | 3 ++-
> 3 files changed, 22 insertions(+), 11 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 2580584281..f440a2b1cd 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y
> # CONFIG_PCI_DEVICES=n
> # CONFIG_TEST_DEVICES=n
>
> +CONFIG_ARM_VIRT=y
> CONFIG_EXYNOS4=y
> CONFIG_HIGHBANK=y
> CONFIG_INTEGRATOR=y
> @@ -32,8 +33,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
>
> @@ -68,9 +67,6 @@ CONFIG_IOTKIT_SYSINFO=y
> CONFIG_ARMSSE_CPUID=y
> CONFIG_ARMSSE_MHU=y
>
> -CONFIG_PCI_EXPRESS=y
> -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
> -
> CONFIG_ALLWINNER_A10_PIT=y
> CONFIG_ALLWINNER_A10_PIC=y
> CONFIG_ALLWINNER_A10=y
> @@ -86,10 +82,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 abeaa54d88..4d0febf644 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -1,6 +1,24 @@
> config ARM_VIRT
> bool
> + imply PCI_DEVICES
Without -nodefaults I get:
qemu-system-aarch64: Unsupported NIC model: virtio-net-pci
This is expected.
> + imply TEST_DEVICES
> + imply VFIO_AMD_XGBE
> imply VFIO_PLATFORM
> + imply VFIO_XGMAC
> + select A15MPCORE
> + select ACPI
> + select ARM_SMMUV3
You forgot to remove ARM_SMMUV3 from default-configs/aarch64-softmmu.mak.
With it removed:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> + 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
>
> config CHEETAH
> bool
> @@ -298,6 +316,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 729e711b87..4f591ca487 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
@ 2019-04-29 15:34 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-29 15:34 UTC (permalink / raw)
To: Philippe Mathieu-Daudé,
yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 25/04/2019 17.53, Philippe Mathieu-Daudé wrote:
> Hi Thomas,
>
> On 4/18/19 8:00 PM, Thomas Huth wrote:
>> Dependencies have been determined by looking at hw/arm/virt.c
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> default-configs/arm-softmmu.mak | 11 +----------
>> hw/arm/Kconfig | 19 +++++++++++++++++++
>> hw/arm/Makefile.objs | 3 ++-
>> 3 files changed, 22 insertions(+), 11 deletions(-)
>>
>> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
>> index 2580584281..f440a2b1cd 100644
>> --- a/default-configs/arm-softmmu.mak
>> +++ b/default-configs/arm-softmmu.mak
>> @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y
>> # CONFIG_PCI_DEVICES=n
>> # CONFIG_TEST_DEVICES=n
>>
>> +CONFIG_ARM_VIRT=y
>> CONFIG_EXYNOS4=y
>> CONFIG_HIGHBANK=y
>> CONFIG_INTEGRATOR=y
>> @@ -32,8 +33,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
>>
>> @@ -68,9 +67,6 @@ CONFIG_IOTKIT_SYSINFO=y
>> CONFIG_ARMSSE_CPUID=y
>> CONFIG_ARMSSE_MHU=y
>>
>> -CONFIG_PCI_EXPRESS=y
>> -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
>> -
>> CONFIG_ALLWINNER_A10_PIT=y
>> CONFIG_ALLWINNER_A10_PIC=y
>> CONFIG_ALLWINNER_A10=y
>> @@ -86,10 +82,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 abeaa54d88..4d0febf644 100644
>> --- a/hw/arm/Kconfig
>> +++ b/hw/arm/Kconfig
>> @@ -1,6 +1,24 @@
>> config ARM_VIRT
>> bool
>> + imply PCI_DEVICES
>
> Without -nodefaults I get:
> qemu-system-aarch64: Unsupported NIC model: virtio-net-pci
> This is expected.
Yes, it should still work with "-nic none" or "-nodefaults".
>> + imply TEST_DEVICES
>> + imply VFIO_AMD_XGBE
>> imply VFIO_PLATFORM
>> + imply VFIO_XGMAC
>> + select A15MPCORE
>> + select ACPI
>> + select ARM_SMMUV3
>
> You forgot to remove ARM_SMMUV3 from default-configs/aarch64-softmmu.mak.
Good catch! Will fix it in v6.
> With it removed:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Thanks!
Thomas
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
@ 2019-04-29 15:34 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-29 15:34 UTC (permalink / raw)
To: Philippe Mathieu-Daudé,
yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 25/04/2019 17.53, Philippe Mathieu-Daudé wrote:
> Hi Thomas,
>
> On 4/18/19 8:00 PM, Thomas Huth wrote:
>> Dependencies have been determined by looking at hw/arm/virt.c
>>
>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>> ---
>> default-configs/arm-softmmu.mak | 11 +----------
>> hw/arm/Kconfig | 19 +++++++++++++++++++
>> hw/arm/Makefile.objs | 3 ++-
>> 3 files changed, 22 insertions(+), 11 deletions(-)
>>
>> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
>> index 2580584281..f440a2b1cd 100644
>> --- a/default-configs/arm-softmmu.mak
>> +++ b/default-configs/arm-softmmu.mak
>> @@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y
>> # CONFIG_PCI_DEVICES=n
>> # CONFIG_TEST_DEVICES=n
>>
>> +CONFIG_ARM_VIRT=y
>> CONFIG_EXYNOS4=y
>> CONFIG_HIGHBANK=y
>> CONFIG_INTEGRATOR=y
>> @@ -32,8 +33,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
>>
>> @@ -68,9 +67,6 @@ CONFIG_IOTKIT_SYSINFO=y
>> CONFIG_ARMSSE_CPUID=y
>> CONFIG_ARMSSE_MHU=y
>>
>> -CONFIG_PCI_EXPRESS=y
>> -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y
>> -
>> CONFIG_ALLWINNER_A10_PIT=y
>> CONFIG_ALLWINNER_A10_PIC=y
>> CONFIG_ALLWINNER_A10=y
>> @@ -86,10 +82,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 abeaa54d88..4d0febf644 100644
>> --- a/hw/arm/Kconfig
>> +++ b/hw/arm/Kconfig
>> @@ -1,6 +1,24 @@
>> config ARM_VIRT
>> bool
>> + imply PCI_DEVICES
>
> Without -nodefaults I get:
> qemu-system-aarch64: Unsupported NIC model: virtio-net-pci
> This is expected.
Yes, it should still work with "-nic none" or "-nodefaults".
>> + imply TEST_DEVICES
>> + imply VFIO_AMD_XGBE
>> imply VFIO_PLATFORM
>> + imply VFIO_XGMAC
>> + select A15MPCORE
>> + select ACPI
>> + select ARM_SMMUV3
>
> You forgot to remove ARM_SMMUV3 from default-configs/aarch64-softmmu.mak.
Good catch! Will fix it in v6.
> With it removed:
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Thanks!
Thomas
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
@ 2019-04-29 15:53 ` Peter Maydell
0 siblings, 0 replies; 148+ messages in thread
From: Peter Maydell @ 2019-04-29 15:53 UTC (permalink / raw)
To: Thomas Huth
Cc: Philippe Mathieu-Daudé,
Yang Zhong, QEMU Developers, Paolo Bonzini, Michael S. Tsirkin,
Gerd Hoffmann, Edgar E . Iglesias, Jean-Christophe Dubois,
Rob Herring, Qemu-block, Andrey Smirnov, Joel Stanley,
Antony Pavlov, Alistair Francis, Beniamino Galvani, qemu-arm,
Peter Chubb, Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Subbaraya Sundeep, Igor Mitsyanko,
Jan Kiszka
On Mon, 29 Apr 2019 at 16:34, Thomas Huth <thuth@redhat.com> wrote:
>
> On 25/04/2019 17.53, Philippe Mathieu-Daudé wrote:
> > Hi Thomas,
> >
> > On 4/18/19 8:00 PM, Thomas Huth wrote:
> >> Dependencies have been determined by looking at hw/arm/virt.c
> >>
> >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >> ---
> >> default-configs/arm-softmmu.mak | 11 +----------
> >> hw/arm/Kconfig | 19 +++++++++++++++++++
> >> hw/arm/Makefile.objs | 3 ++-
> >> 3 files changed, 22 insertions(+), 11 deletions(-)
> > Without -nodefaults I get:
> > qemu-system-aarch64: Unsupported NIC model: virtio-net-pci
> > This is expected.
>
> Yes, it should still work with "-nic none" or "-nodefaults".
Er, if you need either -nic none or -nodefaults after this
patch then this would be a change in behaviour, which seems
wrong to me.
thanks
-- PMM
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
@ 2019-04-29 15:53 ` Peter Maydell
0 siblings, 0 replies; 148+ messages in thread
From: Peter Maydell @ 2019-04-29 15:53 UTC (permalink / raw)
To: Thomas Huth
Cc: Jan Kiszka, Michael S. Tsirkin, QEMU Developers, Gerd Hoffmann,
Edgar E . Iglesias, Subbaraya Sundeep, Yang Zhong, Rob Herring,
Qemu-block, Andrey Smirnov, Antony Pavlov,
Philippe Mathieu-Daudé,
Joel Stanley, Alistair Francis, Beniamino Galvani, qemu-arm,
Peter Chubb, Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Jean-Christophe Dubois, Igor Mitsyanko,
Paolo Bonzini
On Mon, 29 Apr 2019 at 16:34, Thomas Huth <thuth@redhat.com> wrote:
>
> On 25/04/2019 17.53, Philippe Mathieu-Daudé wrote:
> > Hi Thomas,
> >
> > On 4/18/19 8:00 PM, Thomas Huth wrote:
> >> Dependencies have been determined by looking at hw/arm/virt.c
> >>
> >> Signed-off-by: Thomas Huth <thuth@redhat.com>
> >> ---
> >> default-configs/arm-softmmu.mak | 11 +----------
> >> hw/arm/Kconfig | 19 +++++++++++++++++++
> >> hw/arm/Makefile.objs | 3 ++-
> >> 3 files changed, 22 insertions(+), 11 deletions(-)
> > Without -nodefaults I get:
> > qemu-system-aarch64: Unsupported NIC model: virtio-net-pci
> > This is expected.
>
> Yes, it should still work with "-nic none" or "-nodefaults".
Er, if you need either -nic none or -nodefaults after this
patch then this would be a change in behaviour, which seems
wrong to me.
thanks
-- PMM
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
@ 2019-04-29 16:02 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-29 16:02 UTC (permalink / raw)
To: Peter Maydell
Cc: Philippe Mathieu-Daudé,
Yang Zhong, QEMU Developers, Paolo Bonzini, Michael S. Tsirkin,
Gerd Hoffmann, Edgar E . Iglesias, Jean-Christophe Dubois,
Rob Herring, Qemu-block, Andrey Smirnov, Joel Stanley,
Antony Pavlov, Alistair Francis, Beniamino Galvani, qemu-arm,
Peter Chubb, Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Subbaraya Sundeep, Igor Mitsyanko,
Jan Kiszka
On 29/04/2019 17.53, Peter Maydell wrote:
> On Mon, 29 Apr 2019 at 16:34, Thomas Huth <thuth@redhat.com> wrote:
>>
>> On 25/04/2019 17.53, Philippe Mathieu-Daudé wrote:
>>> Hi Thomas,
>>>
>>> On 4/18/19 8:00 PM, Thomas Huth wrote:
>>>> Dependencies have been determined by looking at hw/arm/virt.c
>>>>
>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>> ---
>>>> default-configs/arm-softmmu.mak | 11 +----------
>>>> hw/arm/Kconfig | 19 +++++++++++++++++++
>>>> hw/arm/Makefile.objs | 3 ++-
>>>> 3 files changed, 22 insertions(+), 11 deletions(-)
>
>>> Without -nodefaults I get:
>>> qemu-system-aarch64: Unsupported NIC model: virtio-net-pci
>>> This is expected.
>>
>> Yes, it should still work with "-nic none" or "-nodefaults".
>
> Er, if you need either -nic none or -nodefaults after this
> patch then this would be a change in behaviour, which seems
> wrong to me.
No worry, this only applies to compiling builds where you run "configure
--without-default-devices". For normal builds, virtio-net should still
be included fine. ... at least I hope this is what Philippe was talking
about ... but for me it's working fine when I run "configure" normally.
Thomas
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
@ 2019-04-29 16:02 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-29 16:02 UTC (permalink / raw)
To: Peter Maydell
Cc: Jan Kiszka, Michael S. Tsirkin, QEMU Developers, Gerd Hoffmann,
Edgar E . Iglesias, Subbaraya Sundeep, Yang Zhong, Rob Herring,
Qemu-block, Andrey Smirnov, Antony Pavlov,
Philippe Mathieu-Daudé,
Joel Stanley, Alistair Francis, Beniamino Galvani, qemu-arm,
Peter Chubb, Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Jean-Christophe Dubois, Igor Mitsyanko,
Paolo Bonzini
On 29/04/2019 17.53, Peter Maydell wrote:
> On Mon, 29 Apr 2019 at 16:34, Thomas Huth <thuth@redhat.com> wrote:
>>
>> On 25/04/2019 17.53, Philippe Mathieu-Daudé wrote:
>>> Hi Thomas,
>>>
>>> On 4/18/19 8:00 PM, Thomas Huth wrote:
>>>> Dependencies have been determined by looking at hw/arm/virt.c
>>>>
>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>> ---
>>>> default-configs/arm-softmmu.mak | 11 +----------
>>>> hw/arm/Kconfig | 19 +++++++++++++++++++
>>>> hw/arm/Makefile.objs | 3 ++-
>>>> 3 files changed, 22 insertions(+), 11 deletions(-)
>
>>> Without -nodefaults I get:
>>> qemu-system-aarch64: Unsupported NIC model: virtio-net-pci
>>> This is expected.
>>
>> Yes, it should still work with "-nic none" or "-nodefaults".
>
> Er, if you need either -nic none or -nodefaults after this
> patch then this would be a change in behaviour, which seems
> wrong to me.
No worry, this only applies to compiling builds where you run "configure
--without-default-devices". For normal builds, virtio-net should still
be included fine. ... at least I hope this is what Philippe was talking
about ... but for me it's working fine when I run "configure" normally.
Thomas
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
@ 2019-04-29 16:06 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-29 16:06 UTC (permalink / raw)
To: Thomas Huth, Peter Maydell
Cc: Yang Zhong, QEMU Developers, Paolo Bonzini, Michael S. Tsirkin,
Gerd Hoffmann, Edgar E . Iglesias, Jean-Christophe Dubois,
Rob Herring, Qemu-block, Andrey Smirnov, Joel Stanley,
Antony Pavlov, Alistair Francis, Beniamino Galvani, qemu-arm,
Peter Chubb, Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Subbaraya Sundeep, Igor Mitsyanko,
Jan Kiszka
On 4/29/19 6:02 PM, Thomas Huth wrote:
> On 29/04/2019 17.53, Peter Maydell wrote:
>> On Mon, 29 Apr 2019 at 16:34, Thomas Huth <thuth@redhat.com> wrote:
>>>
>>> On 25/04/2019 17.53, Philippe Mathieu-Daudé wrote:
>>>> Hi Thomas,
>>>>
>>>> On 4/18/19 8:00 PM, Thomas Huth wrote:
>>>>> Dependencies have been determined by looking at hw/arm/virt.c
>>>>>
>>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>>> ---
>>>>> default-configs/arm-softmmu.mak | 11 +----------
>>>>> hw/arm/Kconfig | 19 +++++++++++++++++++
>>>>> hw/arm/Makefile.objs | 3 ++-
>>>>> 3 files changed, 22 insertions(+), 11 deletions(-)
>>
>>>> Without -nodefaults I get:
>>>> qemu-system-aarch64: Unsupported NIC model: virtio-net-pci
>>>> This is expected.
>>>
>>> Yes, it should still work with "-nic none" or "-nodefaults".
>>
>> Er, if you need either -nic none or -nodefaults after this
>> patch then this would be a change in behaviour, which seems
>> wrong to me.
>
> No worry, this only applies to compiling builds where you run "configure
> --without-default-devices". For normal builds, virtio-net should still
> be included fine. ... at least I hope this is what Philippe was talking
> about ... but for me it's working fine when I run "configure" normally.
Yes, I tested both cases, without --without-default-devices it works as
expected (no behaviour change). With --without-default-devices (this is
a new configure switch) it is probably required to run QEMU with
-nodefaults.
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
@ 2019-04-29 16:06 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-29 16:06 UTC (permalink / raw)
To: Thomas Huth, Peter Maydell
Cc: Jan Kiszka, Michael S. Tsirkin, QEMU Developers, Gerd Hoffmann,
Edgar E . Iglesias, Subbaraya Sundeep, Yang Zhong, Rob Herring,
Qemu-block, Andrey Smirnov, Antony Pavlov, Joel Stanley,
Alistair Francis, Beniamino Galvani, qemu-arm, Peter Chubb,
Cedric Le Goater, John Snow, Igor Mitsyanko,
Philippe Mathieu-Daude, Jean-Christophe Dubois, Andrew Jeffery,
Paolo Bonzini
On 4/29/19 6:02 PM, Thomas Huth wrote:
> On 29/04/2019 17.53, Peter Maydell wrote:
>> On Mon, 29 Apr 2019 at 16:34, Thomas Huth <thuth@redhat.com> wrote:
>>>
>>> On 25/04/2019 17.53, Philippe Mathieu-Daudé wrote:
>>>> Hi Thomas,
>>>>
>>>> On 4/18/19 8:00 PM, Thomas Huth wrote:
>>>>> Dependencies have been determined by looking at hw/arm/virt.c
>>>>>
>>>>> Signed-off-by: Thomas Huth <thuth@redhat.com>
>>>>> ---
>>>>> default-configs/arm-softmmu.mak | 11 +----------
>>>>> hw/arm/Kconfig | 19 +++++++++++++++++++
>>>>> hw/arm/Makefile.objs | 3 ++-
>>>>> 3 files changed, 22 insertions(+), 11 deletions(-)
>>
>>>> Without -nodefaults I get:
>>>> qemu-system-aarch64: Unsupported NIC model: virtio-net-pci
>>>> This is expected.
>>>
>>> Yes, it should still work with "-nic none" or "-nodefaults".
>>
>> Er, if you need either -nic none or -nodefaults after this
>> patch then this would be a change in behaviour, which seems
>> wrong to me.
>
> No worry, this only applies to compiling builds where you run "configure
> --without-default-devices". For normal builds, virtio-net should still
> be included fine. ... at least I hope this is what Philippe was talking
> about ... but for me it's working fine when I run "configure" normally.
Yes, I tested both cases, without --without-default-devices it works as
expected (no behaviour change). With --without-default-devices (this is
a new configure switch) it is probably required to run QEMU with
-nodefaults.
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 17/29] hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann,
Alistair Francis
Netduino only depends on the stm32f205 SoC which in turn depends on
its components.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
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 f440a2b1cd..c86a9f5427 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -28,25 +28,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 4d0febf644..49306d6419 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -81,6 +81,7 @@ config MUSICPAL
config NETDUINO2
bool
+ select STM32F205_SOC
config NSERIES
bool
@@ -250,6 +251,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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 17/29] hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Alistair Francis, Gerd Hoffmann,
Edgar E . Iglesias, Jean-Christophe Dubois, Rob Herring,
qemu-block, Andrey Smirnov, Joel Stanley, Antony Pavlov,
Alistair Francis, Beniamino Galvani, qemu-arm, Peter Chubb,
Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Subbaraya Sundeep, Igor Mitsyanko,
Jan Kiszka
Netduino only depends on the stm32f205 SoC which in turn depends on
its components.
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
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 f440a2b1cd..c86a9f5427 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -28,25 +28,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 4d0febf644..49306d6419 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -81,6 +81,7 @@ config MUSICPAL
config NETDUINO2
bool
+ select STM32F205_SOC
config NSERIES
bool
@@ -250,6 +251,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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 17/29] hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig
@ 2019-04-25 21:27 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 21:27 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Alistair Francis, Gerd Hoffmann,
Edgar E . Iglesias, Jean-Christophe Dubois, Rob Herring,
qemu-block, Andrey Smirnov, Joel Stanley, Antony Pavlov,
Alistair Francis, Beniamino Galvani, qemu-arm, Peter Chubb,
Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Subbaraya Sundeep, Igor Mitsyanko,
Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Netduino only depends on the stm32f205 SoC which in turn depends on
> its components.
>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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 f440a2b1cd..c86a9f5427 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -28,25 +28,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 4d0febf644..49306d6419 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -81,6 +81,7 @@ config MUSICPAL
>
> config NETDUINO2
> bool
> + select STM32F205_SOC
>
> config NSERIES
> bool
> @@ -250,6 +251,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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 17/29] hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig
@ 2019-04-25 21:27 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 21:27 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Peter Chubb, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Alistair Francis, Gerd Hoffmann, Antony Pavlov,
Edgar E . Iglesias, Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Netduino only depends on the stm32f205 SoC which in turn depends on
> its components.
>
> Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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 f440a2b1cd..c86a9f5427 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -28,25 +28,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 4d0febf644..49306d6419 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -81,6 +81,7 @@ config MUSICPAL
>
> config NETDUINO2
> bool
> + select STM32F205_SOC
>
> config NSERIES
> bool
> @@ -250,6 +251,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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 18/29] hw/arm: Express dependencies of allwinner / cubieboard with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
Add dependencies for the Cubitech Cubieboard.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 6 +-----
hw/arm/Kconfig | 9 +++++++++
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index c86a9f5427..a0b9016e3a 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -7,6 +7,7 @@ CONFIG_ARM_V7M=y
# CONFIG_TEST_DEVICES=n
CONFIG_ARM_VIRT=y
+CONFIG_CUBIEBOARD=y
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
@@ -32,7 +33,6 @@ CONFIG_NETDUINO2=y
CONFIG_VGA=y
CONFIG_SSI_M25P80=y
-CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y
CONFIG_FRAMEBUFFER=y
@@ -60,10 +60,6 @@ CONFIG_IOTKIT_SYSINFO=y
CONFIG_ARMSSE_CPUID=y
CONFIG_ARMSSE_MHU=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 49306d6419..2ef5696900 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -25,6 +25,10 @@ config CHEETAH
select OMAP
select TSC210X
+config CUBIEBOARD
+ bool
+ select ALLWINNER_A10
+
config DIGIC
bool
select PTIMER
@@ -245,6 +249,11 @@ config ARM_V7M
config ALLWINNER_A10
bool
+ select AHCI
+ select ALLWINNER_A10_PIT
+ select ALLWINNER_A10_PIC
+ select ALLWINNER_EMAC
+ select SERIAL
config RASPI
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 18/29] hw/arm: Express dependencies of allwinner / cubieboard with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Add dependencies for the Cubitech Cubieboard.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 6 +-----
hw/arm/Kconfig | 9 +++++++++
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index c86a9f5427..a0b9016e3a 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -7,6 +7,7 @@ CONFIG_ARM_V7M=y
# CONFIG_TEST_DEVICES=n
CONFIG_ARM_VIRT=y
+CONFIG_CUBIEBOARD=y
CONFIG_EXYNOS4=y
CONFIG_HIGHBANK=y
CONFIG_INTEGRATOR=y
@@ -32,7 +33,6 @@ CONFIG_NETDUINO2=y
CONFIG_VGA=y
CONFIG_SSI_M25P80=y
-CONFIG_ALLWINNER_EMAC=y
CONFIG_IMX_FEC=y
CONFIG_FRAMEBUFFER=y
@@ -60,10 +60,6 @@ CONFIG_IOTKIT_SYSINFO=y
CONFIG_ARMSSE_CPUID=y
CONFIG_ARMSSE_MHU=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 49306d6419..2ef5696900 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -25,6 +25,10 @@ config CHEETAH
select OMAP
select TSC210X
+config CUBIEBOARD
+ bool
+ select ALLWINNER_A10
+
config DIGIC
bool
select PTIMER
@@ -245,6 +249,11 @@ config ARM_V7M
config ALLWINNER_A10
bool
+ select AHCI
+ select ALLWINNER_A10_PIT
+ select ALLWINNER_A10_PIC
+ select ALLWINNER_EMAC
+ select SERIAL
config RASPI
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 18/29] hw/arm: Express dependencies of allwinner / cubieboard with Kconfig
@ 2019-04-25 15:57 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 15:57 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Add dependencies for the Cubitech Cubieboard.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 6 +-----
> hw/arm/Kconfig | 9 +++++++++
> 2 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index c86a9f5427..a0b9016e3a 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -7,6 +7,7 @@ CONFIG_ARM_V7M=y
> # CONFIG_TEST_DEVICES=n
>
> CONFIG_ARM_VIRT=y
> +CONFIG_CUBIEBOARD=y
> CONFIG_EXYNOS4=y
> CONFIG_HIGHBANK=y
> CONFIG_INTEGRATOR=y
> @@ -32,7 +33,6 @@ CONFIG_NETDUINO2=y
>
> CONFIG_VGA=y
> CONFIG_SSI_M25P80=y
> -CONFIG_ALLWINNER_EMAC=y
> CONFIG_IMX_FEC=y
>
> CONFIG_FRAMEBUFFER=y
> @@ -60,10 +60,6 @@ CONFIG_IOTKIT_SYSINFO=y
> CONFIG_ARMSSE_CPUID=y
> CONFIG_ARMSSE_MHU=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 49306d6419..2ef5696900 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -25,6 +25,10 @@ config CHEETAH
> select OMAP
> select TSC210X
>
> +config CUBIEBOARD
> + bool
> + select ALLWINNER_A10
> +
> config DIGIC
> bool
> select PTIMER
> @@ -245,6 +249,11 @@ config ARM_V7M
>
> config ALLWINNER_A10
> bool
> + select AHCI
> + select ALLWINNER_A10_PIT
> + select ALLWINNER_A10_PIC
> + select ALLWINNER_EMAC
> + select SERIAL
>
> config RASPI
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 18/29] hw/arm: Express dependencies of allwinner / cubieboard with Kconfig
@ 2019-04-25 15:57 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 15:57 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Add dependencies for the Cubitech Cubieboard.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 6 +-----
> hw/arm/Kconfig | 9 +++++++++
> 2 files changed, 10 insertions(+), 5 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index c86a9f5427..a0b9016e3a 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -7,6 +7,7 @@ CONFIG_ARM_V7M=y
> # CONFIG_TEST_DEVICES=n
>
> CONFIG_ARM_VIRT=y
> +CONFIG_CUBIEBOARD=y
> CONFIG_EXYNOS4=y
> CONFIG_HIGHBANK=y
> CONFIG_INTEGRATOR=y
> @@ -32,7 +33,6 @@ CONFIG_NETDUINO2=y
>
> CONFIG_VGA=y
> CONFIG_SSI_M25P80=y
> -CONFIG_ALLWINNER_EMAC=y
> CONFIG_IMX_FEC=y
>
> CONFIG_FRAMEBUFFER=y
> @@ -60,10 +60,6 @@ CONFIG_IOTKIT_SYSINFO=y
> CONFIG_ARMSSE_CPUID=y
> CONFIG_ARMSSE_MHU=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 49306d6419..2ef5696900 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -25,6 +25,10 @@ config CHEETAH
> select OMAP
> select TSC210X
>
> +config CUBIEBOARD
> + bool
> + select ALLWINNER_A10
> +
> config DIGIC
> bool
> select PTIMER
> @@ -245,6 +249,11 @@ config ARM_V7M
>
> config ALLWINNER_A10
> bool
> + select AHCI
> + select ALLWINNER_A10_PIT
> + select ALLWINNER_A10_PIC
> + select ALLWINNER_EMAC
> + select SERIAL
>
> config RASPI
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 19/29] hw/arm: Express dependencies of the MPS2 boards with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
Add Kconfig dependencies for the mps2-an* machines.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 20 +-------------------
hw/arm/Kconfig | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index a0b9016e3a..31d31d3f4a 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -30,6 +30,7 @@ CONFIG_Z2=y
CONFIG_COLLIE=y
CONFIG_ASPEED_SOC=y
CONFIG_NETDUINO2=y
+CONFIG_MPS2=y
CONFIG_VGA=y
CONFIG_SSI_M25P80=y
@@ -38,28 +39,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_ARMSSE_MHU=y
-
CONFIG_FSL_IMX6=y
CONFIG_FSL_IMX25=y
CONFIG_FSL_IMX7=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 2ef5696900..466b143fdf 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -301,6 +301,12 @@ config ASPEED_SOC
config MPS2
bool
+ select ARMSSE
+ select LAN9118
+ select MPS2_FPGAIO
+ select MPS2_SCC
+ select PL022 # Serial port
+ select PL080 # DMA controller
config FSL_IMX7
bool
@@ -340,6 +346,18 @@ config ARM11MPCORE
config ARMSSE
bool
+ select ARMSSE_CPUID
+ select ARMSSE_MHU
+ 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 TZ_MPC
+ select TZ_MSC
+ select TZ_PPC
config ARMSSE_CPUID
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 19/29] hw/arm: Express dependencies of the MPS2 boards with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Add Kconfig dependencies for the mps2-an* machines.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 20 +-------------------
hw/arm/Kconfig | 18 ++++++++++++++++++
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index a0b9016e3a..31d31d3f4a 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -30,6 +30,7 @@ CONFIG_Z2=y
CONFIG_COLLIE=y
CONFIG_ASPEED_SOC=y
CONFIG_NETDUINO2=y
+CONFIG_MPS2=y
CONFIG_VGA=y
CONFIG_SSI_M25P80=y
@@ -38,28 +39,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_ARMSSE_MHU=y
-
CONFIG_FSL_IMX6=y
CONFIG_FSL_IMX25=y
CONFIG_FSL_IMX7=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 2ef5696900..466b143fdf 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -301,6 +301,12 @@ config ASPEED_SOC
config MPS2
bool
+ select ARMSSE
+ select LAN9118
+ select MPS2_FPGAIO
+ select MPS2_SCC
+ select PL022 # Serial port
+ select PL080 # DMA controller
config FSL_IMX7
bool
@@ -340,6 +346,18 @@ config ARM11MPCORE
config ARMSSE
bool
+ select ARMSSE_CPUID
+ select ARMSSE_MHU
+ 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 TZ_MPC
+ select TZ_MSC
+ select TZ_PPC
config ARMSSE_CPUID
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 19/29] hw/arm: Express dependencies of the MPS2 boards with Kconfig
@ 2019-04-25 21:53 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 21:53 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Add Kconfig dependencies for the mps2-an* machines.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 20 +-------------------
> hw/arm/Kconfig | 18 ++++++++++++++++++
> 2 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index a0b9016e3a..31d31d3f4a 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -30,6 +30,7 @@ CONFIG_Z2=y
> CONFIG_COLLIE=y
> CONFIG_ASPEED_SOC=y
> CONFIG_NETDUINO2=y
> +CONFIG_MPS2=y
>
> CONFIG_VGA=y
> CONFIG_SSI_M25P80=y
> @@ -38,28 +39,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_ARMSSE_MHU=y
> -
> CONFIG_FSL_IMX6=y
> CONFIG_FSL_IMX25=y
> CONFIG_FSL_IMX7=y
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 2ef5696900..466b143fdf 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -301,6 +301,12 @@ config ASPEED_SOC
>
> config MPS2
> bool
> + select ARMSSE
> + select LAN9118
> + select MPS2_FPGAIO
> + select MPS2_SCC
> + select PL022 # Serial port
> + select PL080 # DMA controller
>
> config FSL_IMX7
> bool
> @@ -340,6 +346,18 @@ config ARM11MPCORE
>
> config ARMSSE
> bool
> + select ARMSSE_CPUID
> + select ARMSSE_MHU
> + 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 TZ_MPC
> + select TZ_MSC
> + select TZ_PPC
>
> config ARMSSE_CPUID
> bool
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 19/29] hw/arm: Express dependencies of the MPS2 boards with Kconfig
@ 2019-04-25 21:53 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 21:53 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Add Kconfig dependencies for the mps2-an* machines.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 20 +-------------------
> hw/arm/Kconfig | 18 ++++++++++++++++++
> 2 files changed, 19 insertions(+), 19 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index a0b9016e3a..31d31d3f4a 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -30,6 +30,7 @@ CONFIG_Z2=y
> CONFIG_COLLIE=y
> CONFIG_ASPEED_SOC=y
> CONFIG_NETDUINO2=y
> +CONFIG_MPS2=y
>
> CONFIG_VGA=y
> CONFIG_SSI_M25P80=y
> @@ -38,28 +39,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_ARMSSE_MHU=y
> -
> CONFIG_FSL_IMX6=y
> CONFIG_FSL_IMX25=y
> CONFIG_FSL_IMX7=y
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 2ef5696900..466b143fdf 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -301,6 +301,12 @@ config ASPEED_SOC
>
> config MPS2
> bool
> + select ARMSSE
> + select LAN9118
> + select MPS2_FPGAIO
> + select MPS2_SCC
> + select PL022 # Serial port
> + select PL080 # DMA controller
>
> config FSL_IMX7
> bool
> @@ -340,6 +346,18 @@ config ARM11MPCORE
>
> config ARMSSE
> bool
> + select ARMSSE_CPUID
> + select ARMSSE_MHU
> + 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 TZ_MPC
> + select TZ_MSC
> + select TZ_PPC
>
> config ARMSSE_CPUID
> bool
>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 20/29] hw/arm: Express dependencies of the raspi machines with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
Most of the code is directly controlled by the CONFIG_RASPI switch,
so not much to add here additionally.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 4 +---
hw/arm/Kconfig | 3 +++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 31d31d3f4a..22bff20b32 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -31,15 +31,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 466b143fdf..e68a29ca2b 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -257,6 +257,9 @@ config ALLWINNER_A10
config RASPI
bool
+ select FRAMEBUFFER
+ select PL011 # UART
+ select SDHCI
config STM32F205_SOC
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 20/29] hw/arm: Express dependencies of the raspi machines with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Most of the code is directly controlled by the CONFIG_RASPI switch,
so not much to add here additionally.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
default-configs/arm-softmmu.mak | 4 +---
hw/arm/Kconfig | 3 +++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 31d31d3f4a..22bff20b32 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -31,15 +31,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 466b143fdf..e68a29ca2b 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -257,6 +257,9 @@ config ALLWINNER_A10
config RASPI
bool
+ select FRAMEBUFFER
+ select PL011 # UART
+ select SDHCI
config STM32F205_SOC
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 20/29] hw/arm: Express dependencies of the raspi machines with Kconfig
@ 2019-04-19 21:12 ` Alistair Francis
0 siblings, 0 replies; 148+ messages in thread
From: Alistair Francis @ 2019-04-19 21:12 UTC (permalink / raw)
To: Thomas Huth
Cc: Yang Zhong, Peter Maydell, qemu-devel@nongnu.org Developers,
Paolo Bonzini, Michael S. Tsirkin, Gerd Hoffmann,
Edgar E . Iglesias, Jean-Christophe Dubois, Rob Herring,
Qemu-block, Andrey Smirnov, Joel Stanley, Antony Pavlov,
Alistair Francis, Beniamino Galvani, qemu-arm, Peter Chubb,
Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Subbaraya Sundeep, Igor Mitsyanko,
Jan Kiszka
On Thu, Apr 18, 2019 at 11:25 AM Thomas Huth <thuth@redhat.com> wrote:
>
> Most of the code is directly controlled by the CONFIG_RASPI switch,
> so not much to add here additionally.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> default-configs/arm-softmmu.mak | 4 +---
> hw/arm/Kconfig | 3 +++
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 31d31d3f4a..22bff20b32 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -31,15 +31,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 466b143fdf..e68a29ca2b 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -257,6 +257,9 @@ config ALLWINNER_A10
>
> config RASPI
> bool
> + select FRAMEBUFFER
> + select PL011 # UART
> + select SDHCI
>
> config STM32F205_SOC
> bool
> --
> 2.21.0
>
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 20/29] hw/arm: Express dependencies of the raspi machines with Kconfig
@ 2019-04-19 21:12 ` Alistair Francis
0 siblings, 0 replies; 148+ messages in thread
From: Alistair Francis @ 2019-04-19 21:12 UTC (permalink / raw)
To: Thomas Huth
Cc: Peter Maydell, Jan Kiszka, Michael S. Tsirkin,
qemu-devel@nongnu.org Developers, Gerd Hoffmann,
Edgar E . Iglesias, Subbaraya Sundeep, Yang Zhong, Rob Herring,
Qemu-block, Andrey Smirnov, Antony Pavlov, Joel Stanley,
Alistair Francis, Beniamino Galvani, qemu-arm, Peter Chubb,
Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Jean-Christophe Dubois, Igor Mitsyanko,
Paolo Bonzini
On Thu, Apr 18, 2019 at 11:25 AM Thomas Huth <thuth@redhat.com> wrote:
>
> Most of the code is directly controlled by the CONFIG_RASPI switch,
> so not much to add here additionally.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> default-configs/arm-softmmu.mak | 4 +---
> hw/arm/Kconfig | 3 +++
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 31d31d3f4a..22bff20b32 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -31,15 +31,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 466b143fdf..e68a29ca2b 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -257,6 +257,9 @@ config ALLWINNER_A10
>
> config RASPI
> bool
> + select FRAMEBUFFER
> + select PL011 # UART
> + select SDHCI
>
> config STM32F205_SOC
> bool
> --
> 2.21.0
>
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 20/29] hw/arm: Express dependencies of the raspi machines with Kconfig
@ 2019-04-25 15:54 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 15:54 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Most of the code is directly controlled by the CONFIG_RASPI switch,
> so not much to add here additionally.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 4 +---
> hw/arm/Kconfig | 3 +++
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 31d31d3f4a..22bff20b32 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -31,15 +31,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 466b143fdf..e68a29ca2b 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -257,6 +257,9 @@ config ALLWINNER_A10
>
> config RASPI
> bool
> + select FRAMEBUFFER
> + select PL011 # UART
> + select SDHCI
>
> config STM32F205_SOC
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 20/29] hw/arm: Express dependencies of the raspi machines with Kconfig
@ 2019-04-25 15:54 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 15:54 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Most of the code is directly controlled by the CONFIG_RASPI switch,
> so not much to add here additionally.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 4 +---
> hw/arm/Kconfig | 3 +++
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 31d31d3f4a..22bff20b32 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -31,15 +31,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 466b143fdf..e68a29ca2b 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -257,6 +257,9 @@ config ALLWINNER_A10
>
> config RASPI
> bool
> + select FRAMEBUFFER
> + select PL011 # UART
> + select SDHCI
>
> config STM32F205_SOC
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 21/29] hw/arm: Express dependencies of canon-a1100 with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann,
Philippe Mathieu-Daudé
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 22bff20b32..76508e3910 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -32,12 +32,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 e68a29ca2b..059fb8282c 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -32,6 +32,7 @@ config CUBIEBOARD
config DIGIC
bool
select PTIMER
+ select PFLASH_CFI02
config EXYNOS4
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 21/29] hw/arm: Express dependencies of canon-a1100 with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daudé,
Philippe Mathieu-Daude, Subbaraya Sundeep, Igor Mitsyanko,
Jan Kiszka
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 22bff20b32..76508e3910 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -32,12 +32,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 e68a29ca2b..059fb8282c 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -32,6 +32,7 @@ config CUBIEBOARD
config DIGIC
bool
select PTIMER
+ select PFLASH_CFI02
config EXYNOS4
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 22/29] hw/arm: Express dependencies of sabrelite with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 76508e3910..ef7dd7156a 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -33,6 +33,7 @@ CONFIG_NETDUINO2=y
CONFIG_MPS2=y
CONFIG_RASPI=y
CONFIG_DIGIC=y
+CONFIG_SABRELITE=y
CONFIG_VGA=y
CONFIG_SSI_M25P80=y
@@ -40,13 +41,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 059fb8282c..065c7acf1b 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -177,6 +177,10 @@ config REALVIEW
select DS1338 # I2C RTC+NVRAM
select USB_OHCI
+config SABRELITE
+ bool
+ select FSL_IMX6
+
config STELLARIS
bool
select ARM_V7M
@@ -289,6 +293,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 4f591ca487..fadd69882c 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 22/29] hw/arm: Express dependencies of sabrelite with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 76508e3910..ef7dd7156a 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -33,6 +33,7 @@ CONFIG_NETDUINO2=y
CONFIG_MPS2=y
CONFIG_RASPI=y
CONFIG_DIGIC=y
+CONFIG_SABRELITE=y
CONFIG_VGA=y
CONFIG_SSI_M25P80=y
@@ -40,13 +41,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 059fb8282c..065c7acf1b 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -177,6 +177,10 @@ config REALVIEW
select DS1338 # I2C RTC+NVRAM
select USB_OHCI
+config SABRELITE
+ bool
+ select FSL_IMX6
+
config STELLARIS
bool
select ARM_V7M
@@ -289,6 +293,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 4f591ca487..fadd69882c 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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 22/29] hw/arm: Express dependencies of sabrelite with Kconfig
@ 2019-04-25 16:43 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:43 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Hi Thomas,
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 76508e3910..ef7dd7156a 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -33,6 +33,7 @@ CONFIG_NETDUINO2=y
> CONFIG_MPS2=y
> CONFIG_RASPI=y
> CONFIG_DIGIC=y
> +CONFIG_SABRELITE=y
>
> CONFIG_VGA=y
> CONFIG_SSI_M25P80=y
> @@ -40,13 +41,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 059fb8282c..065c7acf1b 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -177,6 +177,10 @@ config REALVIEW
> select DS1338 # I2C RTC+NVRAM
> select USB_OHCI
>
> +config SABRELITE
> + bool
> + select FSL_IMX6
This one crashes:
$ qemu-system-aarch64 -display none -M sabrelite
ERROR:/source/qemu/qom/object.c:454:object_initialize_with_type:
assertion failed: (type != NULL)
Aborted (core dumped)
(gdb) bt
#3 0x00007f71139fb4de in g_assertion_message_expr () at
/lib64/libglib-2.0.so.0
[...]
#8 0x000055a148c5eec9 in sysbus_init_child_obj
(parent=parent@entry=0x55a14a2fbe10,
childname=childname@entry=0x55a148ed3713 "eth",
child=child@entry=0x55a14a33e0a0, childsize=childsize@entry=27296,
childtype=childtype@entry=0x55a148ed370a "imx.enet")
at /source/qemu/hw/core/sysbus.c:373
#9 0x000055a148b37b82 in fsl_imx6_init (obj=0x55a14a2fbe10) at
/source/qemu/hw/arm/fsl-imx6.c:91
#10 0x000055a148d0fb17 in object_initialize_with_type
(data=data@entry=0x55a14a2fbe10, size=size@entry=299248,
type=0x55a14a27dbd0) at /source/qemu/qom/object.c:466
#11 0x000055a148d0fe5d in object_initialize
(data=data@entry=0x55a14a2fbe10, size=size@entry=299248,
typename=typename@entry=0x55a148ed3328 "fsl,imx6") at
/source/qemu/qom/object.c:474
#12 0x000055a148b35ced in sabrelite_init (machine=0x55a14a2c1300) at
/source/qemu/hw/arm/sabrelite.c:58
#13 0x000055a148c608bb in machine_run_board_init
(machine=0x55a14a2c1300) at /source/qemu/hw/core/machine.c:1030
[...]
Then:
$ qemu-system-aarch64 -display none -nodefaults -M sabrelite
qemu-system-aarch64: Unknown device 'sst25vf016b' for bus 'SSI'
Aborted (core dumped)
I got it working using the following snippet:
-- >8 --
@@ -186,6 +186,7 @@ config REALVIEW
config SABRELITE
bool
select FSL_IMX6
+ select SSI_M25P80
config STELLARIS
bool
@@ -321,6 +322,7 @@ config FSL_IMX6
select A9MPCORE
select IMX
select IMX_I2C
+ select IMX_FEC
select SDHCI
config ASPEED_SOC
---
With this snippet amended:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> +
> config STELLARIS
> bool
> select ARM_V7M
> @@ -289,6 +293,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 4f591ca487..fadd69882c 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 22/29] hw/arm: Express dependencies of sabrelite with Kconfig
@ 2019-04-25 16:43 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:43 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
Hi Thomas,
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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 76508e3910..ef7dd7156a 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -33,6 +33,7 @@ CONFIG_NETDUINO2=y
> CONFIG_MPS2=y
> CONFIG_RASPI=y
> CONFIG_DIGIC=y
> +CONFIG_SABRELITE=y
>
> CONFIG_VGA=y
> CONFIG_SSI_M25P80=y
> @@ -40,13 +41,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 059fb8282c..065c7acf1b 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -177,6 +177,10 @@ config REALVIEW
> select DS1338 # I2C RTC+NVRAM
> select USB_OHCI
>
> +config SABRELITE
> + bool
> + select FSL_IMX6
This one crashes:
$ qemu-system-aarch64 -display none -M sabrelite
ERROR:/source/qemu/qom/object.c:454:object_initialize_with_type:
assertion failed: (type != NULL)
Aborted (core dumped)
(gdb) bt
#3 0x00007f71139fb4de in g_assertion_message_expr () at
/lib64/libglib-2.0.so.0
[...]
#8 0x000055a148c5eec9 in sysbus_init_child_obj
(parent=parent@entry=0x55a14a2fbe10,
childname=childname@entry=0x55a148ed3713 "eth",
child=child@entry=0x55a14a33e0a0, childsize=childsize@entry=27296,
childtype=childtype@entry=0x55a148ed370a "imx.enet")
at /source/qemu/hw/core/sysbus.c:373
#9 0x000055a148b37b82 in fsl_imx6_init (obj=0x55a14a2fbe10) at
/source/qemu/hw/arm/fsl-imx6.c:91
#10 0x000055a148d0fb17 in object_initialize_with_type
(data=data@entry=0x55a14a2fbe10, size=size@entry=299248,
type=0x55a14a27dbd0) at /source/qemu/qom/object.c:466
#11 0x000055a148d0fe5d in object_initialize
(data=data@entry=0x55a14a2fbe10, size=size@entry=299248,
typename=typename@entry=0x55a148ed3328 "fsl,imx6") at
/source/qemu/qom/object.c:474
#12 0x000055a148b35ced in sabrelite_init (machine=0x55a14a2c1300) at
/source/qemu/hw/arm/sabrelite.c:58
#13 0x000055a148c608bb in machine_run_board_init
(machine=0x55a14a2c1300) at /source/qemu/hw/core/machine.c:1030
[...]
Then:
$ qemu-system-aarch64 -display none -nodefaults -M sabrelite
qemu-system-aarch64: Unknown device 'sst25vf016b' for bus 'SSI'
Aborted (core dumped)
I got it working using the following snippet:
-- >8 --
@@ -186,6 +186,7 @@ config REALVIEW
config SABRELITE
bool
select FSL_IMX6
+ select SSI_M25P80
config STELLARIS
bool
@@ -321,6 +322,7 @@ config FSL_IMX6
select A9MPCORE
select IMX
select IMX_I2C
+ select IMX_FEC
select SDHCI
config ASPEED_SOC
---
With this snippet amended:
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> +
> config STELLARIS
> bool
> select ARM_V7M
> @@ -289,6 +293,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 4f591ca487..fadd69882c 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
>
^ permalink raw reply [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 22/29] hw/arm: Express dependencies of sabrelite with Kconfig
@ 2019-04-29 16:11 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-29 16:11 UTC (permalink / raw)
To: Philippe Mathieu-Daudé,
yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 25/04/2019 18.43, Philippe Mathieu-Daudé wrote:
> Hi Thomas,
>
> On 4/18/19 8:00 PM, Thomas Huth wrote:
>> 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 76508e3910..ef7dd7156a 100644
>> --- a/default-configs/arm-softmmu.mak
>> +++ b/default-configs/arm-softmmu.mak
>> @@ -33,6 +33,7 @@ CONFIG_NETDUINO2=y
>> CONFIG_MPS2=y
>> CONFIG_RASPI=y
>> CONFIG_DIGIC=y
>> +CONFIG_SABRELITE=y
>>
>> CONFIG_VGA=y
>> CONFIG_SSI_M25P80=y
>> @@ -40,13 +41,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 059fb8282c..065c7acf1b 100644
>> --- a/hw/arm/Kconfig
>> +++ b/hw/arm/Kconfig
>> @@ -177,6 +177,10 @@ config REALVIEW
>> select DS1338 # I2C RTC+NVRAM
>> select USB_OHCI
>>
>> +config SABRELITE
>> + bool
>> + select FSL_IMX6
>
> This one crashes:
>
> $ qemu-system-aarch64 -display none -M sabrelite
> ERROR:/source/qemu/qom/object.c:454:object_initialize_with_type:
> assertion failed: (type != NULL)
> Aborted (core dumped)
Weird, I was pretty sure to have tested all boards individually ... I
must accidentally have skipped this one. Thanks a lot for testing, I'll
fix it in v6.
Thomas
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 22/29] hw/arm: Express dependencies of sabrelite with Kconfig
@ 2019-04-29 16:11 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-29 16:11 UTC (permalink / raw)
To: Philippe Mathieu-Daudé,
yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 25/04/2019 18.43, Philippe Mathieu-Daudé wrote:
> Hi Thomas,
>
> On 4/18/19 8:00 PM, Thomas Huth wrote:
>> 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 76508e3910..ef7dd7156a 100644
>> --- a/default-configs/arm-softmmu.mak
>> +++ b/default-configs/arm-softmmu.mak
>> @@ -33,6 +33,7 @@ CONFIG_NETDUINO2=y
>> CONFIG_MPS2=y
>> CONFIG_RASPI=y
>> CONFIG_DIGIC=y
>> +CONFIG_SABRELITE=y
>>
>> CONFIG_VGA=y
>> CONFIG_SSI_M25P80=y
>> @@ -40,13 +41,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 059fb8282c..065c7acf1b 100644
>> --- a/hw/arm/Kconfig
>> +++ b/hw/arm/Kconfig
>> @@ -177,6 +177,10 @@ config REALVIEW
>> select DS1338 # I2C RTC+NVRAM
>> select USB_OHCI
>>
>> +config SABRELITE
>> + bool
>> + select FSL_IMX6
>
> This one crashes:
>
> $ qemu-system-aarch64 -display none -M sabrelite
> ERROR:/source/qemu/qom/object.c:454:object_initialize_with_type:
> assertion failed: (type != NULL)
> Aborted (core dumped)
Weird, I was pretty sure to have tested all boards individually ... I
must accidentally have skipped this one. Thanks a lot for testing, I'll
fix it in v6.
Thomas
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 23/29] hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
Add Kconfig dependencies for the emcraft-sf2 machine - we also
distinguish 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 ef7dd7156a..1455d083d8 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -34,9 +34,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
@@ -49,5 +49,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 065c7acf1b..f5cd63860d 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -331,9 +331,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 fadd69882c..eae9f6c442 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_MUSCA) += musca.o
obj-$(CONFIG_ARMSSE) += armsse.o
obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 23/29] hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Add Kconfig dependencies for the emcraft-sf2 machine - we also
distinguish 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 ef7dd7156a..1455d083d8 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -34,9 +34,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
@@ -49,5 +49,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 065c7acf1b..f5cd63860d 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -331,9 +331,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 fadd69882c..eae9f6c442 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_MUSCA) += musca.o
obj-$(CONFIG_ARMSSE) += armsse.o
obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 23/29] hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with Kconfig
@ 2019-04-20 10:52 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-20 10:52 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Add Kconfig dependencies for the emcraft-sf2 machine - we also
> distinguish between the machine (CONFIG_EMCRAFT_SF2) and the SoC
> (CONFIG_MSF2) now.
Thanks!
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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 ef7dd7156a..1455d083d8 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -34,9 +34,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
> @@ -49,5 +49,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 065c7acf1b..f5cd63860d 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -331,9 +331,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 fadd69882c..eae9f6c442 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_MUSCA) += musca.o
> obj-$(CONFIG_ARMSSE) += armsse.o
> obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 23/29] hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with Kconfig
@ 2019-04-20 10:52 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-20 10:52 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Add Kconfig dependencies for the emcraft-sf2 machine - we also
> distinguish between the machine (CONFIG_EMCRAFT_SF2) and the SoC
> (CONFIG_MSF2) now.
Thanks!
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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 ef7dd7156a..1455d083d8 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -34,9 +34,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
> @@ -49,5 +49,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 065c7acf1b..f5cd63860d 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -331,9 +331,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 fadd69882c..eae9f6c442 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_MUSCA) += musca.o
> obj-$(CONFIG_ARMSSE) += armsse.o
> obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 24/29] hw/arm: Express dependencies for remaining IMX boards with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 1455d083d8..6dc388c43e 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -37,7 +37,6 @@ CONFIG_SABRELITE=y
CONFIG_EMCRAFT_SF2=y
CONFIG_VGA=y
-CONFIG_IMX_FEC=y
CONFIG_NRF51_SOC=y
@@ -49,4 +48,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 f5cd63860d..58439c492a 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -283,6 +283,10 @@ config XLNX_VERSAL
config FSL_IMX25
bool
+ select IMX
+ select IMX_FEC
+ select IMX_I2C
+ select DS1338
config FSL_IMX31
bool
@@ -296,6 +300,7 @@ config FSL_IMX6
select A9MPCORE
select IMX
select IMX_I2C
+ select SDHCI
config ASPEED_SOC
bool
@@ -321,12 +326,26 @@ config MPS2
config FSL_IMX7
bool
+ imply PCI_DEVICES
+ imply TEST_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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 24/29] hw/arm: Express dependencies for remaining IMX boards with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 1455d083d8..6dc388c43e 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -37,7 +37,6 @@ CONFIG_SABRELITE=y
CONFIG_EMCRAFT_SF2=y
CONFIG_VGA=y
-CONFIG_IMX_FEC=y
CONFIG_NRF51_SOC=y
@@ -49,4 +48,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 f5cd63860d..58439c492a 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -283,6 +283,10 @@ config XLNX_VERSAL
config FSL_IMX25
bool
+ select IMX
+ select IMX_FEC
+ select IMX_I2C
+ select DS1338
config FSL_IMX31
bool
@@ -296,6 +300,7 @@ config FSL_IMX6
select A9MPCORE
select IMX
select IMX_I2C
+ select SDHCI
config ASPEED_SOC
bool
@@ -321,12 +326,26 @@ config MPS2
config FSL_IMX7
bool
+ imply PCI_DEVICES
+ imply TEST_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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 24/29] hw/arm: Express dependencies for remaining IMX boards with Kconfig
@ 2019-04-25 16:13 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:13 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> IMX25, IMX7 and IMX6UL were still missing the Kconfig dependencies.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 2 --
> hw/arm/Kconfig | 19 +++++++++++++++++++
> 2 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 1455d083d8..6dc388c43e 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -37,7 +37,6 @@ CONFIG_SABRELITE=y
> CONFIG_EMCRAFT_SF2=y
>
> CONFIG_VGA=y
> -CONFIG_IMX_FEC=y
>
> CONFIG_NRF51_SOC=y
>
> @@ -49,4 +48,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 f5cd63860d..58439c492a 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -283,6 +283,10 @@ config XLNX_VERSAL
>
> config FSL_IMX25
> bool
> + select IMX
> + select IMX_FEC
> + select IMX_I2C
> + select DS1338
>
> config FSL_IMX31
> bool
> @@ -296,6 +300,7 @@ config FSL_IMX6
> select A9MPCORE
> select IMX
> select IMX_I2C
> + select SDHCI
>
> config ASPEED_SOC
> bool
> @@ -321,12 +326,26 @@ config MPS2
>
> config FSL_IMX7
> bool
> + imply PCI_DEVICES
> + imply TEST_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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 24/29] hw/arm: Express dependencies for remaining IMX boards with Kconfig
@ 2019-04-25 16:13 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:13 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> IMX25, IMX7 and IMX6UL were still missing the Kconfig dependencies.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> default-configs/arm-softmmu.mak | 2 --
> hw/arm/Kconfig | 19 +++++++++++++++++++
> 2 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 1455d083d8..6dc388c43e 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -37,7 +37,6 @@ CONFIG_SABRELITE=y
> CONFIG_EMCRAFT_SF2=y
>
> CONFIG_VGA=y
> -CONFIG_IMX_FEC=y
>
> CONFIG_NRF51_SOC=y
>
> @@ -49,4 +48,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 f5cd63860d..58439c492a 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -283,6 +283,10 @@ config XLNX_VERSAL
>
> config FSL_IMX25
> bool
> + select IMX
> + select IMX_FEC
> + select IMX_I2C
> + select DS1338
>
> config FSL_IMX31
> bool
> @@ -296,6 +300,7 @@ config FSL_IMX6
> select A9MPCORE
> select IMX
> select IMX_I2C
> + select SDHCI
>
> config ASPEED_SOC
> bool
> @@ -321,12 +326,26 @@ config MPS2
>
> config FSL_IMX7
> bool
> + imply PCI_DEVICES
> + imply TEST_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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 24/29] hw/arm: Express dependencies for remaining IMX boards with Kconfig
@ 2019-04-25 16:28 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:28 UTC (permalink / raw)
To: Thomas Huth, Yang Zhong, Peter Maydell, QEMU Developers, Paolo Bonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, Qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On Thu, Apr 25, 2019 at 6:14 PM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
> On 4/18/19 8:00 PM, Thomas Huth wrote:
> > IMX25, IMX7 and IMX6UL were still missing the Kconfig dependencies.
> >
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> > ---
> > default-configs/arm-softmmu.mak | 2 --
> > hw/arm/Kconfig | 19 +++++++++++++++++++
> > 2 files changed, 19 insertions(+), 2 deletions(-)
> >
> > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> > index 1455d083d8..6dc388c43e 100644
> > --- a/default-configs/arm-softmmu.mak
> > +++ b/default-configs/arm-softmmu.mak
> > @@ -37,7 +37,6 @@ CONFIG_SABRELITE=y
> > CONFIG_EMCRAFT_SF2=y
> >
> > CONFIG_VGA=y
> > -CONFIG_IMX_FEC=y
> >
> > CONFIG_NRF51_SOC=y
> >
> > @@ -49,4 +48,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 f5cd63860d..58439c492a 100644
> > --- a/hw/arm/Kconfig
> > +++ b/hw/arm/Kconfig
> > @@ -283,6 +283,10 @@ config XLNX_VERSAL
> >
> > config FSL_IMX25
> > bool
> > + select IMX
At some point we should split the IMX config in hw/misc/Kconfig.
> > + select IMX_FEC
> > + select IMX_I2C
> > + select DS1338
[...]
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 24/29] hw/arm: Express dependencies for remaining IMX boards with Kconfig
@ 2019-04-25 16:28 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:28 UTC (permalink / raw)
To: Thomas Huth, Yang Zhong, Peter Maydell, QEMU Developers, Paolo Bonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, Qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On Thu, Apr 25, 2019 at 6:14 PM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
> On 4/18/19 8:00 PM, Thomas Huth wrote:
> > IMX25, IMX7 and IMX6UL were still missing the Kconfig dependencies.
> >
> > Signed-off-by: Thomas Huth <thuth@redhat.com>
>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>
> > ---
> > default-configs/arm-softmmu.mak | 2 --
> > hw/arm/Kconfig | 19 +++++++++++++++++++
> > 2 files changed, 19 insertions(+), 2 deletions(-)
> >
> > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> > index 1455d083d8..6dc388c43e 100644
> > --- a/default-configs/arm-softmmu.mak
> > +++ b/default-configs/arm-softmmu.mak
> > @@ -37,7 +37,6 @@ CONFIG_SABRELITE=y
> > CONFIG_EMCRAFT_SF2=y
> >
> > CONFIG_VGA=y
> > -CONFIG_IMX_FEC=y
> >
> > CONFIG_NRF51_SOC=y
> >
> > @@ -49,4 +48,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 f5cd63860d..58439c492a 100644
> > --- a/hw/arm/Kconfig
> > +++ b/hw/arm/Kconfig
> > @@ -283,6 +283,10 @@ config XLNX_VERSAL
> >
> > config FSL_IMX25
> > bool
> > + select IMX
At some point we should split the IMX config in hw/misc/Kconfig.
> > + select IMX_FEC
> > + select IMX_I2C
> > + select DS1338
[...]
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 25/29] hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 6dc388c43e..233937f394 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -35,11 +35,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 58439c492a..708eae19e5 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -347,8 +347,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 eae9f6c442..994e67dd0d 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
@@ -48,4 +49,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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 25/29] hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 6dc388c43e..233937f394 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -35,11 +35,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 58439c492a..708eae19e5 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -347,8 +347,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 eae9f6c442..994e67dd0d 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
@@ -48,4 +49,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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 25/29] hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig
@ 2019-04-19 21:13 ` Alistair Francis
0 siblings, 0 replies; 148+ messages in thread
From: Alistair Francis @ 2019-04-19 21:13 UTC (permalink / raw)
To: Thomas Huth
Cc: Yang Zhong, Peter Maydell, qemu-devel@nongnu.org Developers,
Paolo Bonzini, Michael S. Tsirkin, Gerd Hoffmann,
Edgar E . Iglesias, Jean-Christophe Dubois, Rob Herring,
Qemu-block, Andrey Smirnov, Joel Stanley, Antony Pavlov,
Alistair Francis, Beniamino Galvani, qemu-arm, Peter Chubb,
Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Subbaraya Sundeep, Igor Mitsyanko,
Jan Kiszka
On Thu, Apr 18, 2019 at 11:23 AM Thomas Huth <thuth@redhat.com> wrote:
>
> Add Kconfig dependencies for the NRF51 / microbit machine.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> 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 6dc388c43e..233937f394 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -35,11 +35,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 58439c492a..708eae19e5 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -347,8 +347,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 eae9f6c442..994e67dd0d 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
> @@ -48,4 +49,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
> --
> 2.21.0
>
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 25/29] hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig
@ 2019-04-19 21:13 ` Alistair Francis
0 siblings, 0 replies; 148+ messages in thread
From: Alistair Francis @ 2019-04-19 21:13 UTC (permalink / raw)
To: Thomas Huth
Cc: Peter Maydell, Jan Kiszka, Michael S. Tsirkin,
qemu-devel@nongnu.org Developers, Gerd Hoffmann,
Edgar E . Iglesias, Subbaraya Sundeep, Yang Zhong, Rob Herring,
Qemu-block, Andrey Smirnov, Antony Pavlov, Joel Stanley,
Alistair Francis, Beniamino Galvani, qemu-arm, Peter Chubb,
Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Jean-Christophe Dubois, Igor Mitsyanko,
Paolo Bonzini
On Thu, Apr 18, 2019 at 11:23 AM Thomas Huth <thuth@redhat.com> wrote:
>
> Add Kconfig dependencies for the NRF51 / microbit machine.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> 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 6dc388c43e..233937f394 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -35,11 +35,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 58439c492a..708eae19e5 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -347,8 +347,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 eae9f6c442..994e67dd0d 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
> @@ -48,4 +49,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
> --
> 2.21.0
>
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 25/29] hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig
@ 2019-04-25 21:27 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 21:27 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Add Kconfig dependencies for the NRF51 / microbit machine.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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 6dc388c43e..233937f394 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -35,11 +35,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 58439c492a..708eae19e5 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -347,8 +347,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 eae9f6c442..994e67dd0d 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
> @@ -48,4 +49,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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 25/29] hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig
@ 2019-04-25 21:27 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 21:27 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Add Kconfig dependencies for the NRF51 / microbit machine.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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 6dc388c43e..233937f394 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -35,11 +35,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 58439c492a..708eae19e5 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -347,8 +347,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 eae9f6c442..994e67dd0d 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
> @@ -48,4 +49,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
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 26/29] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 4ea9add003..3a4b15e7e8 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 708eae19e5..32e4cc50e5 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -277,6 +277,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 0577e68c8e..bb95f8d6a4 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -108,6 +108,7 @@ config VIRTIO_VGA
config DPCD
bool
+ select AUX
config ATI_VGA
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 26/29] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 4ea9add003..3a4b15e7e8 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 708eae19e5..32e4cc50e5 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -277,6 +277,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 0577e68c8e..bb95f8d6a4 100644
--- a/hw/display/Kconfig
+++ b/hw/display/Kconfig
@@ -108,6 +108,7 @@ config VIRTIO_VGA
config DPCD
bool
+ select AUX
config ATI_VGA
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 26/29] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
@ 2019-04-19 21:12 ` Alistair Francis
0 siblings, 0 replies; 148+ messages in thread
From: Alistair Francis @ 2019-04-19 21:12 UTC (permalink / raw)
To: Thomas Huth
Cc: Yang Zhong, Peter Maydell, qemu-devel@nongnu.org Developers,
Paolo Bonzini, Michael S. Tsirkin, Gerd Hoffmann,
Edgar E . Iglesias, Jean-Christophe Dubois, Rob Herring,
Qemu-block, Andrey Smirnov, Joel Stanley, Antony Pavlov,
Alistair Francis, Beniamino Galvani, qemu-arm, Peter Chubb,
Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Subbaraya Sundeep, Igor Mitsyanko,
Jan Kiszka
On Thu, Apr 18, 2019 at 11:15 AM Thomas Huth <thuth@redhat.com> wrote:
>
> This cleans up most settings in default-configs/aarch64-softmmu.mak.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> 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 4ea9add003..3a4b15e7e8 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 708eae19e5..32e4cc50e5 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -277,6 +277,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 0577e68c8e..bb95f8d6a4 100644
> --- a/hw/display/Kconfig
> +++ b/hw/display/Kconfig
> @@ -108,6 +108,7 @@ config VIRTIO_VGA
>
> config DPCD
> bool
> + select AUX
>
> config ATI_VGA
> bool
> --
> 2.21.0
>
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 26/29] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
@ 2019-04-19 21:12 ` Alistair Francis
0 siblings, 0 replies; 148+ messages in thread
From: Alistair Francis @ 2019-04-19 21:12 UTC (permalink / raw)
To: Thomas Huth
Cc: Peter Maydell, Jan Kiszka, Michael S. Tsirkin,
qemu-devel@nongnu.org Developers, Gerd Hoffmann,
Edgar E . Iglesias, Subbaraya Sundeep, Yang Zhong, Rob Herring,
Qemu-block, Andrey Smirnov, Antony Pavlov, Joel Stanley,
Alistair Francis, Beniamino Galvani, qemu-arm, Peter Chubb,
Cedric Le Goater, John Snow, Andrew Jeffery,
Philippe Mathieu-Daude, Jean-Christophe Dubois, Igor Mitsyanko,
Paolo Bonzini
On Thu, Apr 18, 2019 at 11:15 AM Thomas Huth <thuth@redhat.com> wrote:
>
> This cleans up most settings in default-configs/aarch64-softmmu.mak.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> 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 4ea9add003..3a4b15e7e8 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 708eae19e5..32e4cc50e5 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -277,6 +277,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 0577e68c8e..bb95f8d6a4 100644
> --- a/hw/display/Kconfig
> +++ b/hw/display/Kconfig
> @@ -108,6 +108,7 @@ config VIRTIO_VGA
>
> config DPCD
> bool
> + select AUX
>
> config ATI_VGA
> bool
> --
> 2.21.0
>
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 26/29] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
@ 2019-04-25 16:23 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:23 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> This cleans up most settings in default-configs/aarch64-softmmu.mak.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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 4ea9add003..3a4b15e7e8 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 708eae19e5..32e4cc50e5 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -277,6 +277,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 0577e68c8e..bb95f8d6a4 100644
> --- a/hw/display/Kconfig
> +++ b/hw/display/Kconfig
> @@ -108,6 +108,7 @@ config VIRTIO_VGA
>
> config DPCD
> bool
> + select AUX
>
> config ATI_VGA
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 26/29] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
@ 2019-04-25 16:23 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:23 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> This cleans up most settings in default-configs/aarch64-softmmu.mak.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@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 4ea9add003..3a4b15e7e8 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 708eae19e5..32e4cc50e5 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -277,6 +277,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 0577e68c8e..bb95f8d6a4 100644
> --- a/hw/display/Kconfig
> +++ b/hw/display/Kconfig
> @@ -108,6 +108,7 @@ config VIRTIO_VGA
>
> config DPCD
> bool
> + select AUX
>
> config ATI_VGA
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 27/29] hw/arm: Express dependencies of the xlnx-versal-virt machine with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 32e4cc50e5..22be1e1231 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -291,6 +291,10 @@ config XLNX_ZYNQMP_ARM
config XLNX_VERSAL
bool
+ select ARM_GIC
+ select PL011
+ select CADENCE
+ select VIRTIO_MMIO
config FSL_IMX25
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 27/29] hw/arm: Express dependencies of the xlnx-versal-virt machine with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 32e4cc50e5..22be1e1231 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -291,6 +291,10 @@ config XLNX_ZYNQMP_ARM
config XLNX_VERSAL
bool
+ select ARM_GIC
+ select PL011
+ select CADENCE
+ select VIRTIO_MMIO
config FSL_IMX25
bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 27/29] hw/arm: Express dependencies of the xlnx-versal-virt machine with Kconfig
@ 2019-04-25 16:15 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:15 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/arm/Kconfig | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 32e4cc50e5..22be1e1231 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -291,6 +291,10 @@ config XLNX_ZYNQMP_ARM
>
> config XLNX_VERSAL
> bool
> + select ARM_GIC
> + select PL011
> + select CADENCE
> + select VIRTIO_MMIO
>
> config FSL_IMX25
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 27/29] hw/arm: Express dependencies of the xlnx-versal-virt machine with Kconfig
@ 2019-04-25 16:15 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 16:15 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> 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>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/arm/Kconfig | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 32e4cc50e5..22be1e1231 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -291,6 +291,10 @@ config XLNX_ZYNQMP_ARM
>
> config XLNX_VERSAL
> bool
> + select ARM_GIC
> + select PL011
> + select CADENCE
> + select VIRTIO_MMIO
>
> config FSL_IMX25
> bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 28/29] hw/arm: Express dependencies of the musca machines with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
Dependencies have been determined with trial-and-error and by
looking at the musca.c source file.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/Kconfig | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 22be1e1231..eca8387050 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -75,6 +75,12 @@ config MAINSTONE
select PFLASH_CFI01
select SMC91C111
+config MUSCA
+ bool
+ select ARMSSE
+ select PL011
+ select PL031
+
config MUSICPAL
bool
select BITBANG_I2C
@@ -423,6 +429,3 @@ config ARMSSE_CPUID
config ARMSSE_MHU
bool
-
-config MUSCA
- bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* [Qemu-devel] [PATCH for-QEMU-4.1 v5 28/29] hw/arm: Express dependencies of the musca machines with Kconfig
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Dependencies have been determined with trial-and-error and by
looking at the musca.c source file.
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
hw/arm/Kconfig | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 22be1e1231..eca8387050 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -75,6 +75,12 @@ config MAINSTONE
select PFLASH_CFI01
select SMC91C111
+config MUSCA
+ bool
+ select ARMSSE
+ select PL011
+ select PL031
+
config MUSICPAL
bool
select BITBANG_I2C
@@ -423,6 +429,3 @@ config ARMSSE_CPUID
config ARMSSE_MHU
bool
-
-config MUSCA
- bool
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 28/29] hw/arm: Express dependencies of the musca machines with Kconfig
@ 2019-04-25 21:51 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 21:51 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Dependencies have been determined with trial-and-error and by
> looking at the musca.c source file.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/arm/Kconfig | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 22be1e1231..eca8387050 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -75,6 +75,12 @@ config MAINSTONE
> select PFLASH_CFI01
> select SMC91C111
>
> +config MUSCA
> + bool
> + select ARMSSE
> + select PL011
> + select PL031
> +
> config MUSICPAL
> bool
> select BITBANG_I2C
> @@ -423,6 +429,3 @@ config ARMSSE_CPUID
>
> config ARMSSE_MHU
> bool
> -
> -config MUSCA
> - bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 28/29] hw/arm: Express dependencies of the musca machines with Kconfig
@ 2019-04-25 21:51 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 21:51 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
On 4/18/19 8:00 PM, Thomas Huth wrote:
> Dependencies have been determined with trial-and-error and by
> looking at the musca.c source file.
>
> Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> hw/arm/Kconfig | 9 ++++++---
> 1 file changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 22be1e1231..eca8387050 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -75,6 +75,12 @@ config MAINSTONE
> select PFLASH_CFI01
> select SMC91C111
>
> +config MUSCA
> + bool
> + select ARMSSE
> + select PL011
> + select PL031
> +
> config MUSICPAL
> bool
> select BITBANG_I2C
> @@ -423,6 +429,3 @@ config ARMSSE_CPUID
>
> config ARMSSE_MHU
> bool
> -
> -config MUSCA
> - bool
>
^ permalink raw reply [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 29/29] hw/arm: Remove hard-enablement of the remaining PCI devices
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Beniamino Galvani, Jan Kiszka, Antony Pavlov, Peter Chubb,
qemu-block, Cedric Le Goater, Michael S. Tsirkin, Andrew Jeffery,
Igor Mitsyanko, Andrey Smirnov, Rob Herring, qemu-arm,
Andrzej Zaborowski, John Snow, Joel Stanley, Edgar E . Iglesias,
Jean-Christophe Dubois, Marcel Apfelbaum, Philippe Mathieu-Daude,
Alistair Francis, Subbaraya Sundeep, Gerd Hoffmann
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 233937f394..f23ecfd5c5 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -36,14 +36,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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread
* [Qemu-devel] [PATCH for-QEMU-4.1 v5 29/29] hw/arm: Remove hard-enablement of the remaining PCI devices
@ 2019-04-18 18:00 ` Thomas Huth
0 siblings, 0 replies; 148+ messages in thread
From: Thomas Huth @ 2019-04-18 18:00 UTC (permalink / raw)
To: yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
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 233937f394..f23ecfd5c5 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -36,14 +36,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
--
2.21.0
^ permalink raw reply related [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 00/29] Kconfig dependencies for ARM machines
@ 2019-04-25 22:51 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 22:51 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Michael S. Tsirkin, Gerd Hoffmann, Edgar E . Iglesias,
Jean-Christophe Dubois, Rob Herring, qemu-block, Andrey Smirnov,
Joel Stanley, Antony Pavlov, Alistair Francis, Beniamino Galvani,
qemu-arm, Peter Chubb, Cedric Le Goater, John Snow,
Andrew Jeffery, Philippe Mathieu-Daude, Subbaraya Sundeep,
Igor Mitsyanko, Jan Kiszka
Hi Thomas,
On 4/18/19 8:00 PM, Thomas Huth wrote:
> This series reworks the default-configs/arm-softmmu.mak and
> default-configs/aarch64-softmmu.mak files to use the new Kconfig-style
> dependencies instead.
>
> Some of the patches are slightly based on the work by Ákos Kovács:
>
> https://lists.nongnu.org/archive/html/qemu-devel/2013-08/msg03730.html
>
> The other patches have been created by looking at the sources and finding
> out the dependencies the hard way via trial-and-error (i.e. by enabling
> only one machine at a time and checking whether it can be compiled and
> started).
>
> v5:
> - Rebased the series to the current master branch
> - Added "hw/usb/hcd-ohci: Move PCI-related code into a separate file"
> patch and got rid of unneeded dependencies to CONFIG_PCI in the
> ARM machines that do not have a PCI bus
>
> v4:
> - Rebased the series to Paolo's latest kconfig tree
>
> v3:
> - Addressed review feedback from v2
> - Included patches to clean up the PCI dependencies of AHCI and SDHCI
> (so CONFIG_AHCI and CONFIG_SDHCI do not depend on CONFIG_PCI anymore)
> - Added an additional patch for the new "musca" machines
>
> v2: Adressed review-feedback from v1
> - CONFIG_SDHCI and CONFIG_AHCI now select CONFIG_PCI
> - Added switches for MICROBIT and EMCRAFT_SF2
>
> Thomas Huth (29):
> hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs
> hw/ide/ahci: Add a Kconfig switch for the AHDI-ICH9 device
> hw/usb/hcd-ohci: Move PCI-related code into a separate file
> hw/arm: Express dependencies of the exynos machines with Kconfig
> hw/arm: Express dependencies of the highbank machines with Kconfig
> hw/arm: Express dependencies of integratorcp with Kconfig
> hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig
> hw/arm: Express dependencies of musicpal with Kconfig
> hw/arm: Express dependencies of the OMAP machines with Kconfig
> hw/arm: Express dependencies of stellaris with Kconfig
> hw/arm: Express dependencies of realview, versatile and vexpress with
> Kconfig
> hw/arm: Express dependencies of the PXA2xx machines with Kconfig
> hw/arm: Express dependencies of xilinx-zynq with Kconfig
> hw/arm: Express dependencies of collie with Kconfig
> hw/arm: Express dependencies of the aspeed boards with Kconfig
> hw/arm: Express dependencies of the virt machine with Kconfig
> hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig
> hw/arm: Express dependencies of allwinner / cubieboard with Kconfig
> hw/arm: Express dependencies of the MPS2 boards with Kconfig
> hw/arm: Express dependencies of the raspi machines with Kconfig
> hw/arm: Express dependencies of canon-a1100 with Kconfig
> hw/arm: Express dependencies of sabrelite with Kconfig
> hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with
> Kconfig
> hw/arm: Express dependencies for remaining IMX boards with Kconfig
> hw/arm: Express dependencies of the microbit / nrf51 machine with
> Kconfig
> hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
> hw/arm: Express dependencies of the xlnx-versal-virt machine with
> Kconfig
> hw/arm: Express dependencies of the musca machines with Kconfig
> hw/arm: Remove hard-enablement of the remaining PCI devices
I tested each machines of your series.
I replaced patch #3 "hw/usb/hcd-ohci: Move PCI-related code into a
separate file" by your more recent series "Fix ohci_die() and move PCI
code to separate file",
https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg03344.html
So for all patches except 3/29:
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
(well, I also tested it, but expect you to use the splitted respin)
Regards,
Phil.
^ permalink raw reply [flat|nested] 148+ messages in thread
* Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 00/29] Kconfig dependencies for ARM machines
@ 2019-04-25 22:51 ` Philippe Mathieu-Daudé
0 siblings, 0 replies; 148+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-04-25 22:51 UTC (permalink / raw)
To: Thomas Huth, yang.zhong, Peter Maydell, qemu-devel, pbonzini
Cc: Rob Herring, Jan Kiszka, Igor Mitsyanko, qemu-block,
Michael S. Tsirkin, Andrey Smirnov, Alistair Francis,
Philippe Mathieu-Daude, Jean-Christophe Dubois,
Beniamino Galvani, Andrew Jeffery, Cedric Le Goater, qemu-arm,
Peter Chubb, Gerd Hoffmann, Antony Pavlov, Edgar E . Iglesias,
Subbaraya Sundeep, John Snow, Joel Stanley
Hi Thomas,
On 4/18/19 8:00 PM, Thomas Huth wrote:
> This series reworks the default-configs/arm-softmmu.mak and
> default-configs/aarch64-softmmu.mak files to use the new Kconfig-style
> dependencies instead.
>
> Some of the patches are slightly based on the work by Ákos Kovács:
>
> https://lists.nongnu.org/archive/html/qemu-devel/2013-08/msg03730.html
>
> The other patches have been created by looking at the sources and finding
> out the dependencies the hard way via trial-and-error (i.e. by enabling
> only one machine at a time and checking whether it can be compiled and
> started).
>
> v5:
> - Rebased the series to the current master branch
> - Added "hw/usb/hcd-ohci: Move PCI-related code into a separate file"
> patch and got rid of unneeded dependencies to CONFIG_PCI in the
> ARM machines that do not have a PCI bus
>
> v4:
> - Rebased the series to Paolo's latest kconfig tree
>
> v3:
> - Addressed review feedback from v2
> - Included patches to clean up the PCI dependencies of AHCI and SDHCI
> (so CONFIG_AHCI and CONFIG_SDHCI do not depend on CONFIG_PCI anymore)
> - Added an additional patch for the new "musca" machines
>
> v2: Adressed review-feedback from v1
> - CONFIG_SDHCI and CONFIG_AHCI now select CONFIG_PCI
> - Added switches for MICROBIT and EMCRAFT_SF2
>
> Thomas Huth (29):
> hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs
> hw/ide/ahci: Add a Kconfig switch for the AHDI-ICH9 device
> hw/usb/hcd-ohci: Move PCI-related code into a separate file
> hw/arm: Express dependencies of the exynos machines with Kconfig
> hw/arm: Express dependencies of the highbank machines with Kconfig
> hw/arm: Express dependencies of integratorcp with Kconfig
> hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig
> hw/arm: Express dependencies of musicpal with Kconfig
> hw/arm: Express dependencies of the OMAP machines with Kconfig
> hw/arm: Express dependencies of stellaris with Kconfig
> hw/arm: Express dependencies of realview, versatile and vexpress with
> Kconfig
> hw/arm: Express dependencies of the PXA2xx machines with Kconfig
> hw/arm: Express dependencies of xilinx-zynq with Kconfig
> hw/arm: Express dependencies of collie with Kconfig
> hw/arm: Express dependencies of the aspeed boards with Kconfig
> hw/arm: Express dependencies of the virt machine with Kconfig
> hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig
> hw/arm: Express dependencies of allwinner / cubieboard with Kconfig
> hw/arm: Express dependencies of the MPS2 boards with Kconfig
> hw/arm: Express dependencies of the raspi machines with Kconfig
> hw/arm: Express dependencies of canon-a1100 with Kconfig
> hw/arm: Express dependencies of sabrelite with Kconfig
> hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with
> Kconfig
> hw/arm: Express dependencies for remaining IMX boards with Kconfig
> hw/arm: Express dependencies of the microbit / nrf51 machine with
> Kconfig
> hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
> hw/arm: Express dependencies of the xlnx-versal-virt machine with
> Kconfig
> hw/arm: Express dependencies of the musca machines with Kconfig
> hw/arm: Remove hard-enablement of the remaining PCI devices
I tested each machines of your series.
I replaced patch #3 "hw/usb/hcd-ohci: Move PCI-related code into a
separate file" by your more recent series "Fix ohci_die() and move PCI
code to separate file",
https://lists.gnu.org/archive/html/qemu-devel/2019-04/msg03344.html
So for all patches except 3/29:
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
(well, I also tested it, but expect you to use the splitted respin)
Regards,
Phil.
^ permalink raw reply [flat|nested] 148+ messages in thread