From ed2d02d4ceb8d76057200c0970df6966c63959d9 Mon Sep 17 00:00:00 2001 From: Jagan Teki Date: Thu, 1 Jun 2017 22:58:34 +0530 Subject: [PATCH] imx6_spl: Add u-boot-dtb.img for SPL payload Add u-boot-dtb.img for SPL_FS_LOAD_PAYLOAD_NAME when OF_CONTROL used. Signed-off-by: Jagan Teki --- include/configs/imx6_spl.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h index bda9541af6..9537112693 100644 --- a/include/configs/imx6_spl.h +++ b/include/configs/imx6_spl.h @@ -49,7 +49,11 @@ /* Define the payload for FAT/EXT support */ #if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT) -#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" +# ifdef CONFIG_OF_CONTROL +# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" +# else +# define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" +# endif #endif #if defined(CONFIG_MX6SX) || defined(CONFIG_MX6UL) || defined(CONFIG_MX6SL) -- 2.39.5