diff options
| author | Tom Rini <trini@konsulko.com> | 2016-10-28 11:12:03 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-10-28 11:12:03 -0400 |
| commit | 4f892924d238cc415891dbea336a0fdaff2f853b (patch) | |
| tree | 145882227f01a5092c656d1fc7122adff76bc8c2 /board/toradex | |
| parent | ec1eaad06551e2422baf8743f6987d4f561f2ce6 (diff) | |
| parent | 1c140f7bbf4a008fcd78b407ea80c60a2a18fc1f (diff) | |
| download | u-boot-4f892924d238cc415891dbea336a0fdaff2f853b.tar.gz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Signed-off-by: Tom Rini <trini@konsulko.com>
Conflicts:
common/Kconfig
configs/dms-ba16_defconfig
Diffstat (limited to 'board/toradex')
| -rw-r--r-- | board/toradex/colibri_imx7/imximage.cfg | 2 | ||||
| -rw-r--r-- | board/toradex/colibri_vf/imximage.cfg | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/toradex/colibri_imx7/imximage.cfg b/board/toradex/colibri_imx7/imximage.cfg index d891e82ae4..ca3cd8947e 100644 --- a/board/toradex/colibri_imx7/imximage.cfg +++ b/board/toradex/colibri_imx7/imximage.cfg @@ -4,7 +4,7 @@ * * SPDX-License-Identifier: GPL-2.0+ * - * Refer docs/README.imxmage for more details about how-to configure + * Refer doc/README.imximage for more details about how-to configure * and create imximage boot image * * The syntax is taken as close as possible with the kwbimage diff --git a/board/toradex/colibri_vf/imximage.cfg b/board/toradex/colibri_vf/imximage.cfg index 8c528863ad..baab8129cf 100644 --- a/board/toradex/colibri_vf/imximage.cfg +++ b/board/toradex/colibri_vf/imximage.cfg @@ -3,7 +3,7 @@ * * SPDX-License-Identifier: GPL-2.0+ * - * Refer docs/README.imxmage for more details about how-to configure + * Refer doc/README.imximage for more details about how-to configure * and create imximage boot image * * The syntax is taken as close as possible with the kwbimage |