| Message ID | 20190418180057.3593-24-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Kconfig dependencies for ARM machines | expand |
On 4/18/19 8:00 PM, Thomas Huth wrote: > Add Kconfig dependencies for the emcraft-sf2 machine - we also > distinguish between the machine (CONFIG_EMCRAFT_SF2) and the SoC > (CONFIG_MSF2) now. Thanks! > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > default-configs/arm-softmmu.mak | 3 +-- > hw/arm/Kconfig | 8 ++++++++ > hw/arm/Makefile.objs | 3 ++- > 3 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index ef7dd7156a..1455d083d8 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -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 > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index 065c7acf1b..f5cd63860d 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -331,9 +331,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 > diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs > index fadd69882c..eae9f6c442 100644 > --- a/hw/arm/Makefile.objs > +++ b/hw/arm/Makefile.objs > @@ -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 >
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index ef7dd7156a..1455d083d8 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -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 diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 065c7acf1b..f5cd63860d 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -331,9 +331,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 diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index fadd69882c..eae9f6c442 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -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
Add Kconfig dependencies for the emcraft-sf2 machine - we also distinguish between the machine (CONFIG_EMCRAFT_SF2) and the SoC (CONFIG_MSF2) now. Signed-off-by: Thomas Huth <thuth@redhat.com> --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 8 ++++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-)