diff options
| author | Tom Rini <[email protected]> | 2019-08-24 08:32:22 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2019-08-24 08:32:22 -0400 |
| commit | 3d8fab1e9e1ccaf609d63df85bd651458f05d436 (patch) | |
| tree | 6a34a436e153ec4024eb84e800d008a8e79dc674 /drivers | |
| parent | b242d1b13e43906af288d8a8bdf396ba2cfbf2d1 (diff) | |
| parent | 78f28773a55db9ed434e7b1920b94bb95167844f (diff) | |
Merge branch '2019-08-23-master-imports'
- Migrate CONFIG_MX_CYCLIC, CONFIG_FSL_USDHC and CONFIG_MXS_GPIO to
Kconfig
- Fix some SPL/TPL and ARM64 dependencies
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpio/Kconfig | 5 | ||||
| -rw-r--r-- | drivers/mmc/Kconfig | 7 |
2 files changed, 12 insertions, 0 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig index 7d9c97f5379..f2dabb554fa 100644 --- a/drivers/gpio/Kconfig +++ b/drivers/gpio/Kconfig @@ -139,6 +139,11 @@ config MXC_GPIO help Support GPIO controllers on various i.MX platforms +config MXS_GPIO + bool "Freescale/NXP MXS GPIO driver" + help + Support GPIO controllers on i.MX23 and i.MX28 platforms + config OMAP_GPIO bool "TI OMAP GPIO driver" depends on ARCH_OMAP2PLUS diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index c6812f65173..0ccb1ea701d 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -694,6 +694,13 @@ config FSL_ESDHC_IMX This selects support for the i.MX eSDHC (Enhanced Secure Digital Host Controller) found on numerous Freescale/NXP SoCs. +config FSL_USDHC + bool "Freescale/NXP i.MX uSDHC controller support" + depends on MX6 || MX7 ||ARCH_MX7ULP || IMX8 || IMX8M || TARGET_S32V234EVB + select FSL_ESDHC_IMX + help + This enables the Ultra Secured Digital Host Controller enhancements + endmenu config SYS_FSL_ERRATUM_ESDHC111 |