configs: stm32f746-disco: Concatenate spl and u-boot binaries

This allows to concatenate spl and u-boot binaries together.
Previously, both binaries has to be flashed separately at the correct
offset (spl at offset 0 and u-boot at offset 0x8000).
With this patch, only one binary is generated (u-boot-with-spl.bin)
and has to be copied in flash at offset 0 using openocd for example
or simply copied in exported mass storage.

Signed-off-by: Patrice Chotard <patrice.chotard@foss.st.com>
Reviewed-by: Patrick Delaunay <patrick.delaunay@foss.st.com>

diff --git a/configs/stm32f746-disco_defconfig b/configs/stm32f746-disco_defconfig
index 130b90fae30f03efc0c2c9447f9780992247e108..0133867942538eb69c87599c64630995bbf768b4 100644 (file)
--- a/configs/stm32f746-disco_defconfig
+++ b/configs/stm32f746-disco_defconfig
@@ -9,6 +9,7 @@ CONFIG_DEFAULT_DEVICE_TREE="stm32f746-disco"
 CONFIG_SPL_TEXT_BASE=0x8000000
 CONFIG_STM32F7=y
 CONFIG_TARGET_STM32F746_DISCO=y
+CONFIG_BUILD_TARGET="u-boot-with-spl.bin"
 CONFIG_SYS_LOAD_ADDR=0x8008000
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_BOOTDELAY=3

diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 8ad4bb99c83133efd375cbdb5c80a552e118ab0f..b93acdcc1ff332ef2e4d725d454a012a1e663731 100644 (file)
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -49,6 +49,7 @@
 #define CONFIG_SYS_UBOOT_START         0x080083FD
 #define CONFIG_SYS_UBOOT_BASE          (CONFIG_SYS_FLASH_BASE + \
                                         CONFIG_SYS_SPL_LEN)
+#define CONFIG_SPL_PAD_TO              0x8000
 
 /* DT blob (fdt) address */
 #define CONFIG_SYS_FDT_BASE            (CONFIG_SYS_FLASH_BASE + \