diff mbox

[U-Boot] imx6_spl: Add u-boot-dtb.img for SPL payload

Message ID 1496338114-31648-1-git-send-email-jagan@openedev.com
State Accepted
Commit ed2d02d4ceb8d76057200c0970df6966c63959d9
Delegated to: Stefano Babic
Headers show

Commit Message

Jagan Teki June 1, 2017, 5:28 p.m. UTC 
From: Jagan Teki <jagan@amarulasolutions.com>

Add u-boot-dtb.img for SPL_FS_LOAD_PAYLOAD_NAME when
OF_CONTROL used.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
---
 include/configs/imx6_spl.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
diff mbox

Patch

diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h
index 4598d27..2d7aa44 100644
--- a/include/configs/imx6_spl.h
+++ b/include/configs/imx6_spl.h
@@ -54,7 +54,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)