[PATCH] imx8mm_evk: Adjust the environment for booting a mainline kernel

[Peng Fan]

> Subject: [PATCH] imx8mm_evk: Adjust the environment for booting a mainline
> kernel
> 
> Adjust the environment for booting a mainline kernel by default.
> 
> Signed-off-by: Fabio Estevam <festevam at gmail.com>

Reviewed-by: Peng Fan <peng.fan at nxp.com>

> ---
>  configs/imx8mm_evk_defconfig | 1 -
>  include/configs/imx8mm_evk.h | 8 ++++----
>  2 files changed, 4 insertions(+), 5 deletions(-)
> 
> diff --git a/configs/imx8mm_evk_defconfig b/configs/imx8mm_evk_defconfig
> index 87560ef989..e007766e84 100644
> --- a/configs/imx8mm_evk_defconfig
> +++ b/configs/imx8mm_evk_defconfig
> @@ -21,7 +21,6 @@ CONFIG_SPL_LOAD_FIT=y
>  CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
>  CONFIG_OF_SYSTEM_SETUP=y
> 
> CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/i
> mximage-8mm-lpddr4.cfg"
> -CONFIG_DEFAULT_FDT_FILE="fsl-imx8mm-evk.dtb"
>  CONFIG_BOARD_LATE_INIT=y
>  CONFIG_SPL_BOARD_INIT=y
>  CONFIG_SPL_SEPARATE_BSS=y
> diff --git a/include/configs/imx8mm_evk.h b/include/configs/imx8mm_evk.h
> index acbab05ae9..b134351c8c 100644
> --- a/include/configs/imx8mm_evk.h
> +++ b/include/configs/imx8mm_evk.h
> @@ -38,12 +38,12 @@
>  /* Initial environment variables */
>  #define CONFIG_EXTRA_ENV_SETTINGS		\
>  	"script=boot.scr\0" \
> -	"image=Image.itb\0" \
> +	"image=Image\0" \
>  	"console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200\0" \
>  	"fdt_addr=0x43000000\0"			\
>  	"fdt_high=0xffffffffffffffff\0"		\
> -	"boot_fit=try\0" \
> -	"fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
> +	"boot_fit=no\0" \
> +	"fdt_file=imx8mm-evk.dtb\0" \
>  	"initrd_addr=0x43800000\0"		\
>  	"initrd_high=0xffffffffffffffff\0" \
>  	"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ @@ -113,7
> +113,7 @@
>  	(CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
> 
>  #define CONFIG_ENV_OVERWRITE
> -#define CONFIG_SYS_MMC_ENV_DEV		0   /* USDHC2 */
> +#define CONFIG_SYS_MMC_ENV_DEV		1   /* USDHC2 */
>  #define CONFIG_MMCROOT			"/dev/mmcblk1p2"  /* USDHC2
> */
> 
>  /* Size of malloc() pool */
> --
> 2.17.1