Merge branch 'master' of git://git.denx.de/u-boot-sh

2018-03-01 15:50:43 -05:00
parent 6256b02db3 44c5580f1c
commit e1541b1d7f
4 changed files with 331 additions and 6 deletions
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -15,6 +15,10 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_INITRD_TAG

+#ifdef CONFIG_SPL
+#define CONFIG_SPL_TARGET	"spl/u-boot-spl.srec"
+#endif
+
 #undef	CONFIG_SHOW_BOOT_PROGRESS

 #define CONFIG_ARCH_CPU_INIT
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -13,6 +13,7 @@
 #include <asm/arch/rmobile.h>

 #define CONFIG_REMAKE_ELF
+#define CONFIG_BUILD_TARGET	"u-boot-elf.srec"

 /* boot option */