| Message ID | 20190418180057.3593-26-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Kconfig dependencies for ARM machines | expand |
On Thu, Apr 18, 2019 at 11:23 AM Thomas Huth <thuth@redhat.com> wrote: > > Add Kconfig dependencies for the NRF51 / microbit machine. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > default-configs/arm-softmmu.mak | 3 +-- > hw/arm/Kconfig | 6 ++++++ > hw/arm/Makefile.objs | 3 ++- > 3 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index 6dc388c43e..233937f394 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -35,11 +35,10 @@ CONFIG_RASPI=y > CONFIG_DIGIC=y > CONFIG_SABRELITE=y > CONFIG_EMCRAFT_SF2=y > +CONFIG_MICROBIT=y > > CONFIG_VGA=y > > -CONFIG_NRF51_SOC=y > - > CONFIG_FSL_IMX25=y > CONFIG_FSL_IMX7=y > CONFIG_FSL_IMX6UL=y > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index 58439c492a..708eae19e5 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -347,8 +347,14 @@ config FSL_IMX6UL > select IMX_I2C > select SDHCI > > +config MICROBIT > + bool > + select NRF51_SOC > + > config NRF51_SOC > bool > + select I2C > + select ARM_V7M > > config EMCRAFT_SF2 > bool > diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs > index eae9f6c442..994e67dd0d 100644 > --- a/hw/arm/Makefile.objs > +++ b/hw/arm/Makefile.objs > @@ -8,6 +8,7 @@ obj-$(CONFIG_EMCRAFT_SF2) += msf2-som.o > obj-$(CONFIG_HIGHBANK) += highbank.o > obj-$(CONFIG_INTEGRATOR) += integratorcp.o > obj-$(CONFIG_MAINSTONE) += mainstone.o > +obj-$(CONFIG_MICROBIT) += microbit.o > obj-$(CONFIG_MUSICPAL) += musicpal.o > obj-$(CONFIG_NETDUINO2) += netduino2.o > obj-$(CONFIG_NSERIES) += nseries.o > @@ -48,4 +49,4 @@ obj-$(CONFIG_ARMSSE) += armsse.o > obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o > obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o > obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o > -obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o microbit.o > +obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o > -- > 2.21.0 > >
On 4/18/19 8:00 PM, Thomas Huth wrote: > Add Kconfig dependencies for the NRF51 / microbit machine. > > 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 | 6 ++++++ > hw/arm/Makefile.objs | 3 ++- > 3 files changed, 9 insertions(+), 3 deletions(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index 6dc388c43e..233937f394 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -35,11 +35,10 @@ CONFIG_RASPI=y > CONFIG_DIGIC=y > CONFIG_SABRELITE=y > CONFIG_EMCRAFT_SF2=y > +CONFIG_MICROBIT=y > > CONFIG_VGA=y > > -CONFIG_NRF51_SOC=y > - > CONFIG_FSL_IMX25=y > CONFIG_FSL_IMX7=y > CONFIG_FSL_IMX6UL=y > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index 58439c492a..708eae19e5 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -347,8 +347,14 @@ config FSL_IMX6UL > select IMX_I2C > select SDHCI > > +config MICROBIT > + bool > + select NRF51_SOC > + > config NRF51_SOC > bool > + select I2C > + select ARM_V7M > > config EMCRAFT_SF2 > bool > diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs > index eae9f6c442..994e67dd0d 100644 > --- a/hw/arm/Makefile.objs > +++ b/hw/arm/Makefile.objs > @@ -8,6 +8,7 @@ obj-$(CONFIG_EMCRAFT_SF2) += msf2-som.o > obj-$(CONFIG_HIGHBANK) += highbank.o > obj-$(CONFIG_INTEGRATOR) += integratorcp.o > obj-$(CONFIG_MAINSTONE) += mainstone.o > +obj-$(CONFIG_MICROBIT) += microbit.o > obj-$(CONFIG_MUSICPAL) += musicpal.o > obj-$(CONFIG_NETDUINO2) += netduino2.o > obj-$(CONFIG_NSERIES) += nseries.o > @@ -48,4 +49,4 @@ obj-$(CONFIG_ARMSSE) += armsse.o > obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o > obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o > obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o > -obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o microbit.o > +obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o >
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 6dc388c43e..233937f394 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -35,11 +35,10 @@ CONFIG_RASPI=y CONFIG_DIGIC=y CONFIG_SABRELITE=y CONFIG_EMCRAFT_SF2=y +CONFIG_MICROBIT=y CONFIG_VGA=y -CONFIG_NRF51_SOC=y - CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 58439c492a..708eae19e5 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -347,8 +347,14 @@ config FSL_IMX6UL select IMX_I2C select SDHCI +config MICROBIT + bool + select NRF51_SOC + config NRF51_SOC bool + select I2C + select ARM_V7M config EMCRAFT_SF2 bool diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index eae9f6c442..994e67dd0d 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -8,6 +8,7 @@ obj-$(CONFIG_EMCRAFT_SF2) += msf2-som.o obj-$(CONFIG_HIGHBANK) += highbank.o obj-$(CONFIG_INTEGRATOR) += integratorcp.o obj-$(CONFIG_MAINSTONE) += mainstone.o +obj-$(CONFIG_MICROBIT) += microbit.o obj-$(CONFIG_MUSICPAL) += musicpal.o obj-$(CONFIG_NETDUINO2) += netduino2.o obj-$(CONFIG_NSERIES) += nseries.o @@ -48,4 +49,4 @@ obj-$(CONFIG_ARMSSE) += armsse.o obj-$(CONFIG_FSL_IMX7) += fsl-imx7.o mcimx7d-sabre.o obj-$(CONFIG_ARM_SMMUV3) += smmu-common.o smmuv3.o obj-$(CONFIG_FSL_IMX6UL) += fsl-imx6ul.o mcimx6ul-evk.o -obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o microbit.o +obj-$(CONFIG_NRF51_SOC) += nrf51_soc.o
Add Kconfig dependencies for the NRF51 / microbit machine. Signed-off-by: Thomas Huth <thuth@redhat.com> --- default-configs/arm-softmmu.mak | 3 +-- hw/arm/Kconfig | 6 ++++++ hw/arm/Makefile.objs | 3 ++- 3 files changed, 9 insertions(+), 3 deletions(-)