[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v2 17/25] hw/arm: Express dependencies of the raspi ma
From: |
Thomas Huth |
Subject: |
[Qemu-arm] [PATCH v2 17/25] hw/arm: Express dependencies of the raspi machines with Kconfig |
Date: |
Wed, 13 Feb 2019 09:38:10 +0100 |
Most of the code is directly controlled by the CONFIG_RASPI switch,
so not much to add here additionally.
Note that CONFIG_SDHCI currently has a hard requirement for PCI, so
we select that switch now always there instead of depending on it.
We should split up sdhci.c into sysbus and pci parts later to get
rid of this hard requirement.
Signed-off-by: Thomas Huth <address@hidden>
---
default-configs/arm-softmmu.mak | 4 +---
hw/arm/Kconfig | 3 +++
hw/sd/Kconfig | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index b530a06..6605786 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -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
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index d17bd2f..bb385a5 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -269,6 +269,9 @@ config ALLWINNER_A10
config RASPI
bool
+ select FRAMEBUFFER
+ select PL011 # UART
+ select SDHCI
config STM32F205_SOC
bool
diff --git a/hw/sd/Kconfig b/hw/sd/Kconfig
index 864f535..29e359b 100644
--- a/hw/sd/Kconfig
+++ b/hw/sd/Kconfig
@@ -13,5 +13,5 @@ config SD
config SDHCI
bool
default y if PCI_DEVICES
- depends on PCI
+ select PCI # TODO: Split up sdhci.c into sysbus and pci parts
select SD
--
1.8.3.1
- [Qemu-arm] [PATCH v2 00/25] Kconfig dependencies for ARM machines, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 25/25] hw/arm: Remove hard-enablement of the remaining PCI devices, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 23/25] hw/arm: Express dependencies of the ZynqMP zcu102 machine with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 22/25] hw/arm: Express dependencies of the microbit / nrf51 machine with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 20/25] hw/arm: Express dependencies of the MSF2 machine with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 18/25] hw/arm: Express dependencies of canon-a1100 with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 17/25] hw/arm: Express dependencies of the raspi machines with Kconfig,
Thomas Huth <=
- [Qemu-arm] [PATCH v2 21/25] hw/arm: Express dependencies for remaining IMX boards with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 13/25] hw/arm: Express dependencies of the virt machine with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 24/25] hw/arm: Express dependencies of the xlnx-versal-virt machine with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 12/25] hw/arm: Express dependencies of the aspeed boards with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 14/25] hw/arm: Express dependencies of netduino / stm32f2xx with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 15/25] hw/arm: Express dependencies of allwinner / cubieboard with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 19/25] hw/arm: Express dependencies of sabrelite with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 16/25] hw/arm: Express dependencies of the MPS2 boards with Kconfig, Thomas Huth, 2019/02/13
- [Qemu-arm] [PATCH v2 08/25] hw/arm: Express dependencies of realview, versatile and vexpress with Kconfig, Thomas Huth, 2019/02/13