This is an automated email from the ASF dual-hosted git repository. xiaoxiang781216 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nuttx.git
commit e30da0ba746f1656fc9a8e0f19af6723ef711d0a Author: Matteo Golin <[email protected]> AuthorDate: Wed Feb 18 22:45:46 2026 -0500 boards/tricore: Replace board_app_initialize Replaced board_app_initialize logic with board_late_initialize. Signed-off-by: Matteo Golin <[email protected]> --- .../tc397/a2g-tc397-5v-tft/src/CMakeLists.txt | 2 +- boards/tricore/tc397/a2g-tc397-5v-tft/src/Makefile | 4 -- .../tc397/a2g-tc397-5v-tft/src/tc397_appinit.c | 77 ---------------------- .../tc397/a2g-tc397-5v-tft/src/tc397_boardinit.c | 2 - .../tc4da/triboard_tc4x9_com/src/CMakeLists.txt | 2 +- .../tricore/tc4da/triboard_tc4x9_com/src/Makefile | 4 -- .../tc4da/triboard_tc4x9_com/src/tc4da_appinit.c | 77 ---------------------- 7 files changed, 2 insertions(+), 166 deletions(-) diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/src/CMakeLists.txt b/boards/tricore/tc397/a2g-tc397-5v-tft/src/CMakeLists.txt index 503675f17e9..d034097f8b7 100644 --- a/boards/tricore/tc397/a2g-tc397-5v-tft/src/CMakeLists.txt +++ b/boards/tricore/tc397/a2g-tc397-5v-tft/src/CMakeLists.txt @@ -20,7 +20,7 @@ # # ############################################################################## -set(SRCS tc397_appinit.c tc397_boardinit.c tc397_bringup.c) +set(SRCS tc397_boardinit.c tc397_bringup.c) target_sources(board PRIVATE ${SRCS}) diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/src/Makefile b/boards/tricore/tc397/a2g-tc397-5v-tft/src/Makefile index 3b9c5308c63..49a3beb29c9 100644 --- a/boards/tricore/tc397/a2g-tc397-5v-tft/src/Makefile +++ b/boards/tricore/tc397/a2g-tc397-5v-tft/src/Makefile @@ -24,8 +24,4 @@ include $(TOPDIR)/Make.defs CSRCS = tc397_boardinit.c tc397_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += tc397_appinit.c -endif - include $(TOPDIR)/boards/Board.mk diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_appinit.c b/boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_appinit.c deleted file mode 100644 index d576157a4d5..00000000000 --- a/boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_appinit.c +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** - * boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_appinit.c - * - * 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. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include <nuttx/config.h> - -#include <sys/types.h> - -#include <nuttx/board.h> - -#include "tc397.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: board_app_initialize - * - * Description: - * Perform application specific initialization. This function is never - * called directly from application code, but only indirectly via the - * (non-standard) boardctl() interface using the command BOARDIOC_INIT. - * - * Input Parameters: - * arg - The boardctl() argument is passed to the board_app_initialize() - * implementation without modification. The argument has no - * meaning to NuttX; the meaning of the argument is a contract - * between the board-specific initialization logic and the - * matching application logic. The value could be such things as a - * mode enumeration value, a set of DIP switch switch settings, a - * pointer to configuration data read from a file or serial FLASH, - * or whatever you would like to do with it. Every implementation - * should accept zero/NULL as a default configuration. - * - * Returned Value: - * Zero (OK) is returned on success; a negated errno value is returned on - * any failure to indicate the nature of the failure. - * - ****************************************************************************/ - -int board_app_initialize(uintptr_t arg) -{ -#ifndef CONFIG_BOARD_LATE_INITIALIZE - /* Perform board initialization */ - - return tc397_bringup(); -#else - return OK; -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_boardinit.c b/boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_boardinit.c index ce0dd9d570c..9c789ca129d 100644 --- a/boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_boardinit.c +++ b/boards/tricore/tc397/a2g-tc397-5v-tft/src/tc397_boardinit.c @@ -114,8 +114,6 @@ void tc397_board_initialize(void) #ifdef CONFIG_BOARD_LATE_INITIALIZE void board_late_initialize(void) { - /* Perform board initialization */ - tc397_bringup(); } #endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/src/CMakeLists.txt b/boards/tricore/tc4da/triboard_tc4x9_com/src/CMakeLists.txt index bcadeea22ba..3ed0a4855ed 100644 --- a/boards/tricore/tc4da/triboard_tc4x9_com/src/CMakeLists.txt +++ b/boards/tricore/tc4da/triboard_tc4x9_com/src/CMakeLists.txt @@ -20,7 +20,7 @@ # # ############################################################################## -set(SRCS tc4da_appinit.c tc4da_boardinit.c tc4da_bringup.c) +set(SRCS tc4da_boardinit.c tc4da_bringup.c) target_sources(board PRIVATE ${SRCS}) diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/src/Makefile b/boards/tricore/tc4da/triboard_tc4x9_com/src/Makefile index 3203a4e0d99..30abecc8728 100644 --- a/boards/tricore/tc4da/triboard_tc4x9_com/src/Makefile +++ b/boards/tricore/tc4da/triboard_tc4x9_com/src/Makefile @@ -24,8 +24,4 @@ include $(TOPDIR)/Make.defs CSRCS = tc4da_boardinit.c tc4da_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += tc4da_appinit.c -endif - include $(TOPDIR)/boards/Board.mk diff --git a/boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da_appinit.c b/boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da_appinit.c deleted file mode 100644 index b239a347fc5..00000000000 --- a/boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da_appinit.c +++ /dev/null @@ -1,77 +0,0 @@ -/**************************************************************************** - * boards/tricore/tc4da/triboard_tc4x9_com/src/tc4da_appinit.c - * - * 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. - * - ****************************************************************************/ - -/**************************************************************************** - * Included Files - ****************************************************************************/ - -#include <nuttx/config.h> - -#include <sys/types.h> - -#include <nuttx/board.h> - -#include "tc4da.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Public Functions - ****************************************************************************/ - -/**************************************************************************** - * Name: board_app_initialize - * - * Description: - * Perform application specific initialization. This function is never - * called directly from application code, but only indirectly via the - * (non-standard) boardctl() interface using the command BOARDIOC_INIT. - * - * Input Parameters: - * arg - The boardctl() argument is passed to the board_app_initialize() - * implementation without modification. The argument has no - * meaning to NuttX; the meaning of the argument is a contract - * between the board-specific initialization logic and the - * matching application logic. The value could be such things as a - * mode enumeration value, a set of DIP switch switch settings, a - * pointer to configuration data read from a file or serial FLASH, - * or whatever you would like to do with it. Every implementation - * should accept zero/NULL as a default configuration. - * - * Returned Value: - * Zero (OK) is returned on success; a negated errno value is returned on - * any failure to indicate the nature of the failure. - * - ****************************************************************************/ - -int board_app_initialize(uintptr_t arg) -{ -#ifndef CONFIG_BOARD_LATE_INITIALIZE - /* Perform board initialization */ - - return tc4da_bringup(); -#else - return OK; -#endif -} - -#endif /* CONFIG_BOARDCTL */
