Skip to content

{bp-19431} boards/arm/stm32{f1,f4}: drop duplicated reset.c/romfs, use common board logic #19617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Aug 3, 2026
Merged

{bp-19431} boards/arm/stm32{f1,f4}: drop duplicated reset.c/romfs, use common board logic #19617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions boards/arm/stm32f1/stm32f103-minimum/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@

set(SRCS stm32_boot.c stm32_bringup.c stm32_spi.c)

if(CONFIG_BOARDCTL_RESET)
list(APPEND SRCS stm32_reset.c)
endif()

if(CONFIG_ARCH_BUTTONS)
list(APPEND SRCS stm32_buttons.c)
endif()
Expand Down
4 changes: 0 additions & 4 deletions boards/arm/stm32f1/stm32f103-minimum/src/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ include $(TOPDIR)/Make.defs

CSRCS = stm32_boot.c stm32_bringup.c stm32_spi.c

ifeq ($(CONFIG_BOARDCTL_RESET),y)
CSRCS += stm32_reset.c
endif

ifeq ($(CONFIG_ARCH_BUTTONS),y)
CSRCS += stm32_buttons.c
endif
Expand Down
65 changes: 0 additions & 65 deletions boards/arm/stm32f1/stm32f103-minimum/src/stm32_reset.c
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions boards/arm/stm32f4/nucleo-f429zi/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,6 @@ if(CONFIG_STM32_BBSRAM)
list(APPEND SRCS stm32_bbsram.c)
endif()

if(CONFIG_BOARDCTL_RESET)
list(APPEND SRCS stm32_reset.c)
endif()

if(CONFIG_STM32_ROMFS)
list(APPEND SRCS stm32_romfs_initialize.c)
endif()

target_sources(board PRIVATE ${SRCS})

set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/ld.script")
8 changes: 0 additions & 8 deletions boards/arm/stm32f4/nucleo-f429zi/src/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,6 @@ ifeq ($(CONFIG_STM32_BBSRAM),y)
CSRCS += stm32_bbsram.c
endif

ifeq ($(CONFIG_BOARDCTL_RESET),y)
CSRCS += stm32_reset.c
endif

ifeq ($(CONFIG_STM32_ROMFS),y)
CSRCS += stm32_romfs_initialize.c
endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board
64 changes: 0 additions & 64 deletions boards/arm/stm32f4/nucleo-f429zi/src/stm32_reset.c
View file
Open in desktop

This file was deleted.

141 changes: 0 additions & 141 deletions boards/arm/stm32f4/nucleo-f429zi/src/stm32_romfs_initialize.c
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions boards/arm/stm32f4/nucleo-f446re/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,26 +30,4 @@ config NUCLEO_F446RE_AJOY_MINBUTTONS
minimal set: SELECT (joystick down), FIRE (BUTTON B), and JUMP
(BUTTON A).

config STM32_ROMFS
bool "Automount baked-in ROMFS image"
default n
depends on FS_ROMFS
---help---
Select STM32_ROMFS_IMAGEFILE, STM32_ROMFS_DEV_MINOR, STM32_ROMFS_MOUNTPOINT

config STM32_ROMFS_DEV_MINOR
int "Minor for the block device backing the data"
depends on STM32_ROMFS
default 64

config STM32_ROMFS_MOUNTPOINT
string "Mountpoint of the custom romfs image"
depends on STM32_ROMFS
default "/rom"

config STM32_ROMFS_IMAGEFILE
string "ROMFS image file to include into build"
depends on STM32_ROMFS
default "../../../rom.img"

endif # ARCH_BOARD_NUCLEO_F446RE
4 changes: 0 additions & 4 deletions boards/arm/stm32f4/nucleo-f446re/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,6 @@ if(CONFIG_BOARD_STM32_IHM08M1)
list(APPEND SRCS stm32_foc_ihm08m1.c)
endif()

if(CONFIG_STM32_ROMFS)
list(APPEND SRCS stm32_romfs_initialize.c)
endif()

target_sources(board PRIVATE ${SRCS})

set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/f446re.ld")
4 changes: 0 additions & 4 deletions boards/arm/stm32f4/nucleo-f446re/src/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ ifeq ($(CONFIG_BOARD_STM32_IHM08M1),y)
CSRCS += stm32_foc_ihm08m1.c
endif

ifeq ($(CONFIG_STM32_ROMFS),y)
CSRCS += stm32_romfs_initialize.c
endif

DEPPATH += --dep-path board
VPATH += :board
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board
4 changes: 3 additions & 1 deletion boards/arm/stm32f4/nucleo-f446re/src/stm32_bringup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@
# include <nuttx/leds/userled.h>
#endif

#include "stm32_romfs.h"
#ifdef CONFIG_STM32_ROMFS
# include "stm32_romfs.h"
#endif
#include "nucleo-f446re.h"

/****************************************************************************
Expand Down
Loading
Loading