From dc3ae12545ffd788095e30047396616be5749ddb Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 4 Nov 2019 14:20:15 -0600 Subject: [PATCH] boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c: Fix some erroneous conditional compilation in board_late_initialize(). --- boards/arm/stm32/nucleo-f4x1re/src/stm32_appinit.c | 4 ++++ boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c | 2 -- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_appinit.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_appinit.c index 339f355a03..378624f052 100644 --- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_appinit.c +++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_appinit.c @@ -76,7 +76,11 @@ int board_app_initialize(uintptr_t arg) { +#ifdef CONFIG_BOARD_LATE_INITIALIZE + return OK; +#else /* Perform board initialization here */ return stm32_bringup(); +#endif } diff --git a/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c b/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c index 493711b26d..0299924228 100644 --- a/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c +++ b/boards/arm/stm32/nucleo-f4x1re/src/stm32_boot.c @@ -107,10 +107,8 @@ void stm32_boardinitialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { -#ifndef CONFIG_LIB_BOARDCTL /* Perform board initialization here instead of from the board_app_initialize(). */ (void)stm32_bringup(); -#endif } #endif