Kconfig dependencies for ARM machines
v5 cover Kconfig dependencies for ARM machines
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
Signature · 1 line
2.21.0
PATCH v5 1/29 hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs
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.
--- hw/pci/pci-stub.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
hw/pci/pci-stub.c +11 -0
@@ -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 (); +}
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 01/29] hw/pci/pci-stub: Add msi_enabled() and msi_notify() to the pci stubs
Quoted 23 lines · Thomas Huth
Some machines have an AHCI adapter, but no PCI. To be able to compile
hw/ide/ahci.cwithoutCONFIG_PCI, we still need the two functionsmsi_enabled()andmsi_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 <[email protected]>Signed-off-by Thomas Huth <[email protected]>--- hw/pci/pci-stub.c | 11 +++++++++++ 1 file changed, 11 insertions(+)hw/pci/pci-stub.c +1
-0@@ -53,3 +53,14 @@ uint16_t pci_requester_id(PCIDevice *dev)g_assert (false);return 0 ; } +
hw/pci/pci-stub.c uint16_t pci_requester_id(PCIDevice *dev) · line 66
Quoted 10 lines
hw/pci/pci-stub.c +10
-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 (); +}
PATCH v5 2/29 hw/ide/ahci: Add a Kconfig switch for the AHDI-ICH9 device
In reply to Thomas HuthSome 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.
--- hw/ide/Kconfig | 6 +++++- hw/ide/Makefile.objs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-)
hw/ide/Kconfig +5 -1
@@ -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
hw/ide/Makefile.objs +1 -1
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 02/29] hw/ide/ahci: Add a Kconfig switch for the AHDI-ICH9 device
Quoted 14 lines · Thomas Huth
Some of our machines (like the ARM cubieboard) use
CONFIG_AHCIfor an AHCI sysbus device, but do not useCONFIG_PCIsince they do not feature a PCI bus. WithCONFIG_AHCIbut withoutCONFIG_PCI, currently linking fails:
../hw/ide/ich.o: In function `pci_ich9_ahci_realize':
hw/ide/ich.c:124: undefined reference topci_allocate_irq' hw/ide/ich.c:126: undefined reference topci_register_bar'hw/ide/ich.c:128: undefined reference topci_register_bar' hw/ide/ich.c:131: undefined reference topci_add_capability'hw/ide/ich.c:147: undefined reference tomsi_init' ../hw/ide/ich.o: In functionpci_ich9_uninit':
hw/ide/ich.c:158: undefined reference tomsi_uninit' ../hw/ide/ich.o:(.data.rel+0x50): undefined reference tovmstate_pci_device'
Quoted 4 lines
We must only compile
ich.cifCONFIG_PCIis available, too, so introduce a new config switch for this device.Signed-off-by Thomas Huth <[email protected]>
Quoted 38 lines
--- hw/ide/Kconfig | 6 +++++- hw/ide/Makefile.objs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-)hw/ide/Kconfig +5
-1@@ -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 boolhw/ide/Makefile.objs +1
-1@@ -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
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 02/29] hw/ide/ahci: Add a Kconfig switch for the AHDI-ICH9 device
Quoted 15 lines · Philippe Mathieu-Daudé
Quoted 14 lines · Thomas Huth
Some of our machines (like the ARM cubieboard) use
CONFIG_AHCIfor an AHCI sysbus device, but do not useCONFIG_PCIsince they do not feature a PCI bus. WithCONFIG_AHCIbut withoutCONFIG_PCI, currently linking fails:
../hw/ide/ich.o: In function `pci_ich9_ahci_realize':
hw/ide/ich.c:124: undefined reference topci_allocate_irq' hw/ide/ich.c:126: undefined reference topci_register_bar'hw/ide/ich.c:128: undefined reference topci_register_bar' hw/ide/ich.c:131: undefined reference topci_add_capability'hw/ide/ich.c:147: undefined reference tomsi_init' ../hw/ide/ich.o: In functionpci_ich9_uninit':
hw/ide/ich.c:158: undefined reference tomsi_uninit' ../hw/ide/ich.o:(.data.rel+0x50): undefined reference tovmstate_pci_device'
Quoted 6 lines
Quoted 4 lines
We must only compile
ich.cifCONFIG_PCIis available, too, so introduce a new config switch for this device.Signed-off-by Thomas Huth <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Oops, "AHCI" in patch subject (D -> C).
PATCH v5 3/29 hw/usb/hcd-ohci: Move PCI-related code into a separate file
In reply to Thomas HuthSome 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.
--- 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
hw/usb/Kconfig +5 -1
@@ -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
hw/usb/Makefile.objs +1 -0
@@ -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
hw/usb/hcd-ohci-pci.c new file +166 -0
166 lines not on this page · raw message
hw/usb/hcd-ohci.c +17 -227
352 lines not on this page · raw message
hw/usb/hcd-ohci.h new file +132 -0
132 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v5 4/29 hw/arm: Express dependencies of the exynos machines with Kconfig
In reply to Thomas HuthAdd 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).
--- default-configs/arm-softmmu.mak | 17 ++++++----------- hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 16 insertions(+), 11 deletions(-)
default-configs/arm-softmmu.mak +6 -11
@@ -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
hw/arm/Kconfig +10 -0
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 04/29] hw/arm: Express dependencies of the exynos machines with Kconfig
Quoted 93 lines · Thomas Huth
Add
Kconfigdependencies 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 ARMKconfig" patch).Signed-off-by Thomas Huth <[email protected]>--- default-configs/arm-softmmu.mak | 17 ++++++----------- hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 16 insertions(+), 11 deletions(-)default-configs/arm-softmmu.mak +6
-11@@ -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=yhw/arm/Kconfig +0
-0
hw/arm/Kconfig config DIGIC · line 17
Quoted 10 lines
hw/arm/Kconfig +6
-0@@ -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,
Quoted 15 lines
hw/arm/Kconfig +4
-0config 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
PATCH v5 5/29 hw/arm: Express dependencies of the highbank machines with Kconfig
In reply to Thomas HuthAdd 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).
--- default-configs/arm-softmmu.mak | 9 +-------- hw/arm/Kconfig | 11 +++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-)
default-configs/arm-softmmu.mak +1 -8
@@ -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
hw/arm/Kconfig +11 -0
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 05/29] hw/arm: Express dependencies of the highbank machines with Kconfig
Quoted 65 lines · Thomas Huth
Add
Kconfigdependencies 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 ARMKconfig" patch).Signed-off-by Thomas Huth <[email protected]>--- default-configs/arm-softmmu.mak | 9 +-------- hw/arm/Kconfig | 11 +++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-)default-configs/arm-softmmu.mak +1
-8@@ -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 versatilepbhw/arm/Kconfig +1
-0@@ -18,6 +18,17 @@ config EXYNOS4 config HIGHBANK bool + select A9MPCORE
hw/arm/Kconfig config EXYNOS4 · line 31
Quoted 10 lines
hw/arm/Kconfig +10
-0+ 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:
Quoted 4 lines
hw/arm/Kconfig +0
-0config INTEGRATOR bool
PATCH v5 6/29 hw/arm: Express dependencies of integratorcp with Kconfig
In reply to Thomas HuthThis patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch).
--- default-configs/arm-softmmu.mak | 8 +------- hw/arm/Kconfig | 8 ++++++++ hw/display/Kconfig | 1 + 3 files changed, 10 insertions(+), 7 deletions(-)
default-configs/arm-softmmu.mak +1 -7
@@ -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
hw/arm/Kconfig +8 -0
@@ -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
hw/display/Kconfig +1 -0
@@ -21,6 +21,7 @@ config JAZZ_LED config PL110 bool + select FRAMEBUFFER config SII9022 bool
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 06/29] hw/arm: Express dependencies of integratorcp with Kconfig
Hi Thomas,
Quoted 31 lines · Thomas Huth
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 <[email protected]>--- default-configs/arm-softmmu.mak | 8 +------- hw/arm/Kconfig | 8 ++++++++ hw/display/Kconfig | 1 + 3 files changed, 10 insertions(+), 7 deletions(-)default-configs/arm-softmmu.mak +1
-1@@ -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
default-configs/arm-softmmu.mak CONFIG_ARM11MPCORE=y · line 53
Quoted 4 lines
default-configs/arm-softmmu.mak +0
-1@@ -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).
default-configs/arm-softmmu.mak CONFIG_ARM11MPCORE=y · line 55
Quoted 2 lines
default-configs/arm-softmmu.mak +0
-1CONFIG_PL080=y -CONFIG_PL110=y
Ditto,
default-configs/arm-softmmu.mak CONFIG_ARM11MPCORE=y · line 56
Quoted 1 line
default-configs/arm-softmmu.mak +0
-1-CONFIG_PL181=y
Ditto.
Quoted 45 lines
default-configs/arm-softmmu.mak +0
-3CONFIG_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=yhw/arm/Kconfig +8
-0@@ -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 boolhw/display/Kconfig +1
-0@@ -21,6 +21,7 @@ config JAZZ_LED config PL110 bool + select FRAMEBUFFER config SII9022 bool
Philippe Mathieu-Daudé
Reviewed-byRe: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 06/29] hw/arm: Express dependencies of integratorcp with Kconfig
Quoted 36 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 33 lines · Thomas Huth
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 <[email protected]>--- default-configs/arm-softmmu.mak | 8 +------- hw/arm/Kconfig | 8 ++++++++ hw/display/Kconfig | 1 + 3 files changed, 10 insertions(+), 7 deletions(-)default-configs/arm-softmmu.mak +1
-1@@ -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
Quoted 5 lines
default-configs/arm-softmmu.mak CONFIG_ARM11MPCORE=y · line 53
Quoted 2 lines
default-configs/arm-softmmu.mak +0
-1CONFIG_PL041=y -CONFIG_PL050=yYou 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:
Quoted 55 lines
default-configs/arm-softmmu.mak CONFIG_ARM11MPCORE=y · line 55
Quoted 3 lines
default-configs/arm-softmmu.mak +0
-1CONFIG_PL080=y -CONFIG_PL110=yDitto,
default-configs/arm-softmmu.mak CONFIG_ARM11MPCORE=y · line 56
Quoted 1 line
default-configs/arm-softmmu.mak +0
-1-CONFIG_PL181=yDitto.
Quoted 45 lines
default-configs/arm-softmmu.mak +0
-3CONFIG_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=yhw/arm/Kconfig +8
-0@@ -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 boolhw/display/Kconfig +1
-0@@ -21,6 +21,7 @@ config JAZZ_LED config PL110 bool + select FRAMEBUFFER config SII9022 bool
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 06/29] hw/arm: Express dependencies of integratorcp with Kconfig
Quoted 43 lines · Philippe Mathieu-Daudé
Quoted 36 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 33 lines · Thomas Huth
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 <[email protected]>--- default-configs/arm-softmmu.mak | 8 +------- hw/arm/Kconfig | 8 ++++++++ hw/display/Kconfig | 1 + 3 files changed, 10 insertions(+), 7 deletions(-)default-configs/arm-softmmu.mak +1
-1@@ -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=yQuoted 5 lines
default-configs/arm-softmmu.mak CONFIG_ARM11MPCORE=y · line 53
Quoted 2 lines
default-configs/arm-softmmu.mak +0
-1CONFIG_PL041=y -CONFIG_PL050=yYou remove this device but it is used by the realview/versatile/vexpress (you add it to these machines later in patch 11).
Quoted 3 lines
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.
Quoted 2 lines
Since it is very unlikely:
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Thanks!
Thomas
PATCH v5 7/29 hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig
In reply to Thomas HuthAdd 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).
--- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 4 ++++ hw/misc/Kconfig | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-)
default-configs/arm-softmmu.mak +1 -2
@@ -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
hw/arm/Kconfig +4 -0
@@ -98,6 +98,10 @@ config FSL_IMX25 config FSL_IMX31 bool + select SERIAL + select IMX + select IMX_I2C + select LAN9118 config FSL_IMX6 bool
hw/misc/Kconfig +2 -0
@@ -76,6 +76,8 @@ config ECCMEMCTL config IMX bool select PTIMER + select SSI + select USB_EHCI_SYSBUS config STM32F2XX_SYSCFG bool
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 07/29] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Thomas" == Thomas Huth <[email protected]> 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 <[email protected]>
--
Dr Peter Chubb Tel: +61 2 9490 5852 http://ts.data61.csiro.au/
Trustworthy Systems Group Data61, CSIRO (formerly NICTA)
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 07/29] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig
In reply to Thomas HuthQuoted 44 lines · Thomas Huth
Add
Kconfigdependencies 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 ARMKconfig" patch).Signed-off-by Thomas Huth <[email protected]>--- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 4 ++++ hw/misc/Kconfig | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-)default-configs/arm-softmmu.mak +1
-2@@ -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=yhw/arm/Kconfig +0
-0
hw/arm/Kconfig config FSL_IMX25 · line 104
Quoted 7 lines
hw/arm/Kconfig +4
-0@@ -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:
Quoted 17 lines
hw/arm/Kconfig +0
-0config FSL_IMX6 boolhw/misc/Kconfig +2
-0@@ -76,6 +76,8 @@ config ECCMEMCTL config IMX bool select PTIMER + select SSI + select USB_EHCI_SYSBUS config STM32F2XX_SYSCFG bool
PATCH v5 8/29 hw/arm: Express dependencies of musicpal with Kconfig
In reply to Thomas HuthThis patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch).
--- default-configs/arm-softmmu.mak | 6 +----- hw/arm/Kconfig | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-)
default-configs/arm-softmmu.mak +1 -5
@@ -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
hw/arm/Kconfig +5 -0
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 08/29] hw/arm: Express dependencies of musicpal with Kconfig
Quoted 4 lines · Thomas Huth
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 <[email protected]>
Quoted 73 lines
--- default-configs/arm-softmmu.mak | 6 +----- hw/arm/Kconfig | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-)default-configs/arm-softmmu.mak +1
-5@@ -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=yhw/arm/Kconfig +5
-0@@ -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
PATCH v5 9/29 hw/arm: Express dependencies of the OMAP machines with Kconfig
In reply to Thomas HuthAdd 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).
--- default-configs/arm-softmmu.mak | 17 ++++------------- hw/arm/Kconfig | 25 +++++++++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 31 insertions(+), 14 deletions(-)
default-configs/arm-softmmu.mak +4 -13
@@ -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
hw/arm/Kconfig +25 -0
@@ -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
hw/arm/Makefile.objs +2 -1
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 09/29] hw/arm: Express dependencies of the OMAP machines with Kconfig
Quoted 17 lines · Thomas Huth
Add
Kconfigdependencies 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 ARMKconfig" patch).Signed-off-by Thomas Huth <[email protected]>--- default-configs/arm-softmmu.mak | 17 ++++------------- hw/arm/Kconfig | 25 +++++++++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 31 insertions(+), 14 deletions(-)default-configs/arm-softmmu.mak +0
-0
default-configs/arm-softmmu.mak CONFIG_HIGHBANK=y · line 16
Quoted 5 lines
default-configs/arm-softmmu.mak +2
-0@@ -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.
Quoted 109 lines
default-configs/arm-softmmu.mak +2
-13+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=yhw/arm/Kconfig +25
-0@@ -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 boolhw/arm/Makefile.objs +2
-1@@ -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
PATCH v5 10/29 hw/arm: Express dependencies of stellaris with Kconfig
In reply to Thomas HuthThis patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch).
--- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-)
default-configs/arm-softmmu.mak +1 -6
@@ -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
hw/arm/Kconfig +10 -0
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
Hi Thomas,
Quoted 46 lines · Thomas Huth
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 <[email protected]>--- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-)default-configs/arm-softmmu.mak +1
-6@@ -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=yhw/arm/Kconfig +0
-0@@ -91,6 +91,16 @@ config REALVIEW config STELLARIS bool
hw/arm/Kconfig config REALVIEW · line 103
Quoted 10 lines
hw/arm/Kconfig +10
-0+ 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 --
hw/arm/Kconfig +1 -1
@@ -200,6 +200,7 @@ config STELLARIS select SSI_SD select STELLARIS_INPUT select STELLARIS_ENET # ethernet + select CMSDK_APB_WATCHDOG # Luminary ---
Quoted 4 lines
hw/arm/Kconfig +0
-0config STRONGARM bool
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
Quoted 62 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 46 lines · Thomas Huth
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 <[email protected]>--- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-)default-configs/arm-softmmu.mak +1
-6@@ -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=yhw/arm/Kconfig +0
-0@@ -91,6 +91,16 @@ config REALVIEW config STELLARIS boolhw/arm/Kconfig config REALVIEW · line 103
Quoted 10 lines
hw/arm/Kconfig +10
-0+ 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 # ethernetThis one misses
CMSDK_APB_WATCHDOG:
Quoted 3 lines
$ 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
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 10/29] hw/arm: Express dependencies of stellaris with Kconfig
Quoted 63 lines · Thomas Huth
Quoted 62 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 46 lines · Thomas Huth
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 <[email protected]>--- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-)default-configs/arm-softmmu.mak +1
-6@@ -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=yhw/arm/Kconfig +0
-0@@ -91,6 +91,16 @@ config REALVIEW config STELLARIS boolhw/arm/Kconfig config REALVIEW · line 103
Quoted 10 lines
hw/arm/Kconfig +10
-0+ 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 # ethernetThis one misses
CMSDK_APB_WATCHDOG:
Quoted 7 lines
Quoted 3 lines
$ 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...
Quoted 4 lines
Thanks for catching it, I'll apply your fix in v6!
Thomas
PATCH v5 11/29 hw/arm: Express dependencies of realview, versatile and vexpress with Kconfig
In reply to Thomas HuthThis patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch).
--- 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(-)
default-configs/arm-softmmu.mak +5 -19
@@ -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
hw/arm/Kconfig +48 -0
66 lines not on this page · raw message
hw/arm/Makefile.objs +2 -1
@@ -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
hw/display/Kconfig +1 -0
@@ -26,6 +26,7 @@ config PL110 config SII9022 bool depends on I2C + select DDC config SSD0303 bool
hw/i2c/Kconfig +1 -1
@@ -12,7 +12,7 @@ config DDC config VERSATILE_I2C bool - select I2C + select BITBANG_I2C config ACPI_SMBUS bool
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 11/29] hw/arm: Express dependencies of realview, versatile and vexpress with Kconfig
Hi Thomas,
Quoted 99 lines · Thomas Huth
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 <[email protected]>--- 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(-)default-configs/arm-softmmu.mak +5
-19@@ -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=yhw/arm/Kconfig +0
-0@@ -88,6 +88,30 @@ config PXA2XX config REALVIEW
hw/arm/Kconfig config PXA2XX · line 99
Quoted 10 lines
hw/arm/Kconfig +9
-0bool + 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 ...
Quoted 19 lines
hw/arm/Kconfig +15
-0+ 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
hw/arm/Kconfig config SX1 · line 144
Quoted 10 lines
hw/arm/Kconfig +7
-0@@ -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...
Quoted 4 lines
hw/arm/Kconfig +4
-0+ select USB_OHCI + +config VEXPRESS + bool
hw/arm/Kconfig config SX1 · line 158
Quoted 10 lines
hw/arm/Kconfig +10
-0+ 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:
Quoted 53 lines
hw/arm/Kconfig +3
-0+ select SII9022 + select VIRTIO_MMIO config ZYNQ bool@@ -183,6 +230,7 @@ config A15MPCORE config ARM11MPCORE bool + select ARM11SCU config ARMSSE boolhw/arm/Makefile.objs +2
-1@@ -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.ohw/display/Kconfig +1
-0@@ -26,6 +26,7 @@ config PL110 config SII9022 bool depends on I2C + select DDC config SSD0303 boolhw/i2c/Kconfig +1
-1@@ -12,7 +12,7 @@ config DDC config VERSATILE_I2C bool - select I2C + select BITBANG_I2C config ACPI_SMBUS bool
PATCH v5 12/29 hw/arm: Express dependencies of the PXA2xx machines with Kconfig
In reply to Thomas HuthAdd 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).
--- default-configs/arm-softmmu.mak | 15 ++++-------- hw/arm/Kconfig | 42 +++++++++++++++++++++++++++++++++ hw/arm/Makefile.objs | 5 +++- 3 files changed, 51 insertions(+), 11 deletions(-)
default-configs/arm-softmmu.mak +5 -10
@@ -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
hw/arm/Kconfig +42 -0
60 lines not on this page · raw message
hw/arm/Makefile.objs +4 -1
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 12/29] hw/arm: Express dependencies of the PXA2xx machines with Kconfig
Quoted 6 lines · Thomas Huth
Add
Kconfigdependencies 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 ARMKconfig" patch).Signed-off-by Thomas Huth <[email protected]>
Quoted 139 lines
--- default-configs/arm-softmmu.mak | 15 ++++-------- hw/arm/Kconfig | 42 +++++++++++++++++++++++++++++++++ hw/arm/Makefile.objs | 5 +++- 3 files changed, 51 insertions(+), 11 deletions(-)default-configs/arm-softmmu.mak +5
-10@@ -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=yhw/arm/Kconfig +42
-0@@ -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 boolhw/arm/Makefile.objs +4
-1@@ -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
PATCH v5 13/29 hw/arm: Express dependencies of xilinx-zynq with Kconfig
In reply to Thomas HuthAdd 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).
--- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-)
default-configs/arm-softmmu.mak +1 -6
@@ -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
hw/arm/Kconfig +12 -0
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 13/29] hw/arm: Express dependencies of xilinx-zynq with Kconfig
Quoted 6 lines · Thomas Huth
Add
Kconfigdependencies for the xilinx-zynq-a9 board. This patch is based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARMKconfig" patch).Signed-off-by Thomas Huth <[email protected]>
Alistair
Quoted 69 lines
--- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-)default-configs/arm-softmmu.mak +1
-6@@ -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=yhw/arm/Kconfig +12
-1@@ -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
Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 13/29] hw/arm: Express dependencies of xilinx-zynq with Kconfig
In reply to Thomas HuthQuoted 5 lines · Thomas Huth
Add
Kconfigdependencies for the xilinx-zynq-a9 board. This patch is based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARMKconfig" patch).Signed-off-by Thomas Huth <[email protected]>
Quoted 66 lines
--- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+), 6 deletions(-)default-configs/arm-softmmu.mak +1
-6@@ -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=yhw/arm/Kconfig +12
-0@@ -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
PATCH v5 14/29 hw/arm: Express dependencies of collie with Kconfig
In reply to Thomas HuthAdd 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).
--- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 7 +++++++ hw/arm/Makefile.objs | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-)
default-configs/arm-softmmu.mak +1 -2
@@ -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
hw/arm/Kconfig +7 -0
@@ -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
hw/arm/Makefile.objs +1 -1
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 14/29] hw/arm: Express dependencies of collie with Kconfig
Quoted 5 lines · Thomas Huth
Add
Kconfigdependencies for the Strongarm collie machine. This patch is based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARMKconfig" patch).Signed-off-by Thomas Huth <[email protected]>
Quoted 56 lines
--- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 7 +++++++ hw/arm/Makefile.objs | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-)default-configs/arm-softmmu.mak +1
-2@@ -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=yhw/arm/Kconfig +7
-0@@ -168,6 +168,13 @@ config STELLARIS config STRONGARM bool + select PXA2XX + +config COLLIE + bool + select PFLASH_CFI01 + select ZAURUS # scoop + select STRONGARM config SX1 boolhw/arm/Makefile.objs +1
-1@@ -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
PATCH v5 15/29 hw/arm: Express dependencies of the aspeed boards with Kconfig
In reply to Thomas HuthDependencies have been determined by looking at hw/arm/aspeed.c
--- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-)
default-configs/arm-softmmu.mak +1 -6
@@ -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
hw/arm/Kconfig +10 -0
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [PATCH for-QEMU-4.1 v5 15/29] hw/arm: Express dependencies of the aspeed boards with Kconfig
Quoted 1 line · Thomas Huth
Dependencies have been determined by looking at
hw/arm/aspeed.c
Looks correct to me.
Thanks Thomas,
C.
Quoted 59 lines
Signed-off-by Thomas Huth <[email protected]>--- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-)default-configs/arm-softmmu.mak +1
-6@@ -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=yhw/arm/Kconfig +10
-0@@ -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
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 15/29] hw/arm: Express dependencies of the aspeed boards with Kconfig
In reply to Thomas HuthQuoted 3 lines · Thomas Huth
Dependencies have been determined by looking at
hw/arm/aspeed.cSigned-off-by Thomas Huth <[email protected]>
Quoted 57 lines
--- default-configs/arm-softmmu.mak | 7 +------ hw/arm/Kconfig | 10 ++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-)default-configs/arm-softmmu.mak +1
-6@@ -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=yhw/arm/Kconfig +10
-0@@ -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
PATCH v5 16/29 hw/arm: Express dependencies of the virt machine with Kconfig
In reply to Thomas HuthDependencies have been determined by looking at hw/arm/virt.c
--- default-configs/arm-softmmu.mak | 11 +---------- hw/arm/Kconfig | 19 +++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 22 insertions(+), 11 deletions(-)
default-configs/arm-softmmu.mak +1 -10
@@ -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
hw/arm/Kconfig +19 -0
@@ -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
hw/arm/Makefile.objs +2 -1
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
Hi Thomas,
Quoted 56 lines · Thomas Huth
Dependencies have been determined by looking at
hw/arm/virt.cSigned-off-by Thomas Huth <[email protected]>--- default-configs/arm-softmmu.mak | 11 +---------- hw/arm/Kconfig | 19 +++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 22 insertions(+), 11 deletions(-)default-configs/arm-softmmu.mak +1
-10@@ -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=yhw/arm/Kconfig +0
-0
hw/arm/Kconfig line 3
Quoted 3 lines
hw/arm/Kconfig +1
-0@@ -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.
hw/arm/Kconfig line 10
Quoted 7 lines
hw/arm/Kconfig +6
-0+ 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:
Quoted 34 lines
hw/arm/Kconfig +12
-0+ 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 boolhw/arm/Makefile.objs +2
-1@@ -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
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
Quoted 58 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 55 lines · Thomas Huth
Dependencies have been determined by looking at
hw/arm/virt.cSigned-off-by Thomas Huth <[email protected]>--- default-configs/arm-softmmu.mak | 11 +---------- hw/arm/Kconfig | 19 +++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 22 insertions(+), 11 deletions(-)default-configs/arm-softmmu.mak +1
-10@@ -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=yhw/arm/Kconfig +0
-0
Quoted 8 lines
hw/arm/Kconfig line 3
Quoted 4 lines
hw/arm/Kconfig +1
-0@@ -1,6 +1,24 @@ config ARM_VIRT bool + imply PCI_DEVICESWithout -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".
Quoted 9 lines
hw/arm/Kconfig line 10
Quoted 7 lines
hw/arm/Kconfig +6
-0+ imply TEST_DEVICES + imply VFIO_AMD_XGBE imply VFIO_PLATFORM + imply VFIO_XGMAC + select A15MPCORE + select ACPI + select ARM_SMMUV3You forgot to remove
ARM_SMMUV3from default-configs/aarch64-softmmu.mak.
Good catch! Will fix it in v6.
Quoted 2 lines
With it removed:
Reviewed-by Philippe Mathieu-Daudé <[email protected]>
Thanks!
Thomas
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
Quoted 14 lines · Thomas Huth
Quoted 11 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 8 lines · Thomas Huth
Dependencies have been determined by looking at
hw/arm/virt.cSigned-off-by Thomas Huth <[email protected]>--- default-configs/arm-softmmu.mak | 11 +---------- hw/arm/Kconfig | 19 +++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 22 insertions(+), 11 deletions(-)
Quoted 5 lines
Quoted 3 lines
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
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
Quoted 19 lines · Peter Maydell
Quoted 18 lines · Thomas Huth
Quoted 15 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 8 lines · Thomas Huth
Dependencies have been determined by looking at
hw/arm/virt.cSigned-off-by Thomas Huth <[email protected]>--- 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.
Quoted 5 lines
Quoted 1 line
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
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 16/29] hw/arm: Express dependencies of the virt machine with Kconfig
Quoted 22 lines · Thomas Huth
Quoted 21 lines · Peter Maydell
Quoted 19 lines · Thomas Huth
Quoted 12 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 8 lines · Thomas Huth
Dependencies have been determined by looking at
hw/arm/virt.cSigned-off-by Thomas Huth <[email protected]>--- default-configs/arm-softmmu.mak | 11 +---------- hw/arm/Kconfig | 19 +++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 22 insertions(+), 11 deletions(-)Quoted 3 lines
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".
Quoted 8 lines
Quoted 3 lines
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.
PATCH v5 17/29 hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig
In reply to Thomas HuthNetduino only depends on the stm32f205 SoC which in turn depends on its components.
--- default-configs/arm-softmmu.mak | 9 +-------- hw/arm/Kconfig | 7 +++++++ 2 files changed, 8 insertions(+), 8 deletions(-)
default-configs/arm-softmmu.mak +1 -8
@@ -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
hw/arm/Kconfig +7 -0
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 17/29] hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig
Quoted 5 lines · Thomas Huth
Netduino only depends on the stm32f205 SoC which in turn depends on its components.
Reviewed-by Alistair Francis <[email protected]>Signed-off-by Thomas Huth <[email protected]>
Quoted 62 lines
--- default-configs/arm-softmmu.mak | 9 +-------- hw/arm/Kconfig | 7 +++++++ 2 files changed, 8 insertions(+), 8 deletions(-)default-configs/arm-softmmu.mak +1
-8@@ -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=yhw/arm/Kconfig +7
-0@@ -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
PATCH v5 18/29 hw/arm: Express dependencies of allwinner / cubieboard with Kconfig
In reply to Thomas HuthAdd dependencies for the Cubitech Cubieboard.
--- default-configs/arm-softmmu.mak | 6 +----- hw/arm/Kconfig | 9 +++++++++ 2 files changed, 10 insertions(+), 5 deletions(-)
default-configs/arm-softmmu.mak +1 -5
@@ -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
hw/arm/Kconfig +9 -0
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 18/29] hw/arm: Express dependencies of allwinner / cubieboard with Kconfig
Quoted 3 lines · Thomas Huth
Add dependencies for the Cubitech Cubieboard.
Signed-off-by Thomas Huth <[email protected]>
Quoted 64 lines
--- default-configs/arm-softmmu.mak | 6 +----- hw/arm/Kconfig | 9 +++++++++ 2 files changed, 10 insertions(+), 5 deletions(-)default-configs/arm-softmmu.mak +1
-5@@ -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=yhw/arm/Kconfig +9
-0@@ -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
PATCH v5 19/29 hw/arm: Express dependencies of the MPS2 boards with Kconfig
In reply to Thomas HuthAdd Kconfig dependencies for the mps2-an* machines.
--- default-configs/arm-softmmu.mak | 20 +------------------- hw/arm/Kconfig | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-)
default-configs/arm-softmmu.mak +1 -19
@@ -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
hw/arm/Kconfig +18 -0
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 19/29] hw/arm: Express dependencies of the MPS2 boards with Kconfig
Quoted 76 lines · Thomas Huth
Add
Kconfigdependencies for the mps2-an* machines.Signed-off-by Thomas Huth <[email protected]>--- default-configs/arm-softmmu.mak | 20 +------------------- hw/arm/Kconfig | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-)default-configs/arm-softmmu.mak +1
-19@@ -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=yhw/arm/Kconfig +11
-0@@ -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
hw/arm/Kconfig config ARM11MPCORE · line 363
Quoted 10 lines
hw/arm/Kconfig +7
-0+ 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
PATCH v5 20/29 hw/arm: Express dependencies of the raspi machines with Kconfig
In reply to Thomas HuthMost of the code is directly controlled by the CONFIG_RASPI switch, so not much to add here additionally.
--- default-configs/arm-softmmu.mak | 4 +--- hw/arm/Kconfig | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-)
default-configs/arm-softmmu.mak +1 -3
@@ -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
hw/arm/Kconfig +3 -0
@@ -257,6 +257,9 @@ config ALLWINNER_A10 config RASPI bool + select FRAMEBUFFER + select PL011 # UART + select SDHCI config STM32F205_SOC bool
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 20/29] hw/arm: Express dependencies of the raspi machines with Kconfig
Quoted 5 lines · Thomas Huth
Most of the code is directly controlled by the
CONFIG_RASPIswitch, so not much to add here additionally.Signed-off-by Thomas Huth <[email protected]>
Alistair
Quoted 44 lines
--- default-configs/arm-softmmu.mak | 4 +--- hw/arm/Kconfig | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-)default-configs/arm-softmmu.mak +1
-3@@ -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=yhw/arm/Kconfig +3
-1@@ -257,6 +257,9 @@ config ALLWINNER_A10 config RASPI bool + select FRAMEBUFFER + select PL011 # UART + select SDHCI config STM32F205_SOC bool --2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 20/29] hw/arm: Express dependencies of the raspi machines with Kconfig
In reply to Thomas HuthQuoted 4 lines · Thomas Huth
Most of the code is directly controlled by the
CONFIG_RASPIswitch, so not much to add here additionally.Signed-off-by Thomas Huth <[email protected]>
Quoted 41 lines
--- default-configs/arm-softmmu.mak | 4 +--- hw/arm/Kconfig | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-)default-configs/arm-softmmu.mak +1
-3@@ -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=yhw/arm/Kconfig +3
-0@@ -257,6 +257,9 @@ config ALLWINNER_A10 config RASPI bool + select FRAMEBUFFER + select PL011 # UART + select SDHCI config STM32F205_SOC bool
PATCH v5 21/29 hw/arm: Express dependencies of canon-a1100 with Kconfig
In reply to Thomas HuthAdd Kconfig dependencies for the DIGIC / canon-a1100 machine.
--- default-configs/arm-softmmu.mak | 2 +- hw/arm/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
default-configs/arm-softmmu.mak +1 -1
@@ -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
hw/arm/Kconfig +1 -0
@@ -32,6 +32,7 @@ config CUBIEBOARD config DIGIC bool select PTIMER + select PFLASH_CFI02 config EXYNOS4 bool
Signature · 1 line
2.21.0
PATCH v5 22/29 hw/arm: Express dependencies of sabrelite with Kconfig
In reply to Thomas HuthAdd Kconfig dependencies for the Sabrelite / iMX6 machine.
--- default-configs/arm-softmmu.mak | 4 +--- hw/arm/Kconfig | 7 +++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-)
default-configs/arm-softmmu.mak +1 -3
@@ -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
hw/arm/Kconfig +7 -0
@@ -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
hw/arm/Makefile.objs +2 -1
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 22/29] hw/arm: Express dependencies of sabrelite with Kconfig
Hi Thomas,
Quoted 40 lines · Thomas Huth
Add
Kconfigdependencies for the Sabrelite / iMX6 machine.Signed-off-by Thomas Huth <[email protected]>--- default-configs/arm-softmmu.mak | 4 +--- hw/arm/Kconfig | 7 +++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-)default-configs/arm-softmmu.mak +1
-3@@ -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=yhw/arm/Kconfig +0
-0
hw/arm/Kconfig config REALVIEW · line 182
Quoted 6 lines
hw/arm/Kconfig +3
-0@@ -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:
Quoted 36 lines
hw/arm/Kconfig +4
-0+ 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 boolhw/arm/Makefile.objs +2
-1@@ -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
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 22/29] hw/arm: Express dependencies of sabrelite with Kconfig
Quoted 52 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 40 lines · Thomas Huth
Add
Kconfigdependencies for the Sabrelite / iMX6 machine.Signed-off-by Thomas Huth <[email protected]>--- default-configs/arm-softmmu.mak | 4 +--- hw/arm/Kconfig | 7 +++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 10 insertions(+), 4 deletions(-)default-configs/arm-softmmu.mak +1
-3@@ -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=yhw/arm/Kconfig +0
-0hw/arm/Kconfig config REALVIEW · line 182
Quoted 6 lines
hw/arm/Kconfig +3
-0@@ -177,6 +177,10 @@ config REALVIEW select DS1338 # I2C RTC+NVRAM select USB_OHCI +config SABRELITE + bool + select FSL_IMX6This one crashes:
Quoted 4 lines
$ 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
PATCH v5 23/29 hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with Kconfig
In reply to Thomas HuthAdd Kconfig dependencies for the emcraft-sf2 machine - we also distinguish between the machine (CONFIG_EMCRAFT_SF2) and the SoC (CONFIG_MSF2) now.
--- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 8 ++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-)
default-configs/arm-softmmu.mak +1 -2
@@ -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
hw/arm/Kconfig +8 -0
@@ -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
hw/arm/Makefile.objs +2 -1
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 23/29] hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with Kconfig
Quoted 3 lines · Thomas Huth
Add
Kconfigdependencies for the emcraft-sf2 machine - we also distinguish between the machine (CONFIG_EMCRAFT_SF2) and the SoC (CONFIG_MSF2) now.
Thanks!
Quoted 2 lines
Signed-off-by Thomas Huth <[email protected]>
Quoted 71 lines
--- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 8 ++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-)default-configs/arm-softmmu.mak +1
-2@@ -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=yhw/arm/Kconfig +8
-0@@ -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 boolhw/arm/Makefile.objs +2
-1@@ -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
PATCH v5 24/29 hw/arm: Express dependencies for remaining IMX boards with Kconfig
In reply to Thomas HuthIMX25, IMX7 and IMX6UL were still missing the Kconfig dependencies.
--- default-configs/arm-softmmu.mak | 2 -- hw/arm/Kconfig | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-)
default-configs/arm-softmmu.mak +0 -2
@@ -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
hw/arm/Kconfig +19 -0
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 24/29] hw/arm: Express dependencies for remaining IMX boards with Kconfig
Quoted 3 lines · Thomas Huth
IMX25, IMX7 and IMX6UL were still missing the
Kconfigdependencies.Signed-off-by Thomas Huth <[email protected]>
Quoted 73 lines
--- default-configs/arm-softmmu.mak | 2 -- hw/arm/Kconfig | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-)default-configs/arm-softmmu.mak +0
-2@@ -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=yhw/arm/Kconfig +19
-0@@ -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
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 24/29] hw/arm: Express dependencies for remaining IMX boards with Kconfig
Quoted 35 lines · Philippe Mathieu-Daudé
Quoted 3 lines · Thomas Huth
IMX25, IMX7 and IMX6UL were still missing the
Kconfigdependencies.Signed-off-by Thomas Huth <[email protected]>Reviewed-by Philippe Mathieu-Daudé <[email protected]>Quoted 28 lines
--- default-configs/arm-softmmu.mak | 2 -- hw/arm/Kconfig | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-)default-configs/arm-softmmu.mak +0
-2@@ -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=yhw/arm/Kconfig +0
-0@@ -283,6 +283,10 @@ config XLNX_VERSAL
Quoted 3 lines
hw/arm/Kconfig config XLNX_VERSAL · line 286
Quoted 3 lines
hw/arm/Kconfig +1
-0config FSL_IMX25 bool + select IMX
At some point we should split the IMX config in hw/misc/Kconfig.
Quoted 3 lines
Quoted 3 lines
hw/arm/Kconfig +3
-0+ select IMX_FEC + select IMX_I2C + select DS1338
[...]
PATCH v5 25/29 hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig
In reply to Thomas HuthAdd Kconfig dependencies for the NRF51 / microbit machine.
--- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 6 ++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-)
default-configs/arm-softmmu.mak +1 -2
@@ -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
hw/arm/Kconfig +6 -0
@@ -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
hw/arm/Makefile.objs +2 -1
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 25/29] hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig
Quoted 4 lines · Thomas Huth
Add
Kconfigdependencies for the NRF51 / microbit machine.Signed-off-by Thomas Huth <[email protected]>
Alistair
Quoted 64 lines
--- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 6 ++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-)default-configs/arm-softmmu.mak +1
-2@@ -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=yhw/arm/Kconfig +6
-0@@ -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 boolhw/arm/Makefile.objs +2
-2@@ -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
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 25/29] hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig
In reply to Thomas HuthQuoted 3 lines · Thomas Huth
Add
Kconfigdependencies for the NRF51 / microbit machine.Signed-off-by Thomas Huth <[email protected]>
Quoted 61 lines
--- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 6 ++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-)default-configs/arm-softmmu.mak +1
-2@@ -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=yhw/arm/Kconfig +6
-0@@ -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 boolhw/arm/Makefile.objs +2
-1@@ -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
PATCH v5 26/29 hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
In reply to Thomas HuthThis cleans up most settings in default-configs/aarch64-softmmu.mak.
--- default-configs/aarch64-softmmu.mak | 4 ---- hw/arm/Kconfig | 11 +++++++++++ hw/display/Kconfig | 1 + 3 files changed, 12 insertions(+), 4 deletions(-)
default-configs/aarch64-softmmu.mak +0 -4
@@ -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
hw/arm/Kconfig +11 -0
@@ -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
hw/display/Kconfig +1 -0
@@ -108,6 +108,7 @@ config VIRTIO_VGA config DPCD bool + select AUX config ATI_VGA bool
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 26/29] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
Quoted 4 lines · Thomas Huth
This cleans up most settings in default-configs/aarch64-softmmu.mak.
Signed-off-by Thomas Huth <[email protected]>
Alistair
Quoted 59 lines
--- default-configs/aarch64-softmmu.mak | 4 ---- hw/arm/Kconfig | 11 +++++++++++ hw/display/Kconfig | 1 + 3 files changed, 12 insertions(+), 4 deletions(-)default-configs/aarch64-softmmu.mak +0
-4@@ -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=yhw/arm/Kconfig +11
-0@@ -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 boolhw/display/Kconfig +1
-1@@ -108,6 +108,7 @@ config VIRTIO_VGA config DPCD bool + select AUX config ATI_VGA bool --2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 26/29] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
In reply to Thomas HuthQuoted 3 lines · Thomas Huth
This cleans up most settings in default-configs/aarch64-softmmu.mak.
Signed-off-by Thomas Huth <[email protected]>
Quoted 56 lines
--- default-configs/aarch64-softmmu.mak | 4 ---- hw/arm/Kconfig | 11 +++++++++++ hw/display/Kconfig | 1 + 3 files changed, 12 insertions(+), 4 deletions(-)default-configs/aarch64-softmmu.mak +0
-4@@ -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=yhw/arm/Kconfig +11
-0@@ -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 boolhw/display/Kconfig +1
-0@@ -108,6 +108,7 @@ config VIRTIO_VGA config DPCD bool + select AUX config ATI_VGA bool
PATCH v5 27/29 hw/arm: Express dependencies of the xlnx-versal-virt machine with Kconfig
In reply to Thomas HuthDependencies have been determined with trial-and-error and by looking at the xlnx-versal.c source file.
--- hw/arm/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)
hw/arm/Kconfig +4 -0
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH for-QEMU-4.1 v5 27/29] hw/arm: Express dependencies of the xlnx-versal-virt machine with Kconfig
Quoted 4 lines · Thomas Huth
Dependencies have been determined with trial-and-error and by looking at the
xlnx-versal.csource file.Signed-off-by Thomas Huth <[email protected]>
Quoted 20 lines
--- hw/arm/Kconfig | 4 ++++ 1 file changed, 4 insertions(+)hw/arm/Kconfig +4
-0@@ -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
PATCH v5 28/29 hw/arm: Express dependencies of the musca machines with Kconfig
In reply to Thomas HuthDependencies have been determined with trial-and-error and by looking at the musca.c source file.
--- hw/arm/Kconfig | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
hw/arm/Kconfig +6 -3
@@ -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
Signature · 1 line
2.21.0
Re: [Qemu-arm] [Qemu-devel] [PATCH for-QEMU-4.1 v5 28/29] hw/arm: Express dependencies of the musca machines with Kconfig
Quoted 4 lines · Thomas Huth
Dependencies have been determined with trial-and-error and by looking at the
musca.csource file.Signed-off-by Thomas Huth <[email protected]>
Quoted 29 lines
--- hw/arm/Kconfig | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)hw/arm/Kconfig +6
-3@@ -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
PATCH v5 29/29 hw/arm: Remove hard-enablement of the remaining PCI devices
In reply to Thomas HuthThe 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.
--- default-configs/arm-softmmu.mak | 8 -------- 1 file changed, 8 deletions(-)
default-configs/arm-softmmu.mak +0 -8
@@ -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
Signature · 1 line
2.21.0
Hi Thomas,
Quoted 58 lines · Thomas Huth
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 toCONFIG_PCIin the ARM machines that do not have a PCI busv4:
- Rebased the series to Paolo's latest kconfig treev3:
- Addressed review feedback from v2
- Included patches to clean up the PCI dependencies of AHCI and SDHCI (soCONFIG_AHCIandCONFIG_SDHCIdo not depend onCONFIG_PCIanymore)
- Added an additional patch for the new "musca" machinesv2: Adressed review-feedback from v1
-CONFIG_SDHCIandCONFIG_AHCInow selectCONFIG_PCI
- Added switches for MICROBIT andEMCRAFT_SF2Thomas Huth (29):
hw/pci/pci-stub: Addmsi_enabled()andmsi_notify()to the pci stubs hw/ide/ahci: Add aKconfigswitch 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 withKconfighw/arm: Express dependencies of the highbank machines withKconfighw/arm: Express dependencies of integratorcp withKconfighw/arm: Express dependencies of the fsl-imx31 machine withKconfighw/arm: Express dependencies of musicpal withKconfighw/arm: Express dependencies of the OMAP machines withKconfighw/arm: Express dependencies of stellaris withKconfighw/arm: Express dependencies of realview, versatile and vexpress with
Kconfig
hw/arm: Express dependencies of the PXA2xx machines withKconfighw/arm: Express dependencies of xilinx-zynq withKconfighw/arm: Express dependencies of collie withKconfighw/arm: Express dependencies of the aspeed boards withKconfighw/arm: Express dependencies of the virt machine withKconfighw/arm: Express dependencies of netduino / stm32f2xx withKconfighw/arm: Express dependencies of allwinner / cubieboard withKconfighw/arm: Express dependencies of the MPS2 boards withKconfighw/arm: Express dependencies of the raspi machines withKconfighw/arm: Express dependencies of canon-a1100 withKconfighw/arm: Express dependencies of sabrelite withKconfighw/arm: Express dependencies of the MSF2 /EMCRAFT_SF2machine with
Kconfig
Quoted 8 lines
hw/arm: Express dependencies for remaining IMX boards with
Kconfighw/arm: Express dependencies of the microbit / nrf51 machine with
Kconfig
hw/arm: Express dependencies of the ZynqMP zcu102 machine withKconfighw/arm: Express dependencies of the xlnx-versal-virt machine with
Kconfig
hw/arm: Express dependencies of the musca machines withKconfighw/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:
(well, I also tested it, but expect you to use the splitted respin)
Regards,
Phil.