diff options
| author | Tom Rini <trini@konsulko.com> | 2017-07-18 08:42:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-07-18 08:42:48 -0400 |
| commit | 39632b4a01210e329333d787d828157dcd2c7328 (patch) | |
| tree | a1013e4161de425f81aea052eeabe572c5e557d3 /board/aries | |
| parent | e14b1169c0c5a1b362b41451006b492bd16f2fff (diff) | |
| parent | 651782a08b5bb4e710bda1b11fff774b8ade384f (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'board/aries')
| -rw-r--r-- | board/aries/m53evk/imximage.cfg | 2 | ||||
| -rw-r--r-- | board/aries/m53evk/m53evk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/board/aries/m53evk/imximage.cfg b/board/aries/m53evk/imximage.cfg index ec855c835d..e4f3ce53d2 100644 --- a/board/aries/m53evk/imximage.cfg +++ b/board/aries/m53evk/imximage.cfg @@ -9,7 +9,7 @@ * * The syntax is taken as close as possible with the kwbimage */ -#include <asm/imx-common/imximage.cfg> +#include <asm/mach-imx/imximage.cfg> /* image version */ IMAGE_VERSION 2 diff --git a/board/aries/m53evk/m53evk.c b/board/aries/m53evk/m53evk.c index 14c60fc539..ece8957aaf 100644 --- a/board/aries/m53evk/m53evk.c +++ b/board/aries/m53evk/m53evk.c @@ -13,7 +13,7 @@ #include <asm/arch/crm_regs.h> #include <asm/arch/clock.h> #include <asm/arch/iomux-mx53.h> -#include <asm/imx-common/mx5_video.h> +#include <asm/mach-imx/mx5_video.h> #include <asm/spl.h> #include <linux/errno.h> #include <netdev.h> |