diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-27 09:35:05 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-27 09:35:05 -0400 |
commit | df9a7a195bdf0722399199bf373afc8309ae3ad7 (patch) | |
tree | 5bf1e2e3388725131640aac7d120647820ca5b48 /configs/mccmon6_nor_defconfig | |
parent | 222701e157176a66628e4f399f52ca3307b018c9 (diff) | |
parent | 4a6f5b4f56b8bc6f36736fc0a07c5c4f9069e69b (diff) |
Merge tag 'u-boot-imx-20190719' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
u-boot-imx-20190719
- CCF for i.MX6
- nandbcb command to write SPL into NAND
- Switch to DM (i.MX28)
- Boards: Toradex, engicam, DH
- Fixes for i.MX8
- Fixes for i.MX7ULP
Travis: https://travis-ci.org/sbabic/u-boot-imx/builds/561147504
Diffstat (limited to 'configs/mccmon6_nor_defconfig')
-rw-r--r-- | configs/mccmon6_nor_defconfig | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/configs/mccmon6_nor_defconfig b/configs/mccmon6_nor_defconfig index 781620048d..cd78c5cb33 100644 --- a/configs/mccmon6_nor_defconfig +++ b/configs/mccmon6_nor_defconfig @@ -20,7 +20,6 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SF=y -CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y @@ -50,5 +49,4 @@ CONFIG_MII=y CONFIG_SPI=y CONFIG_MXC_SPI=y CONFIG_DM_THERMAL=y -CONFIG_USB=y CONFIG_OF_LIBFDT=y |