Skip to content

Commit 319feeb

Browse files
raiden00plraiden00pl
committed
boards/arm/stm32{l5,u5,wb,wl5,n6}: switch board common to stm32 common
Wire the remaining STM32 families (L5, U5, WB, WL5, N6) to the shared boards/arm/common/stm32 board-common directory. No functional change: these boards do not yet use any shared driver, but the shared board-common features are now available to the families. Signed-off-by: raiden00pl <raiden00@railab.me>
1 parent 1ac44c1 commit 319feeb

19 files changed

Lines changed: 328 additions & 17 deletions

File tree

‎boards/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5206,7 +5206,7 @@ endif
52065206
if ARCH_CHIP_SAMV7
52075207
source "boards/arm/samv7/common/Kconfig"
52085208
endif
5209-
if ARCH_CHIP_STM32C0 || ARCH_CHIP_STM32F0 || ARCH_CHIP_STM32F1 || ARCH_CHIP_STM32F2 || ARCH_CHIP_STM32F3 || ARCH_CHIP_STM32F4 || ARCH_CHIP_STM32F7 || ARCH_CHIP_STM32G0 || ARCH_CHIP_STM32G4 || ARCH_CHIP_STM32L0 || ARCH_CHIP_STM32L1 || ARCH_CHIP_STM32H5 || ARCH_CHIP_STM32H7
5209+
if ARCH_CHIP_STM32C0 || ARCH_CHIP_STM32F0 || ARCH_CHIP_STM32F1 || ARCH_CHIP_STM32F2 || ARCH_CHIP_STM32F3 || ARCH_CHIP_STM32F4 || ARCH_CHIP_STM32F7 || ARCH_CHIP_STM32G0 || ARCH_CHIP_STM32G4 || ARCH_CHIP_STM32L0 || ARCH_CHIP_STM32L1 || ARCH_CHIP_STM32H5 || ARCH_CHIP_STM32H7 || ARCH_CHIP_STM32L5 || ARCH_CHIP_STM32U5 || ARCH_CHIP_STM32WB || ARCH_CHIP_STM32WL5 || ARCH_CHIP_STM32N6
52105210
source "boards/arm/common/stm32/Kconfig"
52115211
endif
52125212
if ARCH_CHIP_RP2040

‎boards/arm/stm32l5/common/CMakeLists.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# ##############################################################################
2+
# boards/arm/stm32l5/common/CMakeLists.txt
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
7+
# license agreements. See the NOTICE file distributed with this work for
8+
# additional information regarding copyright ownership. The ASF licenses this
9+
# file to you under the Apache License, Version 2.0 (the "License"); you may not
10+
# use this file except in compliance with the License. You may obtain a copy of
11+
# the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
18+
# License for the specific language governing permissions and limitations under
19+
# the License.
20+
#
21+
# ##############################################################################
22+
23+
add_subdirectory(${NUTTX_DIR}/boards/arm/common/stm32 stm32_common)

‎boards/arm/stm32l5/common/Makefile‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#############################################################################
2+
# boards/arm/stm32l5/common/Makefile
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed to the Apache Software Foundation (ASF) under one or more
7+
# contributor license agreements. See the NOTICE file distributed with
8+
# this work for additional information regarding copyright ownership. The
9+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
10+
# "License"); you may not use this file except in compliance with the
11+
# License. You may obtain a copy of the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
18+
# License for the specific language governing permissions and limitations
19+
# under the License.
20+
#
21+
#############################################################################
22+
23+
include $(TOPDIR)/Make.defs
24+
25+
STM32_BOARD_COMMON_DIR := $(TOPDIR)$(DELIM)boards$(DELIM)arm$(DELIM)common$(DELIM)stm32
26+
27+
include board/Make.defs
28+
include $(STM32_BOARD_COMMON_DIR)$(DELIM)src$(DELIM)Make.defs
29+
30+
DEPPATH += --dep-path board
31+
32+
include $(TOPDIR)/boards/Board.mk
33+
34+
ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
35+
BOARDDIR = $(ARCHSRCDIR)$(DELIM)board
36+
CFLAGS += ${INCDIR_PREFIX}$(BOARDDIR)$(DELIM)include

boards/arm/stm32l5/nucleo-l552ze/src/Makefile renamed to boards/arm/stm32l5/nucleo-l552ze/src/Make.defs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
##############################################################################
2-
# boards/arm/stm32l5/nucleo-l552ze/src/Makefile
2+
# boards/arm/stm32l5/nucleo-l552ze/src/Make.defs
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -35,4 +35,6 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
3535
CSRCS += stm32_buttons.c
3636
endif
3737

38-
include $(TOPDIR)/boards/Board.mk
38+
DEPPATH += --dep-path board
39+
VPATH += :board
40+
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board

boards/arm/stm32l5/stm32l562e-dk/src/Makefile renamed to boards/arm/stm32l5/stm32l562e-dk/src/Make.defs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
##############################################################################
2-
# boards/arm/stm32l5/stm32l562e-dk/src/Makefile
2+
# boards/arm/stm32l5/stm32l562e-dk/src/Make.defs
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -35,4 +35,6 @@ ifeq ($(CONFIG_ARCH_BUTTONS),y)
3535
CSRCS += stm32_buttons.c
3636
endif
3737

38-
include $(TOPDIR)/boards/Board.mk
38+
DEPPATH += --dep-path board
39+
VPATH += :board
40+
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board

‎boards/arm/stm32n6/common/CMakeLists.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# ##############################################################################
2+
# boards/arm/stm32n6/common/CMakeLists.txt
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
7+
# license agreements. See the NOTICE file distributed with this work for
8+
# additional information regarding copyright ownership. The ASF licenses this
9+
# file to you under the Apache License, Version 2.0 (the "License"); you may not
10+
# use this file except in compliance with the License. You may obtain a copy of
11+
# the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
18+
# License for the specific language governing permissions and limitations under
19+
# the License.
20+
#
21+
# ##############################################################################
22+
23+
add_subdirectory(${NUTTX_DIR}/boards/arm/common/stm32 stm32_common)

‎boards/arm/stm32n6/common/Makefile‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
#############################################################################
2+
# boards/arm/stm32n6/common/Makefile
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed to the Apache Software Foundation (ASF) under one or more
7+
# contributor license agreements. See the NOTICE file distributed with
8+
# this work for additional information regarding copyright ownership. The
9+
# ASF licenses this file to you under the Apache License, Version 2.0 (the
10+
# "License"); you may not use this file except in compliance with the
11+
# License. You may obtain a copy of the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
18+
# License for the specific language governing permissions and limitations
19+
# under the License.
20+
#
21+
#############################################################################
22+
23+
include $(TOPDIR)/Make.defs
24+
25+
STM32_BOARD_COMMON_DIR := $(TOPDIR)$(DELIM)boards$(DELIM)arm$(DELIM)common$(DELIM)stm32
26+
27+
include board/Make.defs
28+
include $(STM32_BOARD_COMMON_DIR)$(DELIM)src$(DELIM)Make.defs
29+
30+
DEPPATH += --dep-path board
31+
32+
include $(TOPDIR)/boards/Board.mk
33+
34+
ARCHSRCDIR = $(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src
35+
BOARDDIR = $(ARCHSRCDIR)$(DELIM)board
36+
CFLAGS += ${INCDIR_PREFIX}$(BOARDDIR)$(DELIM)include

boards/arm/stm32n6/nucleo-n657x0-q/src/Makefile renamed to boards/arm/stm32n6/nucleo-n657x0-q/src/Make.defs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
##############################################################################
2-
# boards/arm/stm32n6/nucleo-n657x0-q/src/Makefile
2+
# boards/arm/stm32n6/nucleo-n657x0-q/src/Make.defs
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -31,4 +31,6 @@ else
3131
CSRCS += stm32_userleds.c
3232
endif
3333

34-
include $(TOPDIR)/boards/Board.mk
34+
DEPPATH += --dep-path board
35+
VPATH += :board
36+
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board

boards/arm/stm32u5/b-u585i-iot02a/src/Makefile renamed to boards/arm/stm32u5/b-u585i-iot02a/src/Make.defs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
##############################################################################
2-
# boards/arm/stm32u5/b-u585i-iot02a/src/Makefile
2+
# boards/arm/stm32u5/b-u585i-iot02a/src/Make.defs
33
#
44
# SPDX-License-Identifier: Apache-2.0
55
#
@@ -29,4 +29,6 @@ ifeq ($(CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG),y)
2929
CSRCS += stm32_clockconfig.c
3030
endif
3131

32-
include $(TOPDIR)/boards/Board.mk
32+
DEPPATH += --dep-path board
33+
VPATH += :board
34+
CFLAGS += ${INCDIR_PREFIX}$(TOPDIR)$(DELIM)arch$(DELIM)$(CONFIG_ARCH)$(DELIM)src$(DELIM)board$(DELIM)board

‎boards/arm/stm32u5/common/CMakeLists.txt‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# ##############################################################################
2+
# boards/arm/stm32u5/common/CMakeLists.txt
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
6+
# Licensed to the Apache Software Foundation (ASF) under one or more contributor
7+
# license agreements. See the NOTICE file distributed with this work for
8+
# additional information regarding copyright ownership. The ASF licenses this
9+
# file to you under the Apache License, Version 2.0 (the "License"); you may not
10+
# use this file except in compliance with the License. You may obtain a copy of
11+
# the License at
12+
#
13+
# http://www.apache.org/licenses/LICENSE-2.0
14+
#
15+
# Unless required by applicable law or agreed to in writing, software
16+
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
17+
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
18+
# License for the specific language governing permissions and limitations under
19+
# the License.
20+
#
21+
# ##############################################################################
22+
23+
add_subdirectory(${NUTTX_DIR}/boards/arm/common/stm32 stm32_common)

0 commit comments

Comments
 (0)