diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-24 08:32:22 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-24 08:32:22 -0400 |
| commit | 3d8fab1e9e1ccaf609d63df85bd651458f05d436 (patch) | |
| tree | 6a34a436e153ec4024eb84e800d008a8e79dc674 /configs/mccmon6_nor_defconfig | |
| parent | b242d1b13e43906af288d8a8bdf396ba2cfbf2d1 (diff) | |
| parent | 78f28773a55db9ed434e7b1920b94bb95167844f (diff) | |
| download | u-boot-3d8fab1e9e1ccaf609d63df85bd651458f05d436.tar.gz u-boot-3d8fab1e9e1ccaf609d63df85bd651458f05d436.tar.xz u-boot-3d8fab1e9e1ccaf609d63df85bd651458f05d436.zip | |
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 'configs/mccmon6_nor_defconfig')
| -rw-r--r-- | configs/mccmon6_nor_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig index cd78c5cb33..66f49c0e54 100644 --- a/configs/mccmon6_nor_defconfig +++ b/configs/mccmon6_nor_defconfig @@ -28,7 +28,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=8000000.nor:32m@0x0(mccmon6-image.nor),256k@0x CONFIG_ENV_IS_IN_FLASH=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_DM=y -CONFIG_FSL_ESDHC_IMX=y +CONFIG_FSL_USDHC=y CONFIG_MTD=y CONFIG_MTD_NOR_FLASH=y CONFIG_MTD_DEVICE=y |