This is an automated email from the ASF dual-hosted git repository. linguini pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit 0a5336a9f19e750425a80db6f44075e3d0aecf96 Author: simbit18 <[email protected]> AuthorDate: Fri Sep 26 14:28:14 2025 +0200 boards/arm/rp2040: CMake added pimoroni-tiny2040 board Added CMake build for pimoroni-tiny2040 board Removed old file rp2040_tiny2040.h to use the existing rp2040_pico.h to align with other boards. Signed-off-by: simbit18 <[email protected]> --- boards/arm/rp2040/pimoroni-tiny2040/CMakeLists.txt | 40 ++++++++++++++++++++ .../rp2040/pimoroni-tiny2040/src/CMakeLists.txt | 43 ++++++++++++++++++++++ .../rp2040/pimoroni-tiny2040/src/rp2040_appinit.c | 2 +- .../rp2040/pimoroni-tiny2040/src/rp2040_tiny2040.h | 38 ------------------- 4 files changed, 84 insertions(+), 39 deletions(-) diff --git a/boards/arm/rp2040/pimoroni-tiny2040/CMakeLists.txt b/boards/arm/rp2040/pimoroni-tiny2040/CMakeLists.txt new file mode 100644 index 00000000000..2a625241968 --- /dev/null +++ b/boards/arm/rp2040/pimoroni-tiny2040/CMakeLists.txt @@ -0,0 +1,40 @@ +# ############################################################################## +# boards/arm/rp2040/pimoroni-tiny2040/CMakeLists.txt +# +# SPDX-License-Identifier: Apache-2.0 +# +# 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) + +add_custom_target( + nuttx_post_build + DEPENDS nuttx + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + COMMENT "Regenerate nuttx.uf2") + +# The uf2 command to convert ELF/BIN to UF2 +add_custom_command( + TARGET nuttx_post_build + POST_BUILD + COMMAND picotool ARGS uf2 convert --quiet -t elf nuttx nuttx.uf2 + COMMAND_EXPAND_LISTS + COMMAND ${CMAKE_COMMAND} -E echo "nuttx.uf2" >> + ${CMAKE_BINARY_DIR}/nuttx.manifest + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + COMMENT "Regenerate nuttx.uf2") diff --git a/boards/arm/rp2040/pimoroni-tiny2040/src/CMakeLists.txt b/boards/arm/rp2040/pimoroni-tiny2040/src/CMakeLists.txt new file mode 100644 index 00000000000..d927fbcb9c4 --- /dev/null +++ b/boards/arm/rp2040/pimoroni-tiny2040/src/CMakeLists.txt @@ -0,0 +1,43 @@ +# ############################################################################## +# boards/arm/rp2040/pimoroni-tiny2040/src/CMakeLists.txt +# +# SPDX-License-Identifier: Apache-2.0 +# +# 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 rp2040_boardinitialize.c rp2040_bringup.c) + +if(CONFIG_DEV_GPIO) + list(APPEND SRCS rp2040_gpio.c) +endif() + +if(CONFIG_BOARDCTL) + list(APPEND SRCS rp2040_appinit.c) +endif() + +target_sources(board PRIVATE ${SRCS}) + +if(CONFIG_RP2040_FLASH_BOOT) + set_property( + GLOBAL PROPERTY LD_SCRIPT + "${NUTTX_BOARD_DIR}/scripts/pimoroni-tiny2040-flash.ld") +else() + set_property( + GLOBAL PROPERTY LD_SCRIPT + "${NUTTX_BOARD_DIR}/scripts/pimoroni-tiny2040-sram.ld") +endif() diff --git a/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_appinit.c b/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_appinit.c index 7a2b71ff4dd..ec21692bcaa 100644 --- a/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_appinit.c +++ b/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_appinit.c @@ -29,7 +29,7 @@ #include <sys/types.h> #include <nuttx/board.h> -#include "rp2040_tiny2040.h" +#include "rp2040_pico.h" /**************************************************************************** * Pre-processor Definitions diff --git a/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_tiny2040.h b/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_tiny2040.h deleted file mode 100644 index 895534ad187..00000000000 --- a/boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_tiny2040.h +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** - * boards/arm/rp2040/pimoroni-tiny2040/src/rp2040_tiny2040.h - * - * SPDX-License-Identifier: Apache-2.0 - * - * 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. - * - ****************************************************************************/ - -#ifndef __BOARDS_ARM_RP2040_PIMORONI_TINY2040_SRC_RP2040_TINY2040_H -#define __BOARDS_ARM_RP2040_PIMORONI_TINY2040_SRC_RP2040_TINY2040_H - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include <nuttx/config.h> - -int rp2040_bringup(void); - -#ifdef CONFIG_DEV_GPIO -int rp2040_dev_gpio_init(void); -#endif - -#endif /* __BOARDS_ARM_RP2040_PIMORONI_TINY2040_SRC_RP2040_TINY2040_H */
