OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

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: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2019-02-08 12:00:29 +01:00
parent 5c6e99a729
commit b6e2b2200c
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
default-configs/arm-softmmu.mak
View File

@ -34,9 +34,9 @@ CONFIG_MPS2=y
CONFIG_RASPI=y CONFIG_RASPI=y
CONFIG_DIGIC=y CONFIG_DIGIC=y
CONFIG_SABRELITE=y CONFIG_SABRELITE=y
CONFIG_EMCRAFT_SF2=y
CONFIG_VGA=y CONFIG_VGA=y
CONFIG_SSI_M25P80=y
CONFIG_IMX_FEC=y CONFIG_IMX_FEC=y
CONFIG_NRF51_SOC=y CONFIG_NRF51_SOC=y
@ -49,5 +49,4 @@ CONFIG_PCIE_PORT=y
CONFIG_XIO3130=y CONFIG_XIO3130=y
CONFIG_IOH3420=y CONFIG_IOH3420=y
CONFIG_I82801B11=y CONFIG_I82801B11=y
CONFIG_MSF2=y
CONFIG_PCI_EXPRESS_DESIGNWARE=y CONFIG_PCI_EXPRESS_DESIGNWARE=y

8
hw/arm/Kconfig
View File

@ -334,9 +334,17 @@ config FSL_IMX6UL
config NRF51_SOC config NRF51_SOC
bool bool
config EMCRAFT_SF2
bool
select MSF2
select SSI_M25P80
config MSF2 config MSF2
bool bool
select ARM_V7M
select PTIMER select PTIMER
select SERIAL
select SSI
config ZAURUS config ZAURUS
bool bool

3
hw/arm/Makefile.objs
View File

@ -4,6 +4,7 @@ obj-$(CONFIG_ARM_VIRT) += virt.o
obj-$(CONFIG_ACPI) += virt-acpi-build.o obj-$(CONFIG_ACPI) += virt-acpi-build.o
obj-$(CONFIG_DIGIC) += digic_boards.o obj-$(CONFIG_DIGIC) += digic_boards.o
obj-$(CONFIG_EXYNOS4) += exynos4_boards.o obj-$(CONFIG_EXYNOS4) += exynos4_boards.o
obj-$(CONFIG_EMCRAFT_SF2) += msf2-som.o
obj-$(CONFIG_HIGHBANK) += highbank.o obj-$(CONFIG_HIGHBANK) += highbank.o
obj-$(CONFIG_INTEGRATOR) += integratorcp.o obj-$(CONFIG_INTEGRATOR) += integratorcp.o
obj-$(CONFIG_MAINSTONE) += mainstone.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_ASPEED_SOC) += aspeed_soc.o aspeed.o
obj-$(CONFIG_MPS2) += mps2.o obj-$(CONFIG_MPS2) += mps2.o
obj-$(CONFIG_MPS2) += mps2-tz.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_MUSCA) += musca.o
obj-$(CONFIG_ARMSSE) += armsse.o obj-$(CONFIG_ARMSSE) += armsse.o
obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o