diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-11-29 12:29:04 +0100 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-11-29 14:10:48 +0100 |
| commit | 3a5cc1cf85b8e22da78d794a2d71c03490f500b6 (patch) | |
| tree | 34fd2976cdb4a5bc57df371a212e512c3ac54061 /board | |
| parent | 5721e405c34985f5faa1e6ff4e0d3ca32dffa6e5 (diff) | |
colibri-imx8qxp: forward port to 2018.03
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/toradex/colibri-imx8qxp/colibri-imx8qxp.c | 14 | ||||
| -rw-r--r-- | board/toradex/colibri-imx8qxp/pf8100.c | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c b/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c index c3a56481dc..c865f33d1d 100644 --- a/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c +++ b/board/toradex/colibri-imx8qxp/colibri-imx8qxp.c @@ -9,7 +9,6 @@ #include <netdev.h> #include <fsl_ifc.h> #include <fdt_support.h> -#include <libfdt.h> #include <environment.h> #include <fsl_esdhc.h> #include <i2c.h> @@ -17,14 +16,15 @@ #include <asm/io.h> #include <asm/gpio.h> #include <asm/arch/clock.h> -#include <asm/imx-common/sci/sci.h> +#include <asm/mach-imx/sci/sci.h> #include <asm/arch/imx8-pins.h> #include <dm.h> #include <imx8_hsio.h> +#include <linux/libfdt.h> #include <usb.h> #include <asm/arch/iomux.h> #include <asm/arch/sys_proto.h> -#include <asm/imx-common/video.h> +#include <asm/mach-imx//video.h> #include <asm/arch/video_common.h> #include <power-domain.h> @@ -418,8 +418,8 @@ int board_late_init(void) { #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* TODO move to common */ - setenv("board_name", "Colibri iMX8QXP"); - setenv("board_rev", "v1.0"); + env_set("board_name", "Colibri iMX8QXP"); + env_set("board_rev", "v1.0"); #endif #ifdef CONFIG_ENV_IS_IN_MMC @@ -427,9 +427,9 @@ int board_late_init(void) #endif #ifdef CONFIG_AHAB_BOOT - setenv("sec_boot", "yes"); + env_set("sec_boot", "yes"); #else - setenv("sec_boot", "no"); + env_set("sec_boot", "no"); #endif return 0; diff --git a/board/toradex/colibri-imx8qxp/pf8100.c b/board/toradex/colibri-imx8qxp/pf8100.c index bc67538eb8..881052b827 100644 --- a/board/toradex/colibri-imx8qxp/pf8100.c +++ b/board/toradex/colibri-imx8qxp/pf8100.c @@ -10,7 +10,7 @@ #include <common.h> #include <i2c.h> -#include <asm/imx-common/sci/sci.h> +#include <asm/mach-imx/sci/sci.h> #include <asm/arch/imx8-pins.h> #include <asm/gpio.h> #include <asm/arch/iomux.h> |