diff options
author | Tom Rini <trini@konsulko.com> | 2017-07-18 12:42:48 (GMT) |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2017-07-18 12:42:48 (GMT) |
commit | 39632b4a01210e329333d787d828157dcd2c7328 (patch) | |
tree | a1013e4161de425f81aea052eeabe572c5e557d3 /board/gateworks | |
parent | e14b1169c0c5a1b362b41451006b492bd16f2fff (diff) | |
parent | 651782a08b5bb4e710bda1b11fff774b8ade384f (diff) | |
download | u-boot-39632b4a01210e329333d787d828157dcd2c7328.tar.xz |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'board/gateworks')
-rw-r--r-- | board/gateworks/gw_ventana/common.c | 2 | ||||
-rw-r--r-- | board/gateworks/gw_ventana/gw_ventana.c | 8 | ||||
-rw-r--r-- | board/gateworks/gw_ventana/gw_ventana_spl.c | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/board/gateworks/gw_ventana/common.c b/board/gateworks/gw_ventana/common.c index 186eb18..46404b4 100644 --- a/board/gateworks/gw_ventana/common.c +++ b/board/gateworks/gw_ventana/common.c @@ -10,7 +10,7 @@ #include <asm/arch/mx6-pins.h> #include <asm/arch/sys_proto.h> #include <asm/gpio.h> -#include <asm/imx-common/mxc_i2c.h> +#include <asm/mach-imx/mxc_i2c.h> #include <fsl_esdhc.h> #include <hwconfig.h> #include <power/pmic.h> diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 40ee1b6..89848c8 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -14,10 +14,10 @@ #include <asm/arch/mxc_hdmi.h> #include <asm/arch/sys_proto.h> #include <asm/gpio.h> -#include <asm/imx-common/boot_mode.h> -#include <asm/imx-common/sata.h> -#include <asm/imx-common/spi.h> -#include <asm/imx-common/video.h> +#include <asm/mach-imx/boot_mode.h> +#include <asm/mach-imx/sata.h> +#include <asm/mach-imx/spi.h> +#include <asm/mach-imx/video.h> #include <asm/io.h> #include <asm/setup.h> #include <dm.h> diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c index 6060b44..69a638d 100644 --- a/board/gateworks/gw_ventana/gw_ventana_spl.c +++ b/board/gateworks/gw_ventana/gw_ventana_spl.c @@ -11,9 +11,9 @@ #include <asm/arch/mx6-ddr.h> #include <asm/arch/mx6-pins.h> #include <asm/arch/sys_proto.h> -#include <asm/imx-common/boot_mode.h> -#include <asm/imx-common/iomux-v3.h> -#include <asm/imx-common/mxc_i2c.h> +#include <asm/mach-imx/boot_mode.h> +#include <asm/mach-imx/iomux-v3.h> +#include <asm/mach-imx/mxc_i2c.h> #include <environment.h> #include <i2c.h> #include <spl.h> |