diff options
| author | Tom Rini <trini@konsulko.com> | 2020-08-04 11:11:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-08-04 11:11:02 -0400 |
| commit | f1c0b7cd4be2081ae3711cec2c4cc2910a5817e1 (patch) | |
| tree | 694f503767f8511bffc8c5e6360f542e50428a0d /arch/arm/dts/Makefile | |
| parent | 993b59f0451cb102f23714478a64361b44694fc6 (diff) | |
| parent | 3e980a2d8bd13d0d1c2d5cec9e57a47b6cff8b92 (diff) | |
Merge tag 'u-boot-imx-20200804' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
For 2020.10
-----------
- fixes for Toradex board
- fix warnings from previous PR
- HAB: reset instead of panic after failure
- new board: MYiR Tech MYS-6ULX
- mx6cuboxi: use OF_PLATDATA
- further changes for DM
Travis: https://travis-ci.org/github/sbabic/u-boot-imx/builds/714513163
Diffstat (limited to 'arch/arm/dts/Makefile')
| -rw-r--r-- | arch/arm/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index abf9a027cc..43a2ee1213 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -721,6 +721,7 @@ dtb-$(CONFIG_MX6UL) += \ dtb-$(CONFIG_MX6ULL) += \ imx6ull-14x14-evk.dtb \ imx6ull-colibri.dtb \ + imx6ull-myir-mys-6ulx-eval.dtb \ imx6ull-phytec-segin-ff-rdk-emmc.dtb \ imx6ull-dart-6ul.dtb \ imx6ull-somlabs-visionsom.dtb \ |