This is an automated email from the ASF dual-hosted git repository. acassis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 92040a2bdffbdd44d7988f2ce1597cc864190891 Author: raiden00pl <[email protected]> AuthorDate: Tue Jul 11 13:00:00 2023 +0200 cmake: convert some stm32 boards --- boards/arm/stm32/b-g431b-esc1/CMakeLists.txt | 22 ++++++ boards/arm/stm32/b-g431b-esc1/src/CMakeLists.txt | 53 ++++++++++++++ boards/arm/stm32/nucleo-f302r8/CMakeLists.txt | 21 ++++++ boards/arm/stm32/nucleo-f302r8/src/CMakeLists.txt | 60 ++++++++++++++++ boards/arm/stm32/nucleo-f334r8/CMakeLists.txt | 21 ++++++ boards/arm/stm32/nucleo-f334r8/src/CMakeLists.txt | 61 ++++++++++++++++ boards/arm/stm32/nucleo-f446re/CMakeLists.txt | 21 ++++++ boards/arm/stm32/nucleo-f446re/src/CMakeLists.txt | 81 ++++++++++++++++++++++ boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c | 2 +- 9 files changed, 341 insertions(+), 1 deletion(-) diff --git a/boards/arm/stm32/b-g431b-esc1/CMakeLists.txt b/boards/arm/stm32/b-g431b-esc1/CMakeLists.txt new file mode 100644 index 0000000000..4c46970317 --- /dev/null +++ b/boards/arm/stm32/b-g431b-esc1/CMakeLists.txt @@ -0,0 +1,22 @@ + +# ############################################################################## +# boards/arm/stm32/b-g431b-esc1/CMakeLists.txt +# +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements. See the NOTICE file distributed with this work for +# additional information regarding copyright ownership. The ASF licenses this +# file to you under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +# ############################################################################## + +add_subdirectory(src) diff --git a/boards/arm/stm32/b-g431b-esc1/src/CMakeLists.txt b/boards/arm/stm32/b-g431b-esc1/src/CMakeLists.txt new file mode 100644 index 0000000000..c32aeba6db --- /dev/null +++ b/boards/arm/stm32/b-g431b-esc1/src/CMakeLists.txt @@ -0,0 +1,53 @@ +############################################################################ +# boards/arm/stm32/b-g431b-esc1/src/CMakeLists.txt +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + + +set(SRCS stm32_boot.c stm32_bringup.c) + +if(CONFIG_ARCH_LEDS) + list(APPEND SRCS stm32_autoleds.c) +else() + list(APPEND SRCS stm32_userleds.c) +endif() + +if(CONFIG_ARCH_BUTTONS) + list(APPEND SRCS stm32_buttons.c) +endif() + +if(CONFIG_BOARDCTL) + list(APPEND SRCS stm32_appinit.c) +endif() + +if(CONFIG_STM32_FOC) + list(APPEND SRCS stm32_foc.c) +endif() + +if(CONFIG_STM32_FDCAN) +if(CONFIG_STM32_FDCAN_CHARDRIVER) + list(APPEND SRCS stm32_can.c) +endif() +if(CONFIG_STM32_FDCAN_SOCKET) + list(APPEND SRCS stm32_cansock.c) +endif() +endif() + +target_sources(board PRIVATE ${SRCS}) + +set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/ld.script") diff --git a/boards/arm/stm32/nucleo-f302r8/CMakeLists.txt b/boards/arm/stm32/nucleo-f302r8/CMakeLists.txt new file mode 100644 index 0000000000..fd1ebdfa26 --- /dev/null +++ b/boards/arm/stm32/nucleo-f302r8/CMakeLists.txt @@ -0,0 +1,21 @@ +# ############################################################################## +# boards/arm/stm32/nucleo-f302r8/CMakeLists.txt +# +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements. See the NOTICE file distributed with this work for +# additional information regarding copyright ownership. The ASF licenses this +# file to you under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +# ############################################################################## + +add_subdirectory(src) diff --git a/boards/arm/stm32/nucleo-f302r8/src/CMakeLists.txt b/boards/arm/stm32/nucleo-f302r8/src/CMakeLists.txt new file mode 100644 index 0000000000..112a99b27c --- /dev/null +++ b/boards/arm/stm32/nucleo-f302r8/src/CMakeLists.txt @@ -0,0 +1,60 @@ +############################################################################ +# boards/arm/stm32/nucleo-f302r8/src/CMakeLists.txt +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +set(SRCS stm32_boot.c stm32_bringup.c) + +if(CONFIG_ARCH_LEDS) + list(APPEND SRCS stm32_autoleds.c) +else() + list(APPEND SRCS stm32_userleds.c) +endif() + +if(CONFIG_ARCH_BUTTONS) + list(APPEND SRCS stm32_buttons.c) +endif() + +if(CONFIG_BOARDCTL) + list(APPEND SRCS stm32_appinit.c) +endif() + +if(CONFIG_PWM) + list(APPEND SRCS stm32_pwm.c) +endif() + +if(CONFIG_NUCLEOF302R8_HIGHPRI) + list(APPEND SRCS stm32_highpri.c) +endif() + +if(CONFIG_BOARD_STM32_IHM07M1) + list(APPEND SRCS stm32_foc_ihm07m1.c) +endif() + +if(CONFIG_STM32_CAN) + if(CONFIG_STM32_CAN_CHARDRIVER) + list(APPEND SRCS stm32_can.c) + endif() + if(CONFIG_STM32_CAN_SOCKET) + list(APPEND SRCS stm32_cansock.c) + endif() +endif() + +target_sources(board PRIVATE ${SRCS}) + +set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/ld.script") diff --git a/boards/arm/stm32/nucleo-f334r8/CMakeLists.txt b/boards/arm/stm32/nucleo-f334r8/CMakeLists.txt new file mode 100644 index 0000000000..ae72b30a05 --- /dev/null +++ b/boards/arm/stm32/nucleo-f334r8/CMakeLists.txt @@ -0,0 +1,21 @@ +# ############################################################################## +# boards/arm/stm32/nucleo-f334r8/CMakeLists.txt +# +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements. See the NOTICE file distributed with this work for +# additional information regarding copyright ownership. The ASF licenses this +# file to you under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +# ############################################################################## + +add_subdirectory(src) diff --git a/boards/arm/stm32/nucleo-f334r8/src/CMakeLists.txt b/boards/arm/stm32/nucleo-f334r8/src/CMakeLists.txt new file mode 100644 index 0000000000..13c113170c --- /dev/null +++ b/boards/arm/stm32/nucleo-f334r8/src/CMakeLists.txt @@ -0,0 +1,61 @@ +############################################################################ +# boards/arm/stm32/nucleo-f334r8/src/CMakeLists.txt +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +set(SRCS stm32_boot.c) + +if(CONFIG_ARCH_LEDS) + list(APPEND SRCS stm32_autoleds.c) +endif() + +if(CONFIG_BOARDCTL) + list(APPEND SRCS stm32_appinit.c) +endif() + +if(CONFIG_ADC) + list(APPEND SRCS stm32_adc.c) +endif() + +if(CONFIG_DAC) + list(APPEND SRCS stm32_dac.c) +endif() + +if(CONFIG_STM32_HRTIM) + list(APPEND SRCS stm32_hrtim.c) +endif() + +if(CONFIG_COMP) + list(APPEND SRCS stm32_comp.c) +endif() + +if(CONFIG_OPAMP) + list(APPEND SRCS stm32_opamp.c) +endif() + +if(CONFIG_NUCLEOF334R8_HIGHPRI) + list(APPEND SRCS stm32_highpri.c) +endif() + +if(CONFIG_NUCLEOF334R8_SPWM) + list(APPEND SRCS stm32_spwm.c) +endif() + +target_sources(board PRIVATE ${SRCS}) + +set_property(GLOBAL PROPERTY LD_SCRIPT "${NUTTX_BOARD_DIR}/scripts/ld.script") diff --git a/boards/arm/stm32/nucleo-f446re/CMakeLists.txt b/boards/arm/stm32/nucleo-f446re/CMakeLists.txt new file mode 100644 index 0000000000..035696fc2d --- /dev/null +++ b/boards/arm/stm32/nucleo-f446re/CMakeLists.txt @@ -0,0 +1,21 @@ +# ############################################################################## +# boards/arm/stm32/nucleo-f446re/CMakeLists.txt +# +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements. See the NOTICE file distributed with this work for +# additional information regarding copyright ownership. The ASF licenses this +# file to you under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +# ############################################################################## + +add_subdirectory(src) diff --git a/boards/arm/stm32/nucleo-f446re/src/CMakeLists.txt b/boards/arm/stm32/nucleo-f446re/src/CMakeLists.txt new file mode 100644 index 0000000000..0a51d7ec52 --- /dev/null +++ b/boards/arm/stm32/nucleo-f446re/src/CMakeLists.txt @@ -0,0 +1,81 @@ +############################################################################ +# boards/arm/stm32/nucleo-f446re/src/CMakeLists.txt +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. The +# ASF licenses this file to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance with the +# License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations +# under the License. +# +############################################################################ + +set(SRCS stm32_boot.c stm32_bringup.c stm32_spi.c) + +if(CONFIG_ARCH_LEDS) + list(APPEND SRCS stm32_autoleds.c) +else() + list(APPEND SRCS stm32_userleds.c) +endif() + +if(CONFIG_ARCH_BUTTONS) + list(APPEND SRCS stm32_buttons.c) +endif() + +if(CONFIG_LCD_ILI9225) + list(APPEND SRCS stm32_ili9225.c) +endif() + +if(NOT CONFIG_STM32_FOC) + if(CONFIG_ADC) + list(APPEND SRCS stm32_adc.c) + if(CONFIG_INPUT_AJOYSTICK) + list(APPEND SRCS stm32_ajoystick.c) + endif() + endif() +endif() + +if(CONFIG_STM32_CAN) + if(CONFIG_STM32_CAN_CHARDRIVER) + list(APPEND SRCS stm32_can.c) + endif() + if(CONFIG_STM32_CAN_SOCKET) + list(APPEND SRCS stm32_cansock.c) + endif() +endif() + +if(CONFIG_STM32_PWM) + list(APPEND SRCS stm32_pwm.c) +endif() + +if(CONFIG_DEV_GPIO) + list(APPEND SRCS stm32_gpio.c) +endif() + +if(CONFIG_DAC) + list(APPEND SRCS stm32_dac.c) +endif() + +if(CONFIG_BOARDCTL) + list(APPEND SRCS stm32_appinit.c) +endif() + +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") diff --git a/boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c b/boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c index a576b72995..ecf39eda0f 100644 --- a/boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c +++ b/boards/arm/stm32/nucleo-f446re/src/stm32_bringup.c @@ -35,7 +35,6 @@ #include <nuttx/mmcsd.h> #include <stm32.h> -#include <stm32_romfs.h> #include <arch/board/board.h> @@ -55,6 +54,7 @@ # include <nuttx/video/fb.h> #endif +#include "stm32_romfs.h" #include "nucleo-f446re.h" /****************************************************************************
