diff --git a/include/configs/stm32f7-som.h b/include/configs/stm32f7-som.h
index dcb80983cf9cfa6c4bad8398f9866ebc0cee0985..108bcee0889921cc77cd4dfad0ef2aa49e5ea400 100644
--- a/include/configs/stm32f7-som.h
+++ b/include/configs/stm32f7-som.h
@@ -390,7 +390,13 @@
 #define CONFIG_BOOTARGS			"stm32_platform=stm32f7-som "	\
 					"console=ttyS0,115200 panic=10"
 
-#define LOADADDR			"0xC0007FC0"
+/*
+ * These are the good addresses to get Image data right at the 'Load Address'
+ * (0xC0008000), and thus avoid additional uImage relocation:
+ * - linux-2.6: 0xC0007FC0 (reserve place for uImage header)
+ * - linux-4.2: 0xC0007FB4 (reserve place for 2-files multi-image header)
+ */
+#define LOADADDR			"0xC0007FB4"
 
 #define REV_EXTRA_ENV							\
 	"envmboot=run args addip;bootm ${envmaddr}\0"			\
@@ -430,4 +436,11 @@
 #define CONFIG_SETUP_MEMORY_TAGS
 #define CONFIG_CMDLINE_TAG
 
+/*
+ * Enable support for booting with FDT
+ */
+#define CONFIG_OF_LIBFDT
+#define CONFIG_OF_FORCE_RELOCATE
+#define CONFIG_SYS_BOOTMAPSZ		CONFIG_SYS_RAM_SIZE
+
 #endif /* __CONFIG_H */