Commit b6e2b220 authored by Thomas Huth's avatar Thomas Huth
Browse files

hw/arm: Express dependencies of the MSF2 / EMCRAFT_SF2 machine with Kconfig 



Add Kconfig dependencies for the emcraft-sf2 machine - we also
distinguish between the machine (CONFIG_EMCRAFT_SF2) and the SoC
(CONFIG_MSF2) now.

Reviewed-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: default avatarPhilippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: default avatarThomas Huth <thuth@redhat.com>
parent 5c6e99a7

default-configs/arm-softmmu.mak

+1 −2
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@ CONFIG_MPS2=y 
CONFIG_RASPI=y

CONFIG_DIGIC=y

CONFIG_SABRELITE=y

CONFIG_EMCRAFT_SF2=y



CONFIG_VGA=y

CONFIG_SSI_M25P80=y

CONFIG_IMX_FEC=y



CONFIG_NRF51_SOC=y
@@ -49,5 +49,4 @@ CONFIG_PCIE_PORT=y 
CONFIG_XIO3130=y

CONFIG_IOH3420=y

CONFIG_I82801B11=y

CONFIG_MSF2=y

CONFIG_PCI_EXPRESS_DESIGNWARE=y

hw/arm/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -334,9 +334,17 @@ config FSL_IMX6UL 
config NRF51_SOC

    bool



config EMCRAFT_SF2

    bool

    select MSF2

    select SSI_M25P80



config MSF2

    bool

    select ARM_V7M

    select PTIMER

    select SERIAL

    select SSI



config ZAURUS

    bool

hw/arm/Makefile.objs

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ obj-$(CONFIG_ARM_VIRT) += virt.o 
obj-$(CONFIG_ACPI) += virt-acpi-build.o

obj-$(CONFIG_DIGIC) += digic_boards.o

obj-$(CONFIG_EXYNOS4) += exynos4_boards.o

obj-$(CONFIG_EMCRAFT_SF2) += msf2-som.o

obj-$(CONFIG_HIGHBANK) += highbank.o

obj-$(CONFIG_INTEGRATOR) += integratorcp.o

obj-$(CONFIG_MAINSTONE) += mainstone.o
@@ -41,7 +42,7 @@ obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o 
obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o

obj-$(CONFIG_MPS2) += mps2.o

obj-$(CONFIG_MPS2) += mps2-tz.o

obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o

obj-$(CONFIG_MSF2) += msf2-soc.o

obj-$(CONFIG_MUSCA) += musca.o

obj-$(CONFIG_ARMSSE) += armsse.o

obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o