diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2018-11-29 14:12:47 +0100 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2020-03-05 19:22:16 +0100 |
commit | 3e6440d103a7751c8df9ad6a50dfe0e5fa5c899e (patch) | |
tree | 2ea1803fc14b8c59eca1bb7e19bb77fe11ab0e6b /board | |
parent | 982b4667dcc7c1abcbd2eb8c4e755a911dc4ebd1 (diff) |
apalis-imx8: forward port to 2018.03
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
(cherry picked from commit eb0ed0e4283385700db1e5080d78f9a2684f98a5)
Diffstat (limited to 'board')
-rw-r--r-- | board/toradex/apalis-imx8/apalis-imx8.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/board/toradex/apalis-imx8/apalis-imx8.c b/board/toradex/apalis-imx8/apalis-imx8.c index fc52fabd6d4..2246d27e5ae 100644 --- a/board/toradex/apalis-imx8/apalis-imx8.c +++ b/board/toradex/apalis-imx8/apalis-imx8.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> @@ -440,7 +440,7 @@ int mmc_map_to_kernel_blk(int dev_no) static int check_mmc_autodetect(void) { - char *autodetect_str = getenv("mmcautodetect"); + char *autodetect_str = env_get("mmcautodetect"); if ((autodetect_str != NULL) && (strcmp(autodetect_str, "yes") == 0)) { @@ -459,12 +459,12 @@ void board_late_mmc_env_init(void) if (!check_mmc_autodetect()) return; - setenv_ulong("mmcdev", dev_no); + env_set_ulong("mmcdev", dev_no); /* Set mmcblk env */ sprintf(mmcblk, "/dev/mmcblk%dp2 rootwait rw", mmc_map_to_kernel_blk(dev_no)); - setenv("mmcroot", mmcblk); + env_set("mmcroot", mmcblk); sprintf(cmd, "mmc dev %d", dev_no); run_command(cmd, 0); @@ -473,8 +473,8 @@ void board_late_mmc_env_init(void) int board_late_init(void) { #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - setenv("board_name", "ARM2"); - setenv("board_rev", "iMX8QM"); + env_set("board_name", "ARM2"); + env_set("board_rev", "iMX8QM"); #endif #ifdef CONFIG_ENV_IS_IN_MMC |