[U-Boot] [PATCH] board: stm32: Fix stm32f746-disco boot

[U-Boot] [PATCH] board: stm32: Fix stm32f746-disco boot

[patrice.chotard at st.com]

From: Patrice Chotard <patrice.chotard@st.com>

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.

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
---
 arch/arm/mach-stm32/Kconfig       | 1 +
 include/configs/stm32f746-disco.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-stm32/Kconfig b/arch/arm/mach-stm32/Kconfig
index 5f7a2b5669ea..f79b1a2c700e 100644
--- 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 301ab0f8f211..3e952c2acd82 100644
--- 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
-- 
1.9.1

[U-Boot] board: stm32: Fix stm32f746-disco boot

[Tom Rini]

On Mon, Jan 29, 2018 at 01:44:20PM +0100, patrice.chotard at st.com wrote:

> From: Patrice Chotard <patrice.chotard@st.com>
> 
> 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.
> 
> Signed-off-by: Patrice Chotard <patrice.chotard@st.com>

In the future, can you please use the Fixes tag, similar to the kernel?
I've reworded this (and the other fix).

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180129/c8496f69/attachment.sig>

[U-Boot] board: stm32: Fix stm32f746-disco boot

[Patrice CHOTARD]

Hi Tom

On 01/29/2018 09:21 PM, Tom Rini wrote:
> On Mon, Jan 29, 2018 at 01:44:20PM +0100, patrice.chotard at st.com wrote:
> 
>> From: Patrice Chotard <patrice.chotard@st.com>
>>
>> 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.
>>
>> Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
> 
> In the future, can you please use the Fixes tag, similar to the kernel?
> I've reworded this (and the other fix).

Yes, sorry to have forgot this process.

Thanks

Patrice

> 
> Applied to u-boot/master, thanks!
>