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 7fded742120a2f931b4e03ad7a16a2cdf3856f1c Author: Matteo Golin <[email protected]> AuthorDate: Wed Feb 18 22:43:03 2026 -0500 boards/renesas: Replace board_app_initialize Replaced board_app_initialize logic with board_late_initialize. Signed-off-by: Matteo Golin <[email protected]> --- boards/renesas/rx65n/rx65n-grrose/src/Makefile | 2 +- .../renesas/rx65n/rx65n-grrose/src/rx65n_appinit.c | 84 ---------------------- .../renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c | 20 ++++++ boards/renesas/rx65n/rx65n-rsk2mb/src/Makefile | 2 +- .../renesas/rx65n/rx65n-rsk2mb/src/rx65n_appinit.c | 84 ---------------------- .../renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c | 20 ++++++ 6 files changed, 42 insertions(+), 170 deletions(-) diff --git a/boards/renesas/rx65n/rx65n-grrose/src/Makefile b/boards/renesas/rx65n/rx65n-grrose/src/Makefile index a20bfbd386b..75ef9f7b509 100644 --- a/boards/renesas/rx65n/rx65n-grrose/src/Makefile +++ b/boards/renesas/rx65n/rx65n-grrose/src/Makefile @@ -22,6 +22,6 @@ include $(TOPDIR)/Make.defs -CSRCS = rx65n_appinit.c rx65n_bringup.c rx65n_sbram.c rx65n_gpio.c +CSRCS = rx65n_bringup.c rx65n_sbram.c rx65n_gpio.c include $(TOPDIR)/boards/Board.mk diff --git a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_appinit.c b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_appinit.c deleted file mode 100644 index 5fb04586b10..00000000000 --- a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_appinit.c +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** - * boards/renesas/rx65n/rx65n-grrose/src/rx65n_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 <stdint.h> - -#include <nuttx/board.h> -#include "rx65n_grrose.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. - * - * CONFIG_BOARDCTL=y : - * Called from the NSH library - * - * CONFIG_BOARD_LATE_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && - * CONFIG_BOARDCTL=n : - * Called from board_late_initialize(). - * - * 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) -{ - /* Did we already initialize via board_late_initialize()? */ - -#ifndef CONFIG_BOARD_LATE_INITIALIZE - return rx65n_bringup(); -#else - return OK; -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c index 62a78afeeb6..abe41bd2325 100644 --- a/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c +++ b/boards/renesas/rx65n/rx65n-grrose/src/rx65n_bringup.c @@ -537,3 +537,23 @@ void board_autoled_off(int led) #endif #endif + +/**************************************************************************** + * Name: board_late_initialize + * + * Description: + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional + * initialization call will be performed in the boot-up sequence to a + * function called board_late_initialize(). board_late_initialize() will be + * called immediately after up_initialize() is called and just before the + * initial application is started. This additional initialization phase + * may be used, for example, to initialize board-specific device drivers. + * + ****************************************************************************/ + +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) +{ + rx65n_bringup(); +} +#endif /* CONFIG_BOARD_LATE_INITIALIZE */ diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/src/Makefile b/boards/renesas/rx65n/rx65n-rsk2mb/src/Makefile index 11ab5c55170..a83d920cfc3 100644 --- a/boards/renesas/rx65n/rx65n-rsk2mb/src/Makefile +++ b/boards/renesas/rx65n/rx65n-rsk2mb/src/Makefile @@ -22,6 +22,6 @@ include $(TOPDIR)/Make.defs -CSRCS = rx65n_appinit.c rx65n_bringup.c rx65n_sbram.c rx65n_gpio.c +CSRCS = rx65n_bringup.c rx65n_sbram.c rx65n_gpio.c include $(TOPDIR)/boards/Board.mk diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_appinit.c b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_appinit.c deleted file mode 100644 index 9f68f6e1746..00000000000 --- a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_appinit.c +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** - * boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_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 <stdint.h> - -#include <nuttx/board.h> -#include "rx65n_rsk2mb.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. - * - * CONFIG_BOARDCTL=y : - * Called from the NSH library - * - * CONFIG_BOARD_LATE_INITIALIZE=y, CONFIG_NSH_LIBRARY=y, && - * CONFIG_BOARDCTL=n : - * Called from board_late_initialize(). - * - * 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) -{ - /* Did we already initialize via board_late_initialize()? */ - -#ifndef CONFIG_BOARD_LATE_INITIALIZE - return rx65n_bringup(); -#else - return OK; -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c index 87668ea351c..7d863a792f5 100644 --- a/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c +++ b/boards/renesas/rx65n/rx65n-rsk2mb/src/rx65n_bringup.c @@ -544,3 +544,23 @@ void board_autoled_off(int led) #endif #endif + +/**************************************************************************** + * Name: board_late_initialize + * + * Description: + * If CONFIG_BOARD_LATE_INITIALIZE is selected, then an additional + * initialization call will be performed in the boot-up sequence to a + * function called board_late_initialize(). board_late_initialize() will be + * called immediately after up_initialize() is called and just before the + * initial application is started. This additional initialization phase + * may be used, for example, to initialize board-specific device drivers. + * + ****************************************************************************/ + +#ifdef CONFIG_BOARD_LATE_INITIALIZE +void board_late_initialize(void) +{ + rx65n_bringup(); +} +#endif /* CONFIG_BOARD_LATE_INITIALIZE */
