| Message ID | 20190418180057.3593-25-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | Kconfig dependencies for ARM machines | expand |
On 4/18/19 8:00 PM, Thomas Huth wrote: > IMX25, IMX7 and IMX6UL were still missing the Kconfig dependencies. > > Signed-off-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > default-configs/arm-softmmu.mak | 2 -- > hw/arm/Kconfig | 19 +++++++++++++++++++ > 2 files changed, 19 insertions(+), 2 deletions(-) > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > index 1455d083d8..6dc388c43e 100644 > --- a/default-configs/arm-softmmu.mak > +++ b/default-configs/arm-softmmu.mak > @@ -37,7 +37,6 @@ CONFIG_SABRELITE=y > CONFIG_EMCRAFT_SF2=y > > CONFIG_VGA=y > -CONFIG_IMX_FEC=y > > CONFIG_NRF51_SOC=y > > @@ -49,4 +48,3 @@ CONFIG_PCIE_PORT=y > CONFIG_XIO3130=y > CONFIG_IOH3420=y > CONFIG_I82801B11=y > -CONFIG_PCI_EXPRESS_DESIGNWARE=y > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index f5cd63860d..58439c492a 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -283,6 +283,10 @@ config XLNX_VERSAL > > config FSL_IMX25 > bool > + select IMX > + select IMX_FEC > + select IMX_I2C > + select DS1338 > > config FSL_IMX31 > bool > @@ -296,6 +300,7 @@ config FSL_IMX6 > select A9MPCORE > select IMX > select IMX_I2C > + select SDHCI > > config ASPEED_SOC > bool > @@ -321,12 +326,26 @@ config MPS2 > > config FSL_IMX7 > bool > + imply PCI_DEVICES > + imply TEST_DEVICES > + select A15MPCORE > + select PCI > + select IMX > + select IMX_FEC > + select IMX_I2C > + select PCI_EXPRESS_DESIGNWARE > + select SDHCI > > config ARM_SMMUV3 > bool > > config FSL_IMX6UL > bool > + select A15MPCORE > + select IMX > + select IMX_FEC > + select IMX_I2C > + select SDHCI > > config NRF51_SOC > bool >
On Thu, Apr 25, 2019 at 6:14 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > On 4/18/19 8:00 PM, Thomas Huth wrote: > > IMX25, IMX7 and IMX6UL were still missing the Kconfig dependencies. > > > > Signed-off-by: Thomas Huth <thuth@redhat.com> > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > > > --- > > default-configs/arm-softmmu.mak | 2 -- > > hw/arm/Kconfig | 19 +++++++++++++++++++ > > 2 files changed, 19 insertions(+), 2 deletions(-) > > > > diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak > > index 1455d083d8..6dc388c43e 100644 > > --- a/default-configs/arm-softmmu.mak > > +++ b/default-configs/arm-softmmu.mak > > @@ -37,7 +37,6 @@ CONFIG_SABRELITE=y > > CONFIG_EMCRAFT_SF2=y > > > > CONFIG_VGA=y > > -CONFIG_IMX_FEC=y > > > > CONFIG_NRF51_SOC=y > > > > @@ -49,4 +48,3 @@ CONFIG_PCIE_PORT=y > > CONFIG_XIO3130=y > > CONFIG_IOH3420=y > > CONFIG_I82801B11=y > > -CONFIG_PCI_EXPRESS_DESIGNWARE=y > > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > > index f5cd63860d..58439c492a 100644 > > --- a/hw/arm/Kconfig > > +++ b/hw/arm/Kconfig > > @@ -283,6 +283,10 @@ config XLNX_VERSAL > > > > config FSL_IMX25 > > bool > > + select IMX At some point we should split the IMX config in hw/misc/Kconfig. > > + select IMX_FEC > > + select IMX_I2C > > + select DS1338 [...]
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index 1455d083d8..6dc388c43e 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -37,7 +37,6 @@ CONFIG_SABRELITE=y CONFIG_EMCRAFT_SF2=y CONFIG_VGA=y -CONFIG_IMX_FEC=y CONFIG_NRF51_SOC=y @@ -49,4 +48,3 @@ CONFIG_PCIE_PORT=y CONFIG_XIO3130=y CONFIG_IOH3420=y CONFIG_I82801B11=y -CONFIG_PCI_EXPRESS_DESIGNWARE=y diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index f5cd63860d..58439c492a 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -283,6 +283,10 @@ config XLNX_VERSAL config FSL_IMX25 bool + select IMX + select IMX_FEC + select IMX_I2C + select DS1338 config FSL_IMX31 bool @@ -296,6 +300,7 @@ config FSL_IMX6 select A9MPCORE select IMX select IMX_I2C + select SDHCI config ASPEED_SOC bool @@ -321,12 +326,26 @@ config MPS2 config FSL_IMX7 bool + imply PCI_DEVICES + imply TEST_DEVICES + select A15MPCORE + select PCI + select IMX + select IMX_FEC + select IMX_I2C + select PCI_EXPRESS_DESIGNWARE + select SDHCI config ARM_SMMUV3 bool config FSL_IMX6UL bool + select A15MPCORE + select IMX + select IMX_FEC + select IMX_I2C + select SDHCI config NRF51_SOC bool
IMX25, IMX7 and IMX6UL were still missing the Kconfig dependencies. Signed-off-by: Thomas Huth <thuth@redhat.com> --- default-configs/arm-softmmu.mak | 2 -- hw/arm/Kconfig | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-)