summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Huth <thuth@redhat.com>2019-02-08 10:55:38 +0100
committerThomas Huth <thuth@redhat.com>2019-05-13 09:36:31 +0200
commit627b06ed6cbd45e38985223fa2135a2dd4f895de (patch)
tree44e7d5c9d833fd528adb6ac8bc51f04f2a8510b1
parent1ad846a28eadfe71f0a18dadcffbb5acabea0f64 (diff)
hw/arm: Express dependencies of canon-a1100 with Kconfig
Add Kconfig dependencies for the DIGIC / canon-a1100 machine. Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Signed-off-by: Thomas Huth <thuth@redhat.com>
-rw-r--r--default-configs/arm-softmmu.mak2
-rw-r--r--hw/arm/Kconfig1
2 files changed, 2 insertions, 1 deletions
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 22bff20b32..76508e3910 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -32,12 +32,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
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 40be78303c..abf2af0967 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -32,6 +32,7 @@ config CUBIEBOARD
config DIGIC
bool
select PTIMER
+ select PFLASH_CFI02
config EXYNOS4
bool