From 1ad846a28eadfe71f0a18dadcffbb5acabea0f64 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Fri, 8 Feb 2019 10:22:54 +0100 Subject: [PATCH] hw/arm: Express dependencies of the raspi machines with Kconfig MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Most of the code is directly controlled by the CONFIG_RASPI switch, so not much to add here additionally. Reviewed-by: Alistair Francis Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth --- default-configs/arm-softmmu.mak | 4 +--- hw/arm/Kconfig | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 31d31d3f4a..22bff20b32 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -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 diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 55f7e5bfce..40be78303c 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -258,6 +258,9 @@ config ALLWINNER_A10 config RASPI bool + select FRAMEBUFFER + select PL011 # UART + select SDHCI config STM32F205_SOC bool