Kconfig dependencies for ARM machines
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.
Based-on: [email protected]
("Support Kconfig in QEMU")
The first half of the patches is slightly based on the work by Ákos Kovács:
https://lists.nongnu.org/archive/html/qemu-devel/2013-08/msg03730.html
The second part has 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).
NB: One thing I noticed while working on these patches: We should tidy up the dependencies of AHCI and SDHCI. Both currently depend on PCI, but some boards that do not have PCI also want to use them (via sysbus devices)... but that's a clean-up for the future, this series here is already big enough.
Thomas Huth (25):
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 machine with Kconfig hw/arm: Express dependencies for remaining IMX boards with Kconfig hw/arm: Express dependencies of nrf51 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: Remove hard-enablement of the remaining PCI devices
default-configs/aarch64-softmmu.mak | 4 - default-configs/arm-softmmu.mak | 175 +++----------------- hw/arm/Kconfig | 310 ++++++++++++++++++++++++++++++++++++ hw/arm/Makefile.objs | 19 ++- hw/display/Kconfig | 3 + hw/i2c/Kconfig | 2 +- hw/misc/Kconfig | 2 + 7 files changed, 354 insertions(+), 161 deletions(-)
Signature · 1 line
1.8.3.1
PATCH 1/25 hw/arm: Express dependencies of the exynos machines with Kconfig
Add Kconfig dependencies for the Exynos-related boards (nuri and smdkc210).
This patch is slightly based on earlier work by Ákos Kovács (i.e. his "hw/arm/Kconfig: Add ARM Kconfig" patch).
--- default-configs/arm-softmmu.mak | 16 ++++++---------- hw/arm/Kconfig | 11 +++++++++++ 2 files changed, 17 insertions(+), 10 deletions(-)
default-configs/arm-softmmu.mak +6 -10
@@ -1,7 +1,12 @@ # Default configuration for arm-softmmu -CONFIG_PCI=y +# TODO: ARM_V7M is currently always required - make this more flexible! +CONFIG_ARM_V7M=y + CONFIG_PCI_DEVICES=y + +CONFIG_EXYNOS4=y + CONFIG_VGA=y CONFIG_NAND=y CONFIG_ECC=y
@@ -25,7 +30,6 @@ CONFIG_ADS7846=y CONFIG_MAX111X=y CONFIG_SSI_SD=y CONFIG_SSI_M25P80=y -CONFIG_LAN9118=y CONFIG_SMC91C111=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y
@@ -35,7 +39,6 @@ CONFIG_PFLASH_CFI01=y CONFIG_PFLASH_CFI02=y CONFIG_MICRODRIVE=y CONFIG_USB_MUSB=y -CONFIG_USB_EHCI_SYSBUS=y CONFIG_PLATFORM_BUS=y CONFIG_VIRTIO_MMIO=y
@@ -43,13 +46,9 @@ CONFIG_ARM11MPCORE=y CONFIG_A9MPCORE=y CONFIG_A15MPCORE=y -CONFIG_ARM_V7M=y CONFIG_NETDUINO2=y -CONFIG_ARM_GIC=y CONFIG_ARM_TIMER=y -CONFIG_ARM_MPTIMER=y -CONFIG_A9_GTIMER=y CONFIG_PL011=y CONFIG_PL022=y CONFIG_PL031=y
@@ -60,11 +59,9 @@ CONFIG_PL080=y CONFIG_PL110=y CONFIG_PL181=y CONFIG_PL190=y -CONFIG_PL310=y CONFIG_PL330=y CONFIG_CADENCE=y CONFIG_XGMAC=y -CONFIG_EXYNOS4=y CONFIG_PXA2XX=y CONFIG_BITBANG_I2C=y CONFIG_FRAMEBUFFER=y
@@ -72,7 +69,6 @@ CONFIG_XILINX_SPIPS=y CONFIG_ZYNQ_DEVCFG=y CONFIG_ARM11SCU=y -CONFIG_A9SCU=y CONFIG_DIGIC=y CONFIG_MARVELL_88W8618=y CONFIG_OMAP=y
hw/arm/Kconfig +11 -0
@@ -7,7 +7,14 @@ config DIGIC config EXYNOS4 bool + select A9MPCORE + select I2C + select LAN9118 + select PCI + select PL310 # cache controller select PTIMER + select SDHCI + select USB_EHCI_SYSBUS config HIGHBANK bool
@@ -109,6 +116,10 @@ config ZAURUS config A9MPCORE bool + select A9_GTIMER + select A9SCU # snoop control unit + select ARM_GIC + select ARM_MPTIMER config A15MPCORE bool
Signature · 1 line
1.8.3.1
PATCH 2/25 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 | 4 +--- hw/arm/Kconfig | 12 ++++++++++++ 2 files changed, 13 insertions(+), 3 deletions(-)
default-configs/arm-softmmu.mak +1 -3
@@ -6,6 +6,7 @@ CONFIG_ARM_V7M=y CONFIG_PCI_DEVICES=y CONFIG_EXYNOS4=y +CONFIG_HIGHBANK=y CONFIG_VGA=y CONFIG_NAND=y
@@ -54,14 +55,12 @@ CONFIG_PL022=y CONFIG_PL031=y CONFIG_PL041=y CONFIG_PL050=y -CONFIG_PL061=y CONFIG_PL080=y CONFIG_PL110=y CONFIG_PL181=y CONFIG_PL190=y CONFIG_PL330=y CONFIG_CADENCE=y -CONFIG_XGMAC=y CONFIG_PXA2XX=y CONFIG_BITBANG_I2C=y CONFIG_FRAMEBUFFER=y
@@ -151,7 +150,6 @@ CONFIG_XILINX_AXI=y CONFIG_PCI_EXPRESS_DESIGNWARE=y CONFIG_STRONGARM=y -CONFIG_HIGHBANK=y CONFIG_MUSICPAL=y # for realview and versatilepb
hw/arm/Kconfig +12 -0
@@ -18,6 +18,18 @@ config EXYNOS4 config HIGHBANK bool + select A9MPCORE + select A15MPCORE + select AHCI + select ARM_TIMER # sp804 + select ARM_V7M + select PCI + select PL011 # UART + select PL022 # Serial port + select PL031 # RTC + select PL061 # GPIO + select PL310 # cache controller + select XGMAC # ethernet config INTEGRATOR bool
Signature · 1 line
1.8.3.1
PATCH 3/25 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 | 11 +---------- hw/arm/Kconfig | 9 +++++++++ hw/display/Kconfig | 1 + 3 files changed, 11 insertions(+), 10 deletions(-)
default-configs/arm-softmmu.mak +1 -10
@@ -7,6 +7,7 @@ CONFIG_PCI_DEVICES=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y +CONFIG_INTEGRATOR=y CONFIG_VGA=y CONFIG_NAND=y
@@ -31,7 +32,6 @@ CONFIG_ADS7846=y CONFIG_MAX111X=y CONFIG_SSI_SD=y CONFIG_SSI_M25P80=y -CONFIG_SMC91C111=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y CONFIG_FTGMAC100=y
@@ -49,15 +49,8 @@ CONFIG_A15MPCORE=y CONFIG_NETDUINO2=y -CONFIG_ARM_TIMER=y -CONFIG_PL011=y -CONFIG_PL022=y -CONFIG_PL031=y CONFIG_PL041=y -CONFIG_PL050=y CONFIG_PL080=y -CONFIG_PL110=y -CONFIG_PL181=y CONFIG_PL190=y CONFIG_PL330=y CONFIG_CADENCE=y
@@ -119,8 +112,6 @@ CONFIG_VFIO_XGMAC=y CONFIG_VFIO_AMD_XGBE=y CONFIG_SDHCI=y -CONFIG_INTEGRATOR=y -CONFIG_INTEGRATOR_DEBUG=y CONFIG_ALLWINNER_A10_PIT=y CONFIG_ALLWINNER_A10_PIC=y
hw/arm/Kconfig +9 -0
@@ -33,6 +33,15 @@ config HIGHBANK config INTEGRATOR bool + select ARM_TIMER + select INTEGRATOR_DEBUG + select PL011 # UART + select PL031 # RTC + select PL050 # keyboard/mouse + select PL110 # pl111 LCD controller + select PL181 # display + select PCI + select SMC91C111 config MAINSTONE bool
hw/display/Kconfig +1 -0
@@ -21,6 +21,7 @@ config JAZZ_LED config PL110 bool + select FRAMEBUFFER config SII9022 bool
Signature · 1 line
1.8.3.1
PATCH 4/25 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 | 5 +++++ hw/misc/Kconfig | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-)
default-configs/arm-softmmu.mak +1 -2
@@ -8,6 +8,7 @@ CONFIG_PCI_DEVICES=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y CONFIG_INTEGRATOR=y +CONFIG_FSL_IMX31=y CONFIG_VGA=y CONFIG_NAND=y
@@ -68,7 +69,6 @@ CONFIG_TSC210X=y CONFIG_BLIZZARD=y CONFIG_ONENAND=y CONFIG_TUSB6010=y -CONFIG_IMX=y CONFIG_MAINSTONE=y CONFIG_MPS2=y CONFIG_NSERIES=y
@@ -118,7 +118,6 @@ CONFIG_ALLWINNER_A10_PIC=y CONFIG_ALLWINNER_A10=y CONFIG_FSL_IMX6=y -CONFIG_FSL_IMX31=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y
hw/arm/Kconfig +5 -0
@@ -103,6 +103,11 @@ config FSL_IMX25 config FSL_IMX31 bool + select SERIAL + select IMX + select IMX_I2C + select LAN9118 + select PCI config FSL_IMX6 bool
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
1.8.3.1
PATCH 5/25 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 | 6 ++++++ 2 files changed, 7 insertions(+), 5 deletions(-)
default-configs/arm-softmmu.mak +1 -5
@@ -9,13 +9,13 @@ CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y CONFIG_INTEGRATOR=y CONFIG_FSL_IMX31=y +CONFIG_MUSICPAL=y CONFIG_VGA=y CONFIG_NAND=y CONFIG_ECC=y CONFIG_SERIAL=y CONFIG_MAX7310=y -CONFIG_WM8750=y CONFIG_TWL92230=y CONFIG_TSC2005=y CONFIG_LM832X=y
@@ -38,7 +38,6 @@ CONFIG_IMX_FEC=y CONFIG_FTGMAC100=y CONFIG_DS1338=y CONFIG_PFLASH_CFI01=y -CONFIG_PFLASH_CFI02=y CONFIG_MICRODRIVE=y CONFIG_USB_MUSB=y CONFIG_PLATFORM_BUS=y
@@ -56,14 +55,12 @@ CONFIG_PL190=y CONFIG_PL330=y CONFIG_CADENCE=y CONFIG_PXA2XX=y -CONFIG_BITBANG_I2C=y CONFIG_FRAMEBUFFER=y CONFIG_XILINX_SPIPS=y CONFIG_ZYNQ_DEVCFG=y CONFIG_ARM11SCU=y CONFIG_DIGIC=y -CONFIG_MARVELL_88W8618=y CONFIG_OMAP=y CONFIG_TSC210X=y CONFIG_BLIZZARD=y
@@ -140,7 +137,6 @@ CONFIG_XILINX_AXI=y CONFIG_PCI_EXPRESS_DESIGNWARE=y CONFIG_STRONGARM=y -CONFIG_MUSICPAL=y # for realview and versatilepb CONFIG_LSI_SCSI_PCI=y
hw/arm/Kconfig +6 -0
@@ -48,7 +48,13 @@ config MAINSTONE config MUSICPAL bool + select BITBANG_I2C + select MARVELL_88W8618 select PTIMER + select PFLASH_CFI02 + select PCI + select SERIAL + select WM8750 config NETDUINO2 bool
Signature · 1 line
1.8.3.1
PATCH 6/25 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 | 15 +++------------ hw/arm/Kconfig | 26 ++++++++++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 31 insertions(+), 13 deletions(-)
default-configs/arm-softmmu.mak +3 -12
@@ -10,16 +10,15 @@ CONFIG_HIGHBANK=y CONFIG_INTEGRATOR=y CONFIG_FSL_IMX31=y CONFIG_MUSICPAL=y +CONFIG_CHEETAH=y +CONFIG_SX1=y +CONFIG_NSERIES=y CONFIG_VGA=y CONFIG_NAND=y CONFIG_ECC=y CONFIG_SERIAL=y CONFIG_MAX7310=y -CONFIG_TWL92230=y -CONFIG_TSC2005=y -CONFIG_LM832X=y -CONFIG_TMP105=y CONFIG_TMP421=y CONFIG_PCA9552=y CONFIG_STELLARIS=y
@@ -37,9 +36,7 @@ CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y CONFIG_FTGMAC100=y CONFIG_DS1338=y -CONFIG_PFLASH_CFI01=y CONFIG_MICRODRIVE=y -CONFIG_USB_MUSB=y CONFIG_PLATFORM_BUS=y CONFIG_VIRTIO_MMIO=y
@@ -61,14 +58,8 @@ CONFIG_ZYNQ_DEVCFG=y CONFIG_ARM11SCU=y CONFIG_DIGIC=y -CONFIG_OMAP=y -CONFIG_TSC210X=y -CONFIG_BLIZZARD=y -CONFIG_ONENAND=y -CONFIG_TUSB6010=y CONFIG_MAINSTONE=y CONFIG_MPS2=y -CONFIG_NSERIES=y CONFIG_RASPI=y CONFIG_REALVIEW=y CONFIG_ZAURUS=y
hw/arm/Kconfig +26 -0
@@ -1,6 +1,11 @@ config ARM_VIRT bool +config CHEETAH + bool + select OMAP + select TSC210X + config DIGIC bool select PTIMER
@@ -61,9 +66,26 @@ config NETDUINO2 config NSERIES bool + select OMAP + select TMP105 # tempature sensor + select BLIZZARD # LCD/TV controller + select ONENAND + select TSC210X # touchscreen/sensors/audio + select TSC2005 # touchscreen/sensors/keypad + select LM832X # GPIO keyboard chip + select TWL92230 # energy-management + select TUSB6010 config OMAP bool + select FRAMEBUFFER + select I2C + select ECC + select NAND + select PFLASH_CFI01 + select PCI + select SD + select SERIAL config PXA2XX bool
@@ -77,6 +99,10 @@ config STELLARIS config STRONGARM bool +config SX1 + bool + select OMAP + config VERSATILE bool
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
1.8.3.1
PATCH 7/25 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
@@ -13,6 +13,7 @@ CONFIG_MUSICPAL=y CONFIG_CHEETAH=y CONFIG_SX1=y CONFIG_NSERIES=y +CONFIG_STELLARIS=y CONFIG_VGA=y CONFIG_NAND=y
@@ -21,16 +22,10 @@ CONFIG_SERIAL=y CONFIG_MAX7310=y CONFIG_TMP421=y CONFIG_PCA9552=y -CONFIG_STELLARIS=y -CONFIG_STELLARIS_INPUT=y -CONFIG_STELLARIS_ENET=y -CONFIG_SSD0303=y -CONFIG_SSD0323=y CONFIG_DDC=y CONFIG_SII9022=y CONFIG_ADS7846=y CONFIG_MAX111X=y -CONFIG_SSI_SD=y CONFIG_SSI_M25P80=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y
hw/arm/Kconfig +10 -0
@@ -95,6 +95,16 @@ config REALVIEW config STELLARIS bool + select ARM_V7M + select I2C + select PL011 # UART + select PL022 # Serial port + select PL061 # GPIO + select SSD0303 # OLED display + select SSD0323 # OLED display + select SSI_SD + select STELLARIS_INPUT + select STELLARIS_ENET # ethernet config STRONGARM bool
Signature · 1 line
1.8.3.1
PATCH 8/25 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 | 23 +++----------------- hw/arm/Kconfig | 47 +++++++++++++++++++++++++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- hw/display/Kconfig | 1 + hw/i2c/Kconfig | 2 +- 5 files changed, 54 insertions(+), 22 deletions(-)
default-configs/arm-softmmu.mak +3 -20
@@ -3,8 +3,6 @@ # TODO: ARM_V7M is currently always required - make this more flexible! CONFIG_ARM_V7M=y -CONFIG_PCI_DEVICES=y - CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y CONFIG_INTEGRATOR=y
@@ -14,6 +12,9 @@ CONFIG_CHEETAH=y CONFIG_SX1=y CONFIG_NSERIES=y CONFIG_STELLARIS=y +CONFIG_REALVIEW=y +CONFIG_VERSATILE=y +CONFIG_VEXPRESS=y CONFIG_VGA=y CONFIG_NAND=y
@@ -22,8 +23,6 @@ CONFIG_SERIAL=y CONFIG_MAX7310=y CONFIG_TMP421=y CONFIG_PCA9552=y -CONFIG_DDC=y -CONFIG_SII9022=y CONFIG_ADS7846=y CONFIG_MAX111X=y CONFIG_SSI_M25P80=y
@@ -35,15 +34,8 @@ CONFIG_MICRODRIVE=y CONFIG_PLATFORM_BUS=y CONFIG_VIRTIO_MMIO=y -CONFIG_ARM11MPCORE=y -CONFIG_A9MPCORE=y -CONFIG_A15MPCORE=y - CONFIG_NETDUINO2=y -CONFIG_PL041=y -CONFIG_PL080=y -CONFIG_PL190=y CONFIG_PL330=y CONFIG_CADENCE=y CONFIG_PXA2XX=y
@@ -51,12 +43,10 @@ CONFIG_FRAMEBUFFER=y CONFIG_XILINX_SPIPS=y CONFIG_ZYNQ_DEVCFG=y -CONFIG_ARM11SCU=y CONFIG_DIGIC=y CONFIG_MAINSTONE=y CONFIG_MPS2=y CONFIG_RASPI=y -CONFIG_REALVIEW=y CONFIG_ZAURUS=y CONFIG_ZYNQ=y CONFIG_STM32F2XX_TIMER=y
@@ -84,10 +74,6 @@ CONFIG_IOTKIT_SYSCTL=y CONFIG_IOTKIT_SYSINFO=y CONFIG_ARMSSE_CPUID=y -CONFIG_VERSATILE=y -CONFIG_VERSATILE_PCI=y -CONFIG_VERSATILE_I2C=y - CONFIG_PCI_EXPRESS=y CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y CONFIG_VFIO_PLATFORM=y
@@ -123,6 +109,3 @@ CONFIG_XILINX_AXI=y CONFIG_PCI_EXPRESS_DESIGNWARE=y CONFIG_STRONGARM=y - -# for realview and versatilepb -CONFIG_LSI_SCSI_PCI=y
hw/arm/Kconfig +47 -0
65 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
1.8.3.1
PATCH 9/25 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 | 17 +++++---------- hw/arm/Kconfig | 46 +++++++++++++++++++++++++++++++++++++++++ hw/arm/Makefile.objs | 5 ++++- 3 files changed, 55 insertions(+), 13 deletions(-)
default-configs/arm-softmmu.mak +5 -12
@@ -15,22 +15,20 @@ CONFIG_STELLARIS=y CONFIG_REALVIEW=y CONFIG_VERSATILE=y CONFIG_VEXPRESS=y +CONFIG_MAINSTONE=y +CONFIG_GUMSTIX=y +CONFIG_SPITZ=y +CONFIG_TOSA=y +CONFIG_Z2=y CONFIG_VGA=y -CONFIG_NAND=y -CONFIG_ECC=y -CONFIG_SERIAL=y -CONFIG_MAX7310=y CONFIG_TMP421=y CONFIG_PCA9552=y -CONFIG_ADS7846=y -CONFIG_MAX111X=y CONFIG_SSI_M25P80=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y CONFIG_FTGMAC100=y CONFIG_DS1338=y -CONFIG_MICRODRIVE=y CONFIG_PLATFORM_BUS=y CONFIG_VIRTIO_MMIO=y
@@ -38,16 +36,13 @@ CONFIG_NETDUINO2=y CONFIG_PL330=y CONFIG_CADENCE=y -CONFIG_PXA2XX=y CONFIG_FRAMEBUFFER=y CONFIG_XILINX_SPIPS=y CONFIG_ZYNQ_DEVCFG=y CONFIG_DIGIC=y -CONFIG_MAINSTONE=y CONFIG_MPS2=y CONFIG_RASPI=y -CONFIG_ZAURUS=y CONFIG_ZYNQ=y CONFIG_STM32F2XX_TIMER=y CONFIG_STM32F2XX_USART=y
@@ -80,8 +75,6 @@ CONFIG_VFIO_PLATFORM=y CONFIG_VFIO_XGMAC=y CONFIG_VFIO_AMD_XGBE=y -CONFIG_SDHCI=y - CONFIG_ALLWINNER_A10_PIT=y CONFIG_ALLWINNER_A10_PIC=y CONFIG_ALLWINNER_A10=y
hw/arm/Kconfig +46 -0
58 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
1.8.3.1
PATCH 10/25 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 | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 6 deletions(-)
default-configs/arm-softmmu.mak +1 -6
@@ -15,6 +15,7 @@ CONFIG_STELLARIS=y CONFIG_REALVIEW=y CONFIG_VERSATILE=y CONFIG_VEXPRESS=y +CONFIG_ZYNQ=y CONFIG_MAINSTONE=y CONFIG_GUMSTIX=y CONFIG_SPITZ=y
@@ -34,16 +35,11 @@ CONFIG_VIRTIO_MMIO=y CONFIG_NETDUINO2=y -CONFIG_PL330=y -CONFIG_CADENCE=y CONFIG_FRAMEBUFFER=y -CONFIG_XILINX_SPIPS=y -CONFIG_ZYNQ_DEVCFG=y CONFIG_DIGIC=y CONFIG_MPS2=y CONFIG_RASPI=y -CONFIG_ZYNQ=y CONFIG_STM32F2XX_TIMER=y CONFIG_STM32F2XX_USART=y CONFIG_STM32F2XX_SYSCFG=y
@@ -98,7 +94,6 @@ CONFIG_SMBUS_EEPROM=y CONFIG_GPIO_KEY=y CONFIG_MSF2=y CONFIG_FW_CFG_DMA=y -CONFIG_XILINX_AXI=y CONFIG_PCI_EXPRESS_DESIGNWARE=y CONFIG_STRONGARM=y
hw/arm/Kconfig +14 -0
@@ -208,6 +208,20 @@ config VEXPRESS config ZYNQ bool + select A9MPCORE + select CADENCE # UART + select PCI + select PFLASH_CFI02 + select PL330 + select SDHCI + select SSI_M25P80 + select USB_EHCI + select USB_EHCI_SYSBUS + select XILINX # UART + select XILINX_AXI + select XILINX_SPI + select XILINX_SPIPS + select ZYNQ_DEVCFG config ARM_V7M bool
Signature · 1 line
1.8.3.1
PATCH 11/25 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
@@ -21,6 +21,7 @@ CONFIG_GUMSTIX=y CONFIG_SPITZ=y CONFIG_TOSA=y CONFIG_Z2=y +CONFIG_COLLIE=y CONFIG_VGA=y CONFIG_TMP421=y
@@ -95,5 +96,3 @@ CONFIG_GPIO_KEY=y CONFIG_MSF2=y CONFIG_FW_CFG_DMA=y CONFIG_PCI_EXPRESS_DESIGNWARE=y - -CONFIG_STRONGARM=y
hw/arm/Kconfig +7 -0
@@ -175,6 +175,13 @@ config STELLARIS config STRONGARM bool + select PXA2XX + +config COLLIE + bool + select PFLASH_CFI01 + select ZAURUS # scoop + select STRONGARM config SX1 bool
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
1.8.3.1
PATCH 12/25 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
@@ -22,15 +22,12 @@ CONFIG_SPITZ=y CONFIG_TOSA=y CONFIG_Z2=y CONFIG_COLLIE=y +CONFIG_ASPEED_SOC=y CONFIG_VGA=y -CONFIG_TMP421=y -CONFIG_PCA9552=y CONFIG_SSI_M25P80=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y -CONFIG_FTGMAC100=y -CONFIG_DS1338=y CONFIG_PLATFORM_BUS=y CONFIG_VIRTIO_MMIO=y
@@ -90,8 +87,6 @@ CONFIG_I82801B11=y CONFIG_ACPI=y CONFIG_ARM_VIRT=y CONFIG_SMBIOS=y -CONFIG_ASPEED_SOC=y -CONFIG_SMBUS_EEPROM=y CONFIG_GPIO_KEY=y CONFIG_MSF2=y CONFIG_FW_CFG_DMA=y
hw/arm/Kconfig +10 -0
@@ -267,6 +267,16 @@ config FSL_IMX6 config ASPEED_SOC bool + select DS1338 + select FTGMAC100 + select I2C + select PCA9552 + select SERIAL + select SMBUS_EEPROM + select SSI + select SSI_M25P80 + select TMP105 + select TMP421 config MPS2 bool
Signature · 1 line
1.8.3.1
PATCH 13/25 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 | 14 +------------- hw/arm/Kconfig | 19 +++++++++++++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 22 insertions(+), 14 deletions(-)
default-configs/arm-softmmu.mak +1 -13
@@ -3,6 +3,7 @@ # TODO: ARM_V7M is currently always required - make this more flexible! CONFIG_ARM_V7M=y +CONFIG_ARM_VIRT=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y CONFIG_INTEGRATOR=y
@@ -28,8 +29,6 @@ CONFIG_VGA=y CONFIG_SSI_M25P80=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y -CONFIG_PLATFORM_BUS=y -CONFIG_VIRTIO_MMIO=y CONFIG_NETDUINO2=y
@@ -63,12 +62,6 @@ CONFIG_IOTKIT_SYSCTL=y CONFIG_IOTKIT_SYSINFO=y CONFIG_ARMSSE_CPUID=y -CONFIG_PCI_EXPRESS=y -CONFIG_PCI_EXPRESS_GENERIC_BRIDGE=y -CONFIG_VFIO_PLATFORM=y -CONFIG_VFIO_XGMAC=y -CONFIG_VFIO_AMD_XGBE=y - CONFIG_ALLWINNER_A10_PIT=y CONFIG_ALLWINNER_A10_PIC=y CONFIG_ALLWINNER_A10=y
@@ -84,10 +77,5 @@ CONFIG_PCIE_PORT=y CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y -CONFIG_ACPI=y -CONFIG_ARM_VIRT=y -CONFIG_SMBIOS=y -CONFIG_GPIO_KEY=y CONFIG_MSF2=y -CONFIG_FW_CFG_DMA=y CONFIG_PCI_EXPRESS_DESIGNWARE=y
hw/arm/Kconfig +19 -0
@@ -1,5 +1,23 @@ config ARM_VIRT bool + imply PCI_DEVICES + imply VFIO_AMD_XGBE + imply VFIO_XGMAC + select A15MPCORE + select ACPI + select ARM_SMMUV3 + select GPIO_KEY + select FW_CFG_DMA + select PCI_EXPRESS + select PCI_EXPRESS_GENERIC_BRIDGE + select PFLASH_CFI01 + select PL011 # UART + select PL031 # RTC + select PL061 # GPIO + select PLATFORM_BUS + select SMBIOS + select VIRTIO_MMIO + select VFIO_PLATFORM config CHEETAH bool
@@ -314,6 +332,7 @@ config A9MPCORE config A15MPCORE bool + select ARM_GIC config ARM11MPCORE bool
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
1.8.3.1
PATCH 14/25 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
@@ -24,25 +24,18 @@ CONFIG_TOSA=y CONFIG_Z2=y CONFIG_COLLIE=y CONFIG_ASPEED_SOC=y +CONFIG_NETDUINO2=y CONFIG_VGA=y CONFIG_SSI_M25P80=y CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y -CONFIG_NETDUINO2=y - CONFIG_FRAMEBUFFER=y CONFIG_DIGIC=y CONFIG_MPS2=y CONFIG_RASPI=y -CONFIG_STM32F2XX_TIMER=y -CONFIG_STM32F2XX_USART=y -CONFIG_STM32F2XX_SYSCFG=y -CONFIG_STM32F2XX_ADC=y -CONFIG_STM32F2XX_SPI=y -CONFIG_STM32F205_SOC=y CONFIG_NRF51_SOC=y CONFIG_CMSDK_APB_TIMER=y
hw/arm/Kconfig +7 -0
@@ -81,6 +81,7 @@ config MUSICPAL config NETDUINO2 bool + select STM32F205_SOC config NSERIES bool
@@ -262,6 +263,12 @@ config RASPI config STM32F205_SOC bool + select ARM_V7M + select STM32F2XX_TIMER + select STM32F2XX_USART + select STM32F2XX_SYSCFG + select STM32F2XX_ADC + select STM32F2XX_SPI config XLNX_ZYNQMP_ARM bool
Signature · 1 line
1.8.3.1
PATCH 15/25 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 | 10 ++++++++++ 2 files changed, 11 insertions(+), 5 deletions(-)
default-configs/arm-softmmu.mak +1 -5
@@ -4,6 +4,7 @@ CONFIG_ARM_V7M=y CONFIG_ARM_VIRT=y +CONFIG_CUBIEBOARD=y CONFIG_EXYNOS4=y CONFIG_HIGHBANK=y CONFIG_INTEGRATOR=y
@@ -28,7 +29,6 @@ CONFIG_NETDUINO2=y CONFIG_VGA=y CONFIG_SSI_M25P80=y -CONFIG_ALLWINNER_EMAC=y CONFIG_IMX_FEC=y CONFIG_FRAMEBUFFER=y
@@ -55,10 +55,6 @@ CONFIG_IOTKIT_SYSCTL=y CONFIG_IOTKIT_SYSINFO=y CONFIG_ARMSSE_CPUID=y -CONFIG_ALLWINNER_A10_PIT=y -CONFIG_ALLWINNER_A10_PIC=y -CONFIG_ALLWINNER_A10=y - CONFIG_FSL_IMX6=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y
hw/arm/Kconfig +10 -0
@@ -24,6 +24,10 @@ config CHEETAH select OMAP select TSC210X +config CUBIEBOARD + bool + select ALLWINNER_A10 + config DIGIC bool select PTIMER
@@ -257,6 +261,12 @@ config EXYNOS4 config ALLWINNER_A10 bool + select AHCI + select PCI # TODO: Currently required for AHCI, remove this later + select ALLWINNER_A10_PIT + select ALLWINNER_A10_PIC + select ALLWINNER_EMAC + select SERIAL config RASPI bool
Signature · 1 line
1.8.3.1
PATCH 16/25 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 | 19 +------------------ hw/arm/Kconfig | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-)
default-configs/arm-softmmu.mak +1 -18
@@ -26,6 +26,7 @@ CONFIG_Z2=y CONFIG_COLLIE=y CONFIG_ASPEED_SOC=y CONFIG_NETDUINO2=y +CONFIG_MPS2=y CONFIG_VGA=y CONFIG_SSI_M25P80=y
@@ -34,27 +35,9 @@ CONFIG_IMX_FEC=y CONFIG_FRAMEBUFFER=y CONFIG_DIGIC=y -CONFIG_MPS2=y CONFIG_RASPI=y CONFIG_NRF51_SOC=y -CONFIG_CMSDK_APB_TIMER=y -CONFIG_CMSDK_APB_DUALTIMER=y -CONFIG_CMSDK_APB_UART=y -CONFIG_CMSDK_APB_WATCHDOG=y - -CONFIG_MPS2_FPGAIO=y -CONFIG_MPS2_SCC=y - -CONFIG_TZ_MPC=y -CONFIG_TZ_MSC=y -CONFIG_TZ_PPC=y -CONFIG_ARMSSE=y -CONFIG_IOTKIT_SECCTL=y -CONFIG_IOTKIT_SYSCTL=y -CONFIG_IOTKIT_SYSINFO=y -CONFIG_ARMSSE_CPUID=y - CONFIG_FSL_IMX6=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y
hw/arm/Kconfig +17 -0
@@ -315,6 +315,23 @@ config ASPEED_SOC config MPS2 bool + select ARMSSE + select ARMSSE_CPUID + select CMSDK_APB_TIMER + select CMSDK_APB_DUALTIMER + select CMSDK_APB_UART + select CMSDK_APB_WATCHDOG + select IOTKIT_SECCTL + select IOTKIT_SYSCTL + select IOTKIT_SYSINFO + select LAN9118 + select MPS2_FPGAIO + select MPS2_SCC + select PL022 # Serial port + select PL080 # DMA controller + select TZ_MPC + select TZ_MSC + select TZ_PPC config IOTKIT bool
Signature · 1 line
1.8.3.1
PATCH 17/25 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 | 4 ++++ 2 files changed, 5 insertions(+), 3 deletions(-)
default-configs/arm-softmmu.mak +1 -3
@@ -27,15 +27,13 @@ CONFIG_COLLIE=y CONFIG_ASPEED_SOC=y CONFIG_NETDUINO2=y CONFIG_MPS2=y +CONFIG_RASPI=y CONFIG_VGA=y CONFIG_SSI_M25P80=y CONFIG_IMX_FEC=y -CONFIG_FRAMEBUFFER=y - CONFIG_DIGIC=y -CONFIG_RASPI=y CONFIG_NRF51_SOC=y CONFIG_FSL_IMX6=y
hw/arm/Kconfig +4 -0
@@ -270,6 +270,10 @@ config ALLWINNER_A10 config RASPI bool + select FRAMEBUFFER + select PL011 # UART + select SDHCI + select PCI # TODO: Currently required for SDHCI, remove this later config STM32F205_SOC bool
Signature · 1 line
1.8.3.1
PATCH 18/25 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
@@ -28,12 +28,12 @@ CONFIG_ASPEED_SOC=y CONFIG_NETDUINO2=y CONFIG_MPS2=y CONFIG_RASPI=y +CONFIG_DIGIC=y CONFIG_VGA=y CONFIG_SSI_M25P80=y CONFIG_IMX_FEC=y -CONFIG_DIGIC=y CONFIG_NRF51_SOC=y CONFIG_FSL_IMX6=y
hw/arm/Kconfig +1 -0
@@ -31,6 +31,7 @@ config CUBIEBOARD config DIGIC bool select PTIMER + select PFLASH_CFI02 config EXYNOS4 bool
Signature · 1 line
1.8.3.1
Re: [Qemu-arm] [PATCH 18/25] hw/arm: Express dependencies of canon-a1100 with Kconfig
Quoted 3 lines · Thomas Huth
Add
Kconfigdependencies for the DIGIC / canon-a1100 machine.Signed-off-by Thomas Huth <[email protected]>
Quoted 36 lines
--- default-configs/arm-softmmu.mak | 2 +- hw/arm/Kconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)default-configs/arm-softmmu.mak +1
-1@@ -28,12 +28,12 @@ CONFIG_ASPEED_SOC=y CONFIG_NETDUINO2=y CONFIG_MPS2=y CONFIG_RASPI=y +CONFIG_DIGIC=y CONFIG_VGA=y CONFIG_SSI_M25P80=y CONFIG_IMX_FEC=y -CONFIG_DIGIC=y CONFIG_NRF51_SOC=y CONFIG_FSL_IMX6=yhw/arm/Kconfig +1
-0@@ -31,6 +31,7 @@ config CUBIEBOARD config DIGIC bool select PTIMER + select PFLASH_CFI02 config EXYNOS4 bool
PATCH 19/25 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
@@ -29,6 +29,7 @@ CONFIG_NETDUINO2=y CONFIG_MPS2=y CONFIG_RASPI=y CONFIG_DIGIC=y +CONFIG_SABRELITE=y CONFIG_VGA=y CONFIG_SSI_M25P80=y
@@ -36,13 +37,10 @@ CONFIG_IMX_FEC=y CONFIG_NRF51_SOC=y -CONFIG_FSL_IMX6=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y -CONFIG_IMX_I2C=y - CONFIG_PCIE_PORT=y CONFIG_XIO3130=y CONFIG_IOH3420=y
hw/arm/Kconfig +7 -0
@@ -184,6 +184,10 @@ config REALVIEW select DS1338 # I2C RTC+NVRAM select USB_OHCI +config SABRELITE + bool + select FSL_IMX6 + config STELLARIS bool select ARM_V7M
@@ -304,6 +308,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
1.8.3.1
PATCH 20/25 hw/arm: Express dependencies of the MSF2 machine with Kconfig
In reply to Thomas HuthAdd Kconfig dependencies for the emcraft-sf2 machine.
--- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-)
default-configs/arm-softmmu.mak +1 -2
@@ -30,9 +30,9 @@ CONFIG_MPS2=y CONFIG_RASPI=y CONFIG_DIGIC=y CONFIG_SABRELITE=y +CONFIG_MSF2=y CONFIG_VGA=y -CONFIG_SSI_M25P80=y CONFIG_IMX_FEC=y CONFIG_NRF51_SOC=y
@@ -45,5 +45,4 @@ CONFIG_PCIE_PORT=y CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y -CONFIG_MSF2=y CONFIG_PCI_EXPRESS_DESIGNWARE=y
hw/arm/Kconfig +4 -0
@@ -362,7 +362,11 @@ config NRF51_SOC config MSF2 bool + select ARM_V7M select PTIMER + select SERIAL + select SSI + select SSI_M25P80 config ZAURUS bool
Signature · 1 line
1.8.3.1
Re: [Qemu-arm] [PATCH 20/25] hw/arm: Express dependencies of the MSF2 machine with Kconfig
Hi Thomas,
Quoted 34 lines · Thomas Huth
Add
Kconfigdependencies for the emcraft-sf2 machine.Signed-off-by Thomas Huth <[email protected]>--- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-)default-configs/arm-softmmu.mak +1
-2@@ -30,9 +30,9 @@ CONFIG_MPS2=y CONFIG_RASPI=y CONFIG_DIGIC=y CONFIG_SABRELITE=y +CONFIG_MSF2=y CONFIG_VGA=y -CONFIG_SSI_M25P80=y CONFIG_IMX_FEC=y CONFIG_NRF51_SOC=y@@ -45,5 +45,4 @@ CONFIG_PCIE_PORT=y CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y -CONFIG_MSF2=y CONFIG_PCI_EXPRESS_DESIGNWARE=yhw/arm/Kconfig +0
-0
hw/arm/Kconfig config NRF51_SOC · line 362
Quoted 1 line
hw/arm/Kconfig +0
-0@@ -362,7 +362,11 @@ config NRF51_SOC
I'd split the SoC:
hw/arm/Kconfig config NRF51_SOC · line 368
Quoted 6 lines
hw/arm/Kconfig +3
-0config MSF2 bool + select ARM_V7M select PTIMER + select SERIAL + select SSI
from the board, moving SSI_M25P80 to:
config EMCRAFT_SF2
bool
select MSF2
select SSI_M25P80Quoted 4 lines
hw/arm/Kconfig +0
-0config ZAURUS bool
PATCH 21/25 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 | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-)
default-configs/arm-softmmu.mak +0 -2
@@ -33,7 +33,6 @@ CONFIG_SABRELITE=y CONFIG_MSF2=y CONFIG_VGA=y -CONFIG_IMX_FEC=y CONFIG_NRF51_SOC=y
@@ -45,4 +44,3 @@ CONFIG_PCIE_PORT=y CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y -CONFIG_PCI_EXPRESS_DESIGNWARE=y
hw/arm/Kconfig +20 -0
@@ -297,6 +297,10 @@ config XLNX_VERSAL config FSL_IMX25 bool + select IMX + select IMX_FEC + select IMX_I2C + select DS1338 config FSL_IMX31 bool
@@ -311,6 +315,8 @@ config FSL_IMX6 select A9MPCORE select IMX select IMX_I2C + select SDHCI + select PCI # TODO: Currently required for SDHCI, remove this later config ASPEED_SOC bool
@@ -350,12 +356,26 @@ config IOTKIT config FSL_IMX7 bool + imply PCI_DEVICES + select A15MPCORE + select PCI + select IMX + select IMX_FEC + select IMX_I2C + select PCI_EXPRESS_DESIGNWARE + select SDHCI config ARM_SMMUV3 bool config FSL_IMX6UL bool + select A15MPCORE + select IMX + select IMX_FEC + select IMX_I2C + select SDHCI + select PCI # TODO: Currently required for SDHCI, remove this later config NRF51_SOC bool
Signature · 1 line
1.8.3.1
PATCH 22/25 hw/arm: Express dependencies of nrf51 Kconfig
In reply to Thomas HuthAdd Kconfig dependencies for the NRF51 / microbit machine.
--- hw/arm/Kconfig | 2 ++ 1 file changed, 2 insertions(+)
hw/arm/Kconfig +2 -0
@@ -379,6 +379,8 @@ config FSL_IMX6UL config NRF51_SOC bool + select I2C + select ARM_V7M config MSF2 bool
Signature · 1 line
1.8.3.1
Re: [Qemu-arm] [PATCH 22/25] hw/arm: Express dependencies of nrf51 Kconfig
Hi Thomas,
Quoted 12 lines · Thomas Huth
Add
Kconfigdependencies for the NRF51 / microbit machine.Signed-off-by Thomas Huth <[email protected]>--- hw/arm/Kconfig | 2 ++ 1 file changed, 2 insertions(+)hw/arm/Kconfig +0
-0
hw/arm/Kconfig config FSL_IMX6UL · line 383
Quoted 5 lines
hw/arm/Kconfig +2
-0@@ -379,6 +379,8 @@ config FSL_IMX6UL config NRF51_SOC bool + select I2C + select ARM_V7M
Don't we need a microbit config too?
config MICROBIT
bool
select NRF51_SOC
Quoted 4 lines
hw/arm/Kconfig +0
-0config MSF2 bool
Re: [Qemu-arm] [PATCH 22/25] hw/arm: Express dependencies of nrf51 Kconfig
Quoted 16 lines · Philippe Mathieu-Daudé
Hi Thomas,
Quoted 13 lines · Thomas Huth
Add
Kconfigdependencies for the NRF51 / microbit machine.Signed-off-by Thomas Huth <[email protected]>--- hw/arm/Kconfig | 2 ++ 1 file changed, 2 insertions(+)hw/arm/Kconfig +0
-0@@ -379,6 +379,8 @@ config FSL_IMX6UL
Quoted 6 lines
hw/arm/Kconfig config FSL_IMX6UL · line 383
Quoted 4 lines
hw/arm/Kconfig +2
-0config NRF51_SOC bool + select I2C + select ARM_V7MDon't we need a microbit config too?
As long as we do not have another board that uses the NRF51-SoC, it does not matter that much ... but yes, it's likely cleaner to have a proper switch for the machine right from the start. I'll fix it in v2 ...
Thomas
PATCH 23/25 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 | 12 ++++++++++++ hw/display/Kconfig | 1 + 3 files changed, 13 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 +12 -0
@@ -291,6 +291,18 @@ 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 + select PCI # TODO: Currently required for SDHCI and AHCI, remove later config XLNX_VERSAL bool
hw/display/Kconfig +1 -0
@@ -108,3 +108,4 @@ config VIRTIO_VGA config DPCD bool + select AUX
Signature · 1 line
1.8.3.1
Re: [Qemu-arm] [PATCH 23/25] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
Quoted 1 line · Thomas Huth
+ select PCI # TODO: Currently required for SDHCI and AHCI, remove later
I think SDHCI and AHCI should select it instead, similar to how FDC selects ISA_BUS (see patch 25 of the Kconfig series).
Paolo
Re: [Qemu-arm] [PATCH 23/25] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig
Quoted 5 lines · Paolo Bonzini
Quoted 1 line · Thomas Huth
+ select PCI # TODO: Currently required for SDHCI and AHCI, remove later
I think SDHCI and AHCI should select it instead, similar to how FDC selects
ISA_BUS(see patch 25 of theKconfigseries).
Yes, that's likely the better way to work-around this issue. I'll add that in v2 ...
Thomas
PATCH 24/25 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
@@ -306,6 +306,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
1.8.3.1
PATCH 25/25 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 | 9 --------- 1 file changed, 9 deletions(-)
default-configs/arm-softmmu.mak +0 -9
@@ -31,16 +31,7 @@ CONFIG_RASPI=y CONFIG_DIGIC=y CONFIG_SABRELITE=y CONFIG_MSF2=y - -CONFIG_VGA=y - CONFIG_NRF51_SOC=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
1.8.3.1