diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-09 09:17:24 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-09 09:17:24 -0400 |
| commit | be79009f3b9bbdbce283e67a865121e576d790ea (patch) | |
| tree | e6f0288f2031c6e869c4e131f2692e47a43aa263 /configs/imx8mm_beacon_defconfig | |
| parent | e411a090cf7162626d54d72dfc4530986c788cdb (diff) | |
| parent | 385429680106f8612386e26564f69dccdd110620 (diff) | |
Merge tag 'u-boot-imx-20200609' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
Fixes for 2020.07
-----------------
- mx53: mx53menlo Convert to DM_ETH, fix fail boot
- imx8mp_evk: fix boot issue
- MX6, display5: fix environment
- drop warnings (watchdog) for i.MX8mm i.mx8mp
- enable bootaux for i.MX8M
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/695929999
Diffstat (limited to 'configs/imx8mm_beacon_defconfig')
| -rw-r--r-- | configs/imx8mm_beacon_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configs/imx8mm_beacon_defconfig b/configs/imx8mm_beacon_defconfig index b935d72360..a518963f48 100644 --- a/configs/imx8mm_beacon_defconfig +++ b/configs/imx8mm_beacon_defconfig @@ -100,5 +100,4 @@ CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_PSCI=y CONFIG_SYSRESET_WATCHDOG=y CONFIG_DM_THERMAL=y -# CONFIG_WATCHDOG is not set CONFIG_IMX_WATCHDOG=y |