board: stm32: Fix stm32f746-disco boot

Since 'commit af2f44267 ("fdc spl: use different BOARD_INIT MACRO for spl and tpl")'
board stm32f746-disco can't boot.

The macro CONFIG_IS_ENABLED() can't evaluate the value of
CONFIG_SPL_BOARD_INIT as it was defined in include/configs/stm32f746-disco.h
without attributed value.

Moving CONFIG_SPL_BOARD_INIT from stm32f746-disco.h to mach-stm32/Kconfig
fixes this issue.

Fixes: af2f44267 ("fdc spl: use different BOARD_INIT MACRO for spl and tpl")
Signed-off-by: Patrice Chotard <patrice.chotard@st.com>

diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig
index 5f7a2b5669eaccdc9d9a6f9e13d1c17dc9f78a8a..f79b1a2c700e4c51d17ed3c6877e7fe863abfbfb 100644 (file)
--- a/arch/arm/mach-stm32/Kconfig
+++ b/arch/arm/mach-stm32/Kconfig
@@ -29,6 +29,7 @@ config STM32F7
        select STM32_SERIAL
        select SUPPORT_SPL
        select SPL
+       select SPL_BOARD_INIT
        select SPL_CLK
        select SPL_DM
        select SPL_DM_SEQ_ALIAS

diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h
index 301ab0f8f211a95d986732c98cc20fd482223b24..3e952c2acd82c012c9da3bebc837c4eb62a8fa84 100644 (file)
--- a/include/configs/stm32f746-disco.h
+++ b/include/configs/stm32f746-disco.h
@@ -72,7 +72,6 @@
 #ifdef CONFIG_SUPPORT_SPL
 #define CONFIG_SPL_STACK               CONFIG_SYS_INIT_SP_ADDR
 #define CONFIG_SPL_FRAMEWORK
-#define CONFIG_SPL_BOARD_INIT
 #define CONFIG_SPL_TEXT_BASE           CONFIG_SYS_FLASH_BASE
 #define CONFIG_SYS_MONITOR_LEN         (512 * 1024)
 #define CONFIG_SYS_SPL_LEN             0x00008000