mirror of https://github.com/proxmox/mirror_qemu
- Improvements for the Kconfig switches and Makefiles
-----BEGIN PGP SIGNATURE----- iQJFBAABCAAvFiEEJ7iIR+7gJQEY8+q5LtnXdP5wLbUFAl1boLERHHRodXRoQHJl ZGhhdC5jb20ACgkQLtnXdP5wLbUxtg//evYiy6kwDTPBCydeY/ClxowFWN9xrNbG 0/ZETqNRiaW+dYreRW7mbb3dto79ROPr6tbaUuKKVUIW3Oc7dqEfavoWFVY5AN1h hK8GtNYbKP7zbUyTNW85HsBJufGmglNtSlMuVtliwrVx7q/1mFOsjAmk8nL3NjrJ FhOsgfUWlZJRK3zDAf/y4uQmJcCJKu3fqPet9Aga0Z7F25MtVCYNvsGWbdkKPz/h kg1AqrHGbifhpTtqmeQcSxYpknktIxu3E9mhlZMACwRFs33nho4v170S/pkBmhMW TvjYhjfCj4ioZD8PqR35P25rTlDkEFXBH1ZAiAW0mz6eR06Z6XSMR7kl1ZTtZBj5 f/7D7CpY1ChyFGXUcHn0y2wKqqj0Au16pGHUZ0ohqa+fHYH6vSbu7NVhZdkQavMm GcaX9WTjQPHxuDrxL4X1rUSEzUWXtHeOY3p1iXWrHK0kTpNS1O4QSuu1F058Pe2i TaxMkRyfnUO7HcaCiynqVKDUXFKF7vxixT2hqo1bNGphuQoRIymx2AlVnmbJB3FI TCQMXYoQNFvO1C3kSeguFnRacP2PrGKQMcKUH6IafqzS7gyYbOiw5cD8d6UF+g1C 4/iGcvAcEZ8crfVKWb45epfv1tgvHvvPhzYs0ZrRRET0qaaCVWAZzlBo7Np7LkB+ CnttH+10OMM= =LzaF -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-08-20' into staging - Improvements for the Kconfig switches and Makefiles # gpg: Signature made Tue 20 Aug 2019 08:26:41 BST # gpg: using RSA key 27B88847EEE0250118F3EAB92ED9D774FE702DB5 # gpg: issuer "thuth@redhat.com" # gpg: Good signature from "Thomas Huth <th.huth@gmx.de>" [full] # gpg: aka "Thomas Huth <thuth@redhat.com>" [full] # gpg: aka "Thomas Huth <huth@tuxfamily.org>" [full] # gpg: aka "Thomas Huth <th.huth@posteo.de>" [unknown] # Primary key fingerprint: 27B8 8847 EEE0 2501 18F3 EAB9 2ED9 D774 FE70 2DB5 * remotes/huth-gitlab/tags/pull-request-2019-08-20: hw/core: Add a config switch for the generic loader device hw/misc: Add a config switch for the "unimplemented" device hw/core: Add a config switch for the "split-irq" device hw/core: Add a config switch for the "or-irq" device hw/core: Add a config switch for the "register" device hw/dma: Do not build the xlnx_dpdma device for the MicroBlaze machines hw/intc: Only build the xlnx-iomod-intc device for the MicroBlaze PMU hw/Kconfig: Move the generic XLNX_ZYNQMP to the root hw/Kconfig Signed-off-by: Peter Maydell <peter.maydell@linaro.org>master
commit
17dc579903
|
@ -73,3 +73,7 @@ config XILINX
|
||||||
config XILINX_AXI
|
config XILINX_AXI
|
||||||
bool
|
bool
|
||||||
select PTIMER # for hw/dma/xilinx_axidma.c
|
select PTIMER # for hw/dma/xilinx_axidma.c
|
||||||
|
|
||||||
|
config XLNX_ZYNQMP
|
||||||
|
bool
|
||||||
|
select REGISTER
|
||||||
|
|
|
@ -81,6 +81,8 @@ config MUSCA
|
||||||
select ARMSSE
|
select ARMSSE
|
||||||
select PL011
|
select PL011
|
||||||
select PL031
|
select PL031
|
||||||
|
select SPLIT_IRQ
|
||||||
|
select UNIMP
|
||||||
|
|
||||||
config MUSICPAL
|
config MUSICPAL
|
||||||
bool
|
bool
|
||||||
|
@ -216,6 +218,7 @@ config STELLARIS
|
||||||
select SSI_SD
|
select SSI_SD
|
||||||
select STELLARIS_INPUT
|
select STELLARIS_INPUT
|
||||||
select STELLARIS_ENET # ethernet
|
select STELLARIS_ENET # ethernet
|
||||||
|
select UNIMP
|
||||||
|
|
||||||
config STRONGARM
|
config STRONGARM
|
||||||
bool
|
bool
|
||||||
|
@ -282,6 +285,7 @@ config ALLWINNER_A10
|
||||||
select ALLWINNER_A10_PIC
|
select ALLWINNER_A10_PIC
|
||||||
select ALLWINNER_EMAC
|
select ALLWINNER_EMAC
|
||||||
select SERIAL
|
select SERIAL
|
||||||
|
select UNIMP
|
||||||
|
|
||||||
config RASPI
|
config RASPI
|
||||||
bool
|
bool
|
||||||
|
@ -292,6 +296,7 @@ config RASPI
|
||||||
config STM32F205_SOC
|
config STM32F205_SOC
|
||||||
bool
|
bool
|
||||||
select ARM_V7M
|
select ARM_V7M
|
||||||
|
select OR_IRQ
|
||||||
select STM32F2XX_TIMER
|
select STM32F2XX_TIMER
|
||||||
select STM32F2XX_USART
|
select STM32F2XX_USART
|
||||||
select STM32F2XX_SYSCFG
|
select STM32F2XX_SYSCFG
|
||||||
|
@ -318,6 +323,7 @@ config XLNX_VERSAL
|
||||||
select PL011
|
select PL011
|
||||||
select CADENCE
|
select CADENCE
|
||||||
select VIRTIO_MMIO
|
select VIRTIO_MMIO
|
||||||
|
select UNIMP
|
||||||
|
|
||||||
config FSL_IMX25
|
config FSL_IMX25
|
||||||
bool
|
bool
|
||||||
|
@ -353,6 +359,7 @@ config ASPEED_SOC
|
||||||
select SSI_M25P80
|
select SSI_M25P80
|
||||||
select TMP105
|
select TMP105
|
||||||
select TMP421
|
select TMP421
|
||||||
|
select UNIMP
|
||||||
|
|
||||||
config MPS2
|
config MPS2
|
||||||
bool
|
bool
|
||||||
|
@ -360,8 +367,11 @@ config MPS2
|
||||||
select LAN9118
|
select LAN9118
|
||||||
select MPS2_FPGAIO
|
select MPS2_FPGAIO
|
||||||
select MPS2_SCC
|
select MPS2_SCC
|
||||||
|
select OR_IRQ
|
||||||
select PL022 # Serial port
|
select PL022 # Serial port
|
||||||
select PL080 # DMA controller
|
select PL080 # DMA controller
|
||||||
|
select SPLIT_IRQ
|
||||||
|
select UNIMP
|
||||||
|
|
||||||
config FSL_IMX7
|
config FSL_IMX7
|
||||||
bool
|
bool
|
||||||
|
@ -374,6 +384,7 @@ config FSL_IMX7
|
||||||
select IMX_I2C
|
select IMX_I2C
|
||||||
select PCI_EXPRESS_DESIGNWARE
|
select PCI_EXPRESS_DESIGNWARE
|
||||||
select SDHCI
|
select SDHCI
|
||||||
|
select UNIMP
|
||||||
|
|
||||||
config ARM_SMMUV3
|
config ARM_SMMUV3
|
||||||
bool
|
bool
|
||||||
|
@ -385,6 +396,7 @@ config FSL_IMX6UL
|
||||||
select IMX_FEC
|
select IMX_FEC
|
||||||
select IMX_I2C
|
select IMX_I2C
|
||||||
select SDHCI
|
select SDHCI
|
||||||
|
select UNIMP
|
||||||
|
|
||||||
config MICROBIT
|
config MICROBIT
|
||||||
bool
|
bool
|
||||||
|
@ -394,6 +406,7 @@ config NRF51_SOC
|
||||||
bool
|
bool
|
||||||
select I2C
|
select I2C
|
||||||
select ARM_V7M
|
select ARM_V7M
|
||||||
|
select UNIMP
|
||||||
|
|
||||||
config EMCRAFT_SF2
|
config EMCRAFT_SF2
|
||||||
bool
|
bool
|
||||||
|
@ -406,6 +419,7 @@ config MSF2
|
||||||
select PTIMER
|
select PTIMER
|
||||||
select SERIAL
|
select SERIAL
|
||||||
select SSI
|
select SSI
|
||||||
|
select UNIMP
|
||||||
|
|
||||||
config ZAURUS
|
config ZAURUS
|
||||||
bool
|
bool
|
||||||
|
@ -439,9 +453,12 @@ config ARMSSE
|
||||||
select IOTKIT_SECCTL
|
select IOTKIT_SECCTL
|
||||||
select IOTKIT_SYSCTL
|
select IOTKIT_SYSCTL
|
||||||
select IOTKIT_SYSINFO
|
select IOTKIT_SYSINFO
|
||||||
|
select OR_IRQ
|
||||||
|
select SPLIT_IRQ
|
||||||
select TZ_MPC
|
select TZ_MPC
|
||||||
select TZ_MSC
|
select TZ_MSC
|
||||||
select TZ_PPC
|
select TZ_PPC
|
||||||
|
select UNIMP
|
||||||
|
|
||||||
config ARMSSE_CPUID
|
config ARMSSE_CPUID
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -7,5 +7,18 @@ config PTIMER
|
||||||
config FITLOADER
|
config FITLOADER
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
config GENERIC_LOADER
|
||||||
|
bool
|
||||||
|
default y
|
||||||
|
|
||||||
|
config OR_IRQ
|
||||||
|
bool
|
||||||
|
|
||||||
config PLATFORM_BUS
|
config PLATFORM_BUS
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
config REGISTER
|
||||||
|
bool
|
||||||
|
|
||||||
|
config SPLIT_IRQ
|
||||||
|
bool
|
||||||
|
|
|
@ -17,11 +17,11 @@ common-obj-$(CONFIG_SOFTMMU) += machine.o
|
||||||
common-obj-$(CONFIG_SOFTMMU) += loader.o
|
common-obj-$(CONFIG_SOFTMMU) += loader.o
|
||||||
common-obj-$(CONFIG_FITLOADER) += loader-fit.o
|
common-obj-$(CONFIG_FITLOADER) += loader-fit.o
|
||||||
common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
|
common-obj-$(CONFIG_SOFTMMU) += qdev-properties-system.o
|
||||||
common-obj-$(CONFIG_SOFTMMU) += register.o
|
common-obj-$(CONFIG_REGISTER) += register.o
|
||||||
common-obj-$(CONFIG_SOFTMMU) += or-irq.o
|
common-obj-$(CONFIG_OR_IRQ) += or-irq.o
|
||||||
common-obj-$(CONFIG_SOFTMMU) += split-irq.o
|
common-obj-$(CONFIG_SPLIT_IRQ) += split-irq.o
|
||||||
common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
|
common-obj-$(CONFIG_PLATFORM_BUS) += platform-bus.o
|
||||||
common-obj-$(CONFIG_SOFTMMU) += generic-loader.o
|
common-obj-$(CONFIG_GENERIC_LOADER) += generic-loader.o
|
||||||
common-obj-$(CONFIG_SOFTMMU) += null-machine.o
|
common-obj-$(CONFIG_SOFTMMU) += null-machine.o
|
||||||
|
|
||||||
obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o
|
obj-$(CONFIG_SOFTMMU) += machine-qmp-cmds.o
|
||||||
|
|
|
@ -16,6 +16,7 @@ config I8257
|
||||||
|
|
||||||
config ZYNQ_DEVCFG
|
config ZYNQ_DEVCFG
|
||||||
bool
|
bool
|
||||||
|
select REGISTER
|
||||||
|
|
||||||
config STP2000
|
config STP2000
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -8,7 +8,6 @@ common-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o
|
||||||
common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
|
common-obj-$(CONFIG_ZYNQ_DEVCFG) += xlnx-zynq-devcfg.o
|
||||||
common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
|
common-obj-$(CONFIG_ETRAXFS) += etraxfs_dma.o
|
||||||
common-obj-$(CONFIG_STP2000) += sparc32_dma.o
|
common-obj-$(CONFIG_STP2000) += sparc32_dma.o
|
||||||
obj-$(CONFIG_XLNX_ZYNQMP) += xlnx_dpdma.o
|
|
||||||
obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
|
obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx_dpdma.o
|
||||||
common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
|
common-obj-$(CONFIG_XLNX_ZYNQMP_ARM) += xlnx-zdma.o
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ common-obj-$(CONFIG_I8259) += i8259_common.o i8259.o
|
||||||
common-obj-$(CONFIG_PL190) += pl190.o
|
common-obj-$(CONFIG_PL190) += pl190.o
|
||||||
common-obj-$(CONFIG_PUV3) += puv3_intc.o
|
common-obj-$(CONFIG_PUV3) += puv3_intc.o
|
||||||
common-obj-$(CONFIG_XILINX) += xilinx_intc.o
|
common-obj-$(CONFIG_XILINX) += xilinx_intc.o
|
||||||
common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-pmu-iomod-intc.o
|
common-obj-$(CONFIG_XLNX_ZYNQMP_PMU) += xlnx-pmu-iomod-intc.o
|
||||||
common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-ipi.o
|
common-obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp-ipi.o
|
||||||
common-obj-$(CONFIG_ETRAXFS) += etraxfs_pic.o
|
common-obj-$(CONFIG_ETRAXFS) += etraxfs_pic.o
|
||||||
common-obj-$(CONFIG_IMX) += imx_avic.o imx_gpcv2.o
|
common-obj-$(CONFIG_IMX) += imx_avic.o imx_gpcv2.o
|
||||||
|
|
|
@ -4,6 +4,7 @@ config PETALOGIX_S3ADSP1800
|
||||||
select XILINX
|
select XILINX
|
||||||
select XILINX_AXI
|
select XILINX_AXI
|
||||||
select XILINX_ETHLITE
|
select XILINX_ETHLITE
|
||||||
|
select UNIMP
|
||||||
|
|
||||||
config PETALOGIX_ML605
|
config PETALOGIX_ML605
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -117,4 +117,7 @@ config AUX
|
||||||
bool
|
bool
|
||||||
select I2C
|
select I2C
|
||||||
|
|
||||||
|
config UNIMP
|
||||||
|
bool
|
||||||
|
|
||||||
source macio/Kconfig
|
source macio/Kconfig
|
||||||
|
|
|
@ -9,7 +9,7 @@ common-obj-$(CONFIG_PCI_TESTDEV) += pci-testdev.o
|
||||||
common-obj-$(CONFIG_EDU) += edu.o
|
common-obj-$(CONFIG_EDU) += edu.o
|
||||||
common-obj-$(CONFIG_PCA9552) += pca9552.o
|
common-obj-$(CONFIG_PCA9552) += pca9552.o
|
||||||
|
|
||||||
common-obj-y += unimp.o
|
common-obj-$(CONFIG_UNIMP) += unimp.o
|
||||||
common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o
|
common-obj-$(CONFIG_FW_CFG_DMA) += vmcoreinfo.o
|
||||||
|
|
||||||
# ARM devices
|
# ARM devices
|
||||||
|
|
|
@ -2,8 +2,9 @@ config PAM
|
||||||
bool
|
bool
|
||||||
|
|
||||||
config PREP_PCI
|
config PREP_PCI
|
||||||
select PCI
|
|
||||||
bool
|
bool
|
||||||
|
select PCI
|
||||||
|
select OR_IRQ
|
||||||
|
|
||||||
config GRACKLE_PCI
|
config GRACKLE_PCI
|
||||||
select PCI
|
select PCI
|
||||||
|
|
|
@ -17,3 +17,4 @@ config NIAGARA
|
||||||
bool
|
bool
|
||||||
select EMPTY_SLOT
|
select EMPTY_SLOT
|
||||||
select SUN4V_RTC
|
select SUN4V_RTC
|
||||||
|
select UNIMP
|
||||||
|
|
|
@ -34,9 +34,6 @@ config TWL92230
|
||||||
bool
|
bool
|
||||||
depends on I2C
|
depends on I2C
|
||||||
|
|
||||||
config XLNX_ZYNQMP
|
|
||||||
bool
|
|
||||||
|
|
||||||
config ALTERA_TIMER
|
config ALTERA_TIMER
|
||||||
bool
|
bool
|
||||||
select PTIMER
|
select PTIMER
|
||||||
|
|
Loading…
Reference in New Issue