diff options
| author | Tom Rini <trini@konsulko.com> | 2020-09-18 10:42:12 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-09-18 10:42:12 -0400 |
| commit | 98f3ee09d096c6c1bc49e08d805f6354dffb0e59 (patch) | |
| tree | b02cd94de7fc93381d8ce7d07481ff9952986218 /board/toradex/colibri-imx8x | |
| parent | 9de3126e80cdac7ee15b6671065a952184533dda (diff) | |
| parent | 4516b535bf16db4231ea27bb95197d869f86893b (diff) | |
Merge tag 'u-boot-imx-20200918' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
----------------------------------------------------------------
Fixes for 2020.10
-----------------
- Toradex boards
- mx6qsabrelite: fix env offset
- esdhc_imx: waiting for clock instead of sleep
- dyn RAM calibration for entry point i.MX6
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/728274602
Diffstat (limited to 'board/toradex/colibri-imx8x')
| -rw-r--r-- | board/toradex/colibri-imx8x/MAINTAINERS | 2 | ||||
| -rw-r--r-- | board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg (renamed from board/toradex/colibri-imx8x/colibri-imx8qxp-imximage.cfg) | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/board/toradex/colibri-imx8x/MAINTAINERS b/board/toradex/colibri-imx8x/MAINTAINERS index f6853586c8..de62f87a56 100644 --- a/board/toradex/colibri-imx8x/MAINTAINERS +++ b/board/toradex/colibri-imx8x/MAINTAINERS @@ -5,6 +5,6 @@ S: Maintained F: arch/arm/dts/fsl-imx8x-colibri.dts F: arch/arm/dts/fsl-imx8x-colibri-u-boot.dtsi F: board/toradex/colibri-imx8x/ -F: configs/colibri-imx8qxp_defconfig +F: configs/colibri-imx8x_defconfig F: doc/board/toradex/colibri-imx8x.rst F: include/configs/colibri-imx8x.h diff --git a/board/toradex/colibri-imx8x/colibri-imx8qxp-imximage.cfg b/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg index 44f6c0c455..44f6c0c455 100644 --- a/board/toradex/colibri-imx8x/colibri-imx8qxp-imximage.cfg +++ b/board/toradex/colibri-imx8x/colibri-imx8x-imximage.cfg |