From 92d0497781fdddf43e33791b7e676b0ebf8d6878 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 19 Jul 2019 17:06:41 +0200 Subject: apalis-imx8/colibri-imx8x: set fdtfile since it is used by distro bootcmd The environment variable fdtfile is used in include/config_distro_bootcmd.h hence we should make sure it is set by default. Signed-off-by: Stefan Agner --- include/configs/apalis-imx8.h | 5 ++++- include/configs/colibri-imx8qxp.h | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index e6e825b4b4..1e88391cf6 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -98,6 +98,8 @@ #define BOOTENV #endif +#define FDT_FILE "fsl-imx8qm-apalis.dtb" + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ @@ -110,7 +112,8 @@ "console=ttyLP1,115200 earlycon=lpuart32,0x5a070000,115200\0" \ "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ - "fdt_file=fsl-imx8qm-apalis.dtb\0" \ + "fdt_file=" FDT_FILE "\0" \ + "fdtfile=" FDT_FILE "\0" \ "initrd_addr=0x83800000\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_image=Image\0" \ diff --git a/include/configs/colibri-imx8qxp.h b/include/configs/colibri-imx8qxp.h index d86348c259..d2a1468ebe 100644 --- a/include/configs/colibri-imx8qxp.h +++ b/include/configs/colibri-imx8qxp.h @@ -79,6 +79,8 @@ #define BOOTENV #endif +#define FDT_FILE "fsl-imx8qxp-colibri-eval-v3.dtb" + /* Initial environment variables */ #define CONFIG_EXTRA_ENV_SETTINGS \ BOOTENV \ @@ -92,7 +94,8 @@ "console=ttyLP3,115200 earlycon=lpuart32,0x5a090000,115200\0" \ "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ - "fdt_file=fsl-imx8qxp-colibri-eval-v3.dtb\0" \ + "fdt_file=" FDT_FILE "\0" \ + "fdtfile=" FDT_FILE "\0" \ "initrd_addr=0x83800000\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_image=Image\0" \ -- cgit v1.2.3