From: Jagan Teki Date: Thu, 1 Jun 2017 17:28:34 +0000 (+0530) Subject: imx6_spl: Add u-boot-dtb.img for SPL payload X-Git-Tag: v2017.09-rc1~190^2~16 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=ed2d02d4ceb8d76057200c0970df6966c63959d9;p=u-boot 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 --- 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)