commit cbf54032c023f32b804d4aa2dadcf87787514ccc
author Lokesh Vutla <lokeshvutla@ti.com> Fri Nov 02 19:51:07 2018 +0530
committer Tom Rini <trini@konsulko.com> Fri Nov 16 16:51:59 2018 -0500
tree 171ce83306ea7d42181a1670b9933e8233a42765
parent 2c69d5cd55affb36f30f3c23c40e3ed7003aee73

board: ti: am654: r5: Add initial support for am654

Add initial support for AM654 based EVM running on R5.

Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>

include/configs/ti_armv7_common.h

diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 55b9b45..0f892e5 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -165,7 +165,9 @@
 
 /* FAT sd card locations. */
 #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION	1
+#ifndef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME	"u-boot.img"
+#endif
 
 #ifdef CONFIG_SPL_OS_BOOT
 /* FAT */