[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 13/28] hw/arm: Express dependencies of collie with Kc
From: |
Thomas Huth |
Subject: |
[Qemu-devel] [PULL 13/28] hw/arm: Express dependencies of collie with Kconfig |
Date: |
Sun, 5 May 2019 15:56:59 +0200 |
Add Kconfig dependencies for the Strongarm collie machine.
This patch is based on earlier work by Ákos Kovács (i.e.
his "hw/arm/Kconfig: Add ARM Kconfig" patch).
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
default-configs/arm-softmmu.mak | 3 +--
hw/arm/Kconfig | 7 +++++++
hw/arm/Makefile.objs | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index af78e7c892..25e8f717ac 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -25,6 +25,7 @@ CONFIG_GUMSTIX=y
CONFIG_SPITZ=y
CONFIG_TOSA=y
CONFIG_Z2=y
+CONFIG_COLLIE=y
CONFIG_VGA=y
CONFIG_TMP421=y
@@ -97,5 +98,3 @@ CONFIG_GPIO_KEY=y
CONFIG_MSF2=y
CONFIG_FW_CFG_DMA=y
CONFIG_PCI_EXPRESS_DESIGNWARE=y
-
-CONFIG_STRONGARM=y
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index dfdc1b1fd6..a507144d9a 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -169,6 +169,13 @@ config STELLARIS
config STRONGARM
bool
+ select PXA2XX
+
+config COLLIE
+ bool
+ select PFLASH_CFI01
+ select ZAURUS # scoop
+ select STRONGARM
config SX1
bool
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
index 00328d1b0b..729e711b87 100644
--- a/hw/arm/Makefile.objs
+++ b/hw/arm/Makefile.objs
@@ -17,7 +17,7 @@ obj-$(CONFIG_TOSA) += tosa.o
obj-$(CONFIG_Z2) += z2.o
obj-$(CONFIG_REALVIEW) += realview.o
obj-$(CONFIG_STELLARIS) += stellaris.o
-obj-$(CONFIG_STRONGARM) += collie.o
+obj-$(CONFIG_COLLIE) += collie.o
obj-$(CONFIG_VERSATILE) += versatilepb.o
obj-$(CONFIG_VEXPRESS) += vexpress.o
obj-$(CONFIG_ZYNQ) += xilinx_zynq.o
--
2.21.0
- [Qemu-devel] [PULL 04/28] hw/arm: Express dependencies of the highbank machines with Kconfig, (continued)
- [Qemu-devel] [PULL 04/28] hw/arm: Express dependencies of the highbank machines with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 05/28] hw/arm: Express dependencies of integratorcp with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 07/28] hw/arm: Express dependencies of musicpal with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 06/28] hw/arm: Express dependencies of the fsl-imx31 machine with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 09/28] hw/arm: Express dependencies of stellaris with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 08/28] hw/arm: Express dependencies of the OMAP machines with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 10/28] hw/arm: Express dependencies of realview, versatile and vexpress with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 12/28] hw/arm: Express dependencies of xilinx-zynq with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 11/28] hw/arm: Express dependencies of the PXA2xx machines with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 14/28] hw/arm: Express dependencies of the aspeed boards with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 13/28] hw/arm: Express dependencies of collie with Kconfig,
Thomas Huth <=
- [Qemu-devel] [PULL 15/28] hw/arm: Express dependencies of the virt machine with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 16/28] hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 17/28] hw/arm: Express dependencies of allwinner / cubieboard with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 19/28] hw/arm: Express dependencies of the raspi machines with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 20/28] hw/arm: Express dependencies of canon-a1100 with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 18/28] hw/arm: Express dependencies of the MPS2 boards with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 21/28] hw/arm: Express dependencies of sabrelite with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 23/28] hw/arm: Express dependencies of the remaining IMX boards with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 25/28] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig, Thomas Huth, 2019/05/05
- [Qemu-devel] [PULL 26/28] hw/arm: Express dependencies of the xlnx-versal-virt machine with Kconfig, Thomas Huth, 2019/05/05