nuttx/nuttx-update
1
2
Fork 1
Code Issues 1 Pull requests 1 Projects Releases Packages Wiki Activity Actions

stm32h7: fix config conflict

Browse source 
if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL) conflict

Signed-off-by: wangmingrong <wangmingrong@xiaomi.com>
This commit is contained in:
wangmingrong 2023-12-06 14:39:19 +08:00 committed by Xiang Xiao
parent fb5c9975cc
commit 02936df943
12 changed files with 8 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
boards/arm/stm32h7/linum-stm32h753bi/src/linum-stm32h753bi.h
View file

@ -69,7 +69,8 @@
* CONFIG_BOARD_LATE_INITIALIZE=y :
* Called from board_late_initialize().
*
* CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
* CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y &&
* CONFIG_NSH_ARCHINIT:
* Called from the NSH library
*
****************************************************************************/

6
boards/arm/stm32h7/linum-stm32h753bi/src/stm32_boot.c
View file

@ -72,12 +72,6 @@ void stm32_boardinitialize(void)
#ifdef CONFIG_BOARD_LATE_INITIALIZE
void board_late_initialize(void)
{
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
/* Perform board bring-up here instead of from the
* board_app_initialize().
*/
stm32_bringup();
#endif
}
#endif

3
boards/arm/stm32h7/nucleo-h743zi/src/nucleo-h743zi.h
View file

@ -236,7 +236,8 @@
* CONFIG_BOARD_LATE_INITIALIZE=y :
* Called from board_late_initialize().
*
* CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
* CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y &&
* CONFIG_NSH_ARCHINIT:
* Called from the NSH library
*
****************************************************************************/

6
boards/arm/stm32h7/nucleo-h743zi/src/stm32_boot.c
View file

@ -86,12 +86,6 @@ void stm32_boardinitialize(void)
#ifdef CONFIG_BOARD_LATE_INITIALIZE
void board_late_initialize(void)
{
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
/* Perform board bring-up here instead of from the
* board_app_initialize().
*/
stm32_bringup();
#endif
}
#endif

3
boards/arm/stm32h7/nucleo-h743zi2/src/nucleo-h743zi2.h
View file

@ -147,9 +147,6 @@
* CONFIG_BOARD_LATE_INITIALIZE=y :
* Called from board_late_initialize().
*
* CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
* Called from the NSH library
*
****************************************************************************/
int stm32_bringup(void);

6
boards/arm/stm32h7/nucleo-h743zi2/src/stm32_boot.c
View file

@ -80,12 +80,6 @@ void stm32_boardinitialize(void)
#ifdef CONFIG_BOARD_LATE_INITIALIZE
void board_late_initialize(void)
{
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
/* Perform board bring-up here instead of from the
* board_app_initialize().
*/
stm32_bringup();
#endif
}
#endif

3
boards/arm/stm32h7/nucleo-h745zi/src/nucleo-h745zi.h
View file

@ -226,7 +226,8 @@
* CONFIG_BOARD_LATE_INITIALIZE=y :
* Called from board_late_initialize().
*
* CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
* CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y &&
* CONFIG_NSH_ARCHINIT:
* Called from the NSH library
*
****************************************************************************/

6
boards/arm/stm32h7/nucleo-h745zi/src/stm32_boot.c
View file

@ -86,12 +86,6 @@ void stm32_boardinitialize(void)
#ifdef CONFIG_BOARD_LATE_INITIALIZE
void board_late_initialize(void)
{
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
/* Perform board bring-up here instead of from the
* board_app_initialize().
*/
stm32_bringup();
#endif
}
#endif

6
boards/arm/stm32h7/stm32h745i-disco/src/stm32_boot.c
View file

@ -78,12 +78,6 @@ void stm32_boardinitialize(void)
#ifdef CONFIG_BOARD_LATE_INITIALIZE
void board_late_initialize(void)
{
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
/* Perform board bring-up here instead of from the
* board_app_initialize().
*/
stm32_bringup();
#endif
}
#endif

3
boards/arm/stm32h7/stm32h745i-disco/src/stm32h745i_disco.h
View file

@ -169,9 +169,6 @@
* CONFIG_BOARD_LATE_INITIALIZE=y :
* Called from board_late_initialize().
*
* CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
* Called from the NSH library
*
****************************************************************************/
int stm32_bringup(void);

6
boards/arm/stm32h7/stm32h747i-disco/src/stm32_boot.c
View file

@ -86,12 +86,6 @@ void stm32_boardinitialize(void)
#ifdef CONFIG_BOARD_LATE_INITIALIZE
void board_late_initialize(void)
{
#if defined(CONFIG_NSH_LIBRARY) && !defined(CONFIG_BOARDCTL)
/* Perform board bring-up here instead of from the
* board_app_initialize().
*/
stm32_bringup();
#endif
}
#endif

3
boards/arm/stm32h7/stm32h747i-disco/src/stm32h747i-disco.h
View file

@ -115,7 +115,8 @@
* CONFIG_BOARD_LATE_INITIALIZE=y :
* Called from board_late_initialize().
*
* CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y :
* CONFIG_BOARD_LATE_INITIALIZE=n && CONFIG_BOARDCTL=y &&
* CONFIG_NSH_ARCHINIT:
* Called from the NSH library
*
****************************************************************************/