diff --git a/boards/xtensa/esp32/esp32-2432S028/src/Make.defs b/boards/xtensa/esp32/esp32-2432S028/src/Make.defs index 2a1195a79c7..b1c9c38b3de 100644 --- a/boards/xtensa/esp32/esp32-2432S028/src/Make.defs +++ b/boards/xtensa/esp32/esp32-2432S028/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32_boot.c esp32_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c endif -endif DEPPATH += --dep-path board VPATH += :board diff --git a/boards/xtensa/esp32/esp32-2432S028/src/esp32-2432S028.h b/boards/xtensa/esp32/esp32-2432S028/src/esp32-2432S028.h index 027ec6c2d57..2223bcff29f 100644 --- a/boards/xtensa/esp32/esp32-2432S028/src/esp32-2432S028.h +++ b/boards/xtensa/esp32/esp32-2432S028/src/esp32-2432S028.h @@ -87,9 +87,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32_bringup(void); diff --git a/boards/xtensa/esp32/esp32-2432S028/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-2432S028/src/esp32_appinit.c deleted file mode 100644 index 11620018d9b..00000000000 --- a/boards/xtensa/esp32/esp32-2432S028/src/esp32_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32/esp32-2432S028/src/esp32_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 - -#include -#include - -#include "esp32-2432S028.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/esp32-audio-kit/src/Make.defs b/boards/xtensa/esp32/esp32-audio-kit/src/Make.defs index 08b0e170c4e..bbfe360d736 100644 --- a/boards/xtensa/esp32/esp32-audio-kit/src/Make.defs +++ b/boards/xtensa/esp32/esp32-audio-kit/src/Make.defs @@ -26,12 +26,9 @@ ifeq ($(CONFIG_USERLED),y) CSRCS += esp32_userleds.c endif -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c endif -endif ifeq ($(CONFIG_DEV_GPIO),y) CSRCS += esp32_gpio.c diff --git a/boards/xtensa/esp32/esp32-audio-kit/src/esp32-audio-kit.h b/boards/xtensa/esp32/esp32-audio-kit/src/esp32-audio-kit.h index a042aa708dd..f8e3786cbbe 100644 --- a/boards/xtensa/esp32/esp32-audio-kit/src/esp32-audio-kit.h +++ b/boards/xtensa/esp32/esp32-audio-kit/src/esp32-audio-kit.h @@ -99,9 +99,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32_bringup(void); diff --git a/boards/xtensa/esp32/esp32-audio-kit/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-audio-kit/src/esp32_appinit.c deleted file mode 100644 index 06c43572d40..00000000000 --- a/boards/xtensa/esp32/esp32-audio-kit/src/esp32_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32/esp32-audio-kit/src/esp32_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 - -#include -#include - -#include "esp32-audio-kit.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/esp32-devkitc/configs/psram_usrheap/defconfig b/boards/xtensa/esp32/esp32-devkitc/configs/psram_usrheap/defconfig index be80b959edc..3abf1e2f22d 100644 --- a/boards/xtensa/esp32/esp32-devkitc/configs/psram_usrheap/defconfig +++ b/boards/xtensa/esp32/esp32-devkitc/configs/psram_usrheap/defconfig @@ -21,7 +21,6 @@ CONFIG_ARCH_MINIMAL_VECTORTABLE_DYNAMIC=y CONFIG_ARCH_NUSER_INTERRUPTS=2 CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_XTENSA=y -CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_ESP32_SPIFLASH=y diff --git a/boards/xtensa/esp32/esp32-devkitc/src/Make.defs b/boards/xtensa/esp32/esp32-devkitc/src/Make.defs index 16b4cddaa66..8b6af076f98 100644 --- a/boards/xtensa/esp32/esp32-devkitc/src/Make.defs +++ b/boards/xtensa/esp32/esp32-devkitc/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32_boot.c esp32_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c endif -endif ifeq ($(CONFIG_DEV_GPIO),y) CSRCS += esp32_gpio.c diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h b/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h index cb3aa58609f..9a7708bd565 100644 --- a/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h +++ b/boards/xtensa/esp32/esp32-devkitc/src/esp32-devkitc.h @@ -104,9 +104,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32_bringup(void); diff --git a/boards/xtensa/esp32/esp32-devkitc/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-devkitc/src/esp32_appinit.c deleted file mode 100644 index a6ae085adaa..00000000000 --- a/boards/xtensa/esp32/esp32-devkitc/src/esp32_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32/esp32-devkitc/src/esp32_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 - -#include -#include - -#include "esp32-devkitc.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs b/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs index 863d57f96cd..7be02889f1a 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs +++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32_boot.c esp32_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c endif -endif ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += esp32_buttons.c diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32-ethernet-kit.h b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32-ethernet-kit.h index 28891467729..e12c0080da4 100644 --- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32-ethernet-kit.h +++ b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32-ethernet-kit.h @@ -76,9 +76,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32_bringup(void); diff --git a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_appinit.c deleted file mode 100644 index cb24b96828e..00000000000 --- a/boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32/esp32-ethernet-kit/src/esp32_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 - -#include -#include - -#include "esp32-ethernet-kit.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/esp32-lyrat/src/Make.defs b/boards/xtensa/esp32/esp32-lyrat/src/Make.defs index 151ba475de3..4d0b9eb99f0 100644 --- a/boards/xtensa/esp32/esp32-lyrat/src/Make.defs +++ b/boards/xtensa/esp32/esp32-lyrat/src/Make.defs @@ -26,12 +26,9 @@ ifeq ($(CONFIG_USERLED),y) CSRCS += esp32_userleds.c endif -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c endif -endif ifeq ($(CONFIG_DEV_GPIO),y) CSRCS += esp32_gpio.c diff --git a/boards/xtensa/esp32/esp32-lyrat/src/esp32-lyrat.h b/boards/xtensa/esp32/esp32-lyrat/src/esp32-lyrat.h index dad3cc92e24..80130f76df6 100644 --- a/boards/xtensa/esp32/esp32-lyrat/src/esp32-lyrat.h +++ b/boards/xtensa/esp32/esp32-lyrat/src/esp32-lyrat.h @@ -95,9 +95,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32_bringup(void); diff --git a/boards/xtensa/esp32/esp32-lyrat/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-lyrat/src/esp32_appinit.c deleted file mode 100644 index 71f05bdeddb..00000000000 --- a/boards/xtensa/esp32/esp32-lyrat/src/esp32_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32/esp32-lyrat/src/esp32_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 - -#include -#include - -#include "esp32-lyrat.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/esp32-pico-kit/src/Make.defs b/boards/xtensa/esp32/esp32-pico-kit/src/Make.defs index 8f56dcc3419..6cefbb73453 100644 --- a/boards/xtensa/esp32/esp32-pico-kit/src/Make.defs +++ b/boards/xtensa/esp32/esp32-pico-kit/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32_boot.c esp32_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c endif -endif ifeq ($(CONFIG_DEV_GPIO),y) CSRCS += esp32_gpio.c diff --git a/boards/xtensa/esp32/esp32-pico-kit/src/esp32-pico-kit.h b/boards/xtensa/esp32/esp32-pico-kit/src/esp32-pico-kit.h index 9b4a79cd17a..7fc8722ccdf 100644 --- a/boards/xtensa/esp32/esp32-pico-kit/src/esp32-pico-kit.h +++ b/boards/xtensa/esp32/esp32-pico-kit/src/esp32-pico-kit.h @@ -91,9 +91,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32_bringup(void); diff --git a/boards/xtensa/esp32/esp32-pico-kit/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-pico-kit/src/esp32_appinit.c deleted file mode 100644 index b1c36f604e8..00000000000 --- a/boards/xtensa/esp32/esp32-pico-kit/src/esp32_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32/esp32-pico-kit/src/esp32_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 - -#include -#include - -#include "esp32-pico-kit.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/src/Make.defs b/boards/xtensa/esp32/esp32-sparrow-kit/src/Make.defs index ebcaac6be4a..e1fe357c949 100644 --- a/boards/xtensa/esp32/esp32-sparrow-kit/src/Make.defs +++ b/boards/xtensa/esp32/esp32-sparrow-kit/src/Make.defs @@ -28,12 +28,9 @@ else CSRCS += esp32_userleds.c endif -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c endif -endif ifeq ($(CONFIG_DEV_GPIO),y) CSRCS += esp32_gpio.c diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32-sparrow-kit.h b/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32-sparrow-kit.h index c73afcf32d9..84483062e80 100644 --- a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32-sparrow-kit.h +++ b/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32-sparrow-kit.h @@ -82,9 +82,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32_bringup(void); diff --git a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_appinit.c deleted file mode 100644 index 8e678300a6e..00000000000 --- a/boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32/esp32-sparrow-kit/src/esp32_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 - -#include -#include - -#include "esp32-sparrow-kit.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs b/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs index 1b50c05b12d..123b71affd7 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs +++ b/boards/xtensa/esp32/esp32-wrover-kit/src/Make.defs @@ -28,12 +28,9 @@ else CSRCS += esp32_userleds.c endif -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c endif -endif ifeq ($(CONFIG_DEV_GPIO),y) CSRCS += esp32_gpio.c diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32-wrover-kit.h b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32-wrover-kit.h index 862cf630fed..0b350e8c109 100644 --- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32-wrover-kit.h +++ b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32-wrover-kit.h @@ -85,9 +85,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32_bringup(void); diff --git a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_appinit.c b/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_appinit.c deleted file mode 100644 index 3869cc49478..00000000000 --- a/boards/xtensa/esp32/esp32-wrover-kit/src/esp32_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32/esp32-wrover-kit/src/esp32_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 - -#include -#include - -#include "esp32-wrover-kit.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/heltec_wifi_lora32/src/Make.defs b/boards/xtensa/esp32/heltec_wifi_lora32/src/Make.defs index 84953ece1ac..5fb022e2e28 100644 --- a/boards/xtensa/esp32/heltec_wifi_lora32/src/Make.defs +++ b/boards/xtensa/esp32/heltec_wifi_lora32/src/Make.defs @@ -22,10 +22,6 @@ CSRCS = esp32_boot.c esp32_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32_appinit.c -endif - ifeq ($(CONFIG_LPWAN_SX127X),y) CSRCS += esp32_sx127x.c endif diff --git a/boards/xtensa/esp32/heltec_wifi_lora32/src/esp32_appinit.c b/boards/xtensa/esp32/heltec_wifi_lora32/src/esp32_appinit.c deleted file mode 100644 index 60deced58ef..00000000000 --- a/boards/xtensa/esp32/heltec_wifi_lora32/src/esp32_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32/heltec_wifi_lora32/src/esp32_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 - -#include -#include - -#include "heltec_wifi_lora32.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/heltec_wifi_lora32/src/heltec_wifi_lora32.h b/boards/xtensa/esp32/heltec_wifi_lora32/src/heltec_wifi_lora32.h index 4fcec679609..86335c75a55 100644 --- a/boards/xtensa/esp32/heltec_wifi_lora32/src/heltec_wifi_lora32.h +++ b/boards/xtensa/esp32/heltec_wifi_lora32/src/heltec_wifi_lora32.h @@ -109,9 +109,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32_bringup(void); diff --git a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/Make.defs b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/Make.defs index 5ca47e0a20c..a89a8154749 100644 --- a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/Make.defs +++ b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32_boot.c esp32_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c endif -endif ifeq ($(CONFIG_MMCSD),y) CSRCS += esp32_mmcsd.c diff --git a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_appinit.c b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_appinit.c deleted file mode 100644 index 33afd175687..00000000000 --- a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/esp32_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 - -#include -#include - -#include "lilygo_tbeam_lora_gps.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/lilygo_tbeam_lora_gps.h b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/lilygo_tbeam_lora_gps.h index a7bc8b3560d..aa9c8947a85 100644 --- a/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/lilygo_tbeam_lora_gps.h +++ b/boards/xtensa/esp32/lilygo_tbeam_lora_gps/src/lilygo_tbeam_lora_gps.h @@ -99,9 +99,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32_bringup(void); diff --git a/boards/xtensa/esp32/ttgo_eink5_v2/src/Make.defs b/boards/xtensa/esp32/ttgo_eink5_v2/src/Make.defs index 967db5dfa7e..4b3d9ac7128 100644 --- a/boards/xtensa/esp32/ttgo_eink5_v2/src/Make.defs +++ b/boards/xtensa/esp32/ttgo_eink5_v2/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32_boot.c esp32_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c endif -endif ifeq ($(CONFIG_DEV_GPIO),y) CSRCS += esp32_gpio.c diff --git a/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_appinit.c b/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_appinit.c deleted file mode 100644 index f14c13c8a2c..00000000000 --- a/boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32/ttgo_eink5_v2/src/esp32_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 - -#include -#include - -#include "ttgo_eink5_v2.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/ttgo_eink5_v2/src/ttgo_eink5_v2.h b/boards/xtensa/esp32/ttgo_eink5_v2/src/ttgo_eink5_v2.h index b8033d050f5..507296e9ea3 100644 --- a/boards/xtensa/esp32/ttgo_eink5_v2/src/ttgo_eink5_v2.h +++ b/boards/xtensa/esp32/ttgo_eink5_v2/src/ttgo_eink5_v2.h @@ -93,9 +93,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32_bringup(void); diff --git a/boards/xtensa/esp32/ttgo_lora_esp32/src/Make.defs b/boards/xtensa/esp32/ttgo_lora_esp32/src/Make.defs index 71533332164..74788f01d0e 100644 --- a/boards/xtensa/esp32/ttgo_lora_esp32/src/Make.defs +++ b/boards/xtensa/esp32/ttgo_lora_esp32/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32_boot.c esp32_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c endif -endif ifeq ($(CONFIG_MMCSD),y) CSRCS += esp32_mmcsd.c diff --git a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_appinit.c b/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_appinit.c deleted file mode 100644 index f95c7a51d71..00000000000 --- a/boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32/ttgo_lora_esp32/src/esp32_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 - -#include -#include - -#include "ttgo_lora_esp32.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/ttgo_lora_esp32/src/ttgo_lora_esp32.h b/boards/xtensa/esp32/ttgo_lora_esp32/src/ttgo_lora_esp32.h index 25c0e2ff040..7e8e8b546b1 100644 --- a/boards/xtensa/esp32/ttgo_lora_esp32/src/ttgo_lora_esp32.h +++ b/boards/xtensa/esp32/ttgo_lora_esp32/src/ttgo_lora_esp32.h @@ -92,9 +92,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32_bringup(void); diff --git a/boards/xtensa/esp32/ttgo_t_display_esp32/src/Make.defs b/boards/xtensa/esp32/ttgo_t_display_esp32/src/Make.defs index 722539876db..3fb80894f6f 100644 --- a/boards/xtensa/esp32/ttgo_t_display_esp32/src/Make.defs +++ b/boards/xtensa/esp32/ttgo_t_display_esp32/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32_boot.c esp32_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32_reset.c endif -endif ifeq ($(CONFIG_DEV_GPIO),y) CSRCS += esp32_gpio.c diff --git a/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_appinit.c b/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_appinit.c deleted file mode 100644 index 14edb17d82d..00000000000 --- a/boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32/ttgo_t_display_esp32/src/esp32_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 - -#include -#include - -#include "ttgo_t_display_esp32.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32/ttgo_t_display_esp32/src/ttgo_t_display_esp32.h b/boards/xtensa/esp32/ttgo_t_display_esp32/src/ttgo_t_display_esp32.h index f9b6a675c90..805928f078f 100644 --- a/boards/xtensa/esp32/ttgo_t_display_esp32/src/ttgo_t_display_esp32.h +++ b/boards/xtensa/esp32/ttgo_t_display_esp32/src/ttgo_t_display_esp32.h @@ -87,9 +87,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32_bringup(void); diff --git a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/Make.defs b/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/Make.defs index e867d1ee64b..ce30c47112a 100644 --- a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/Make.defs +++ b/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32s2_boot.c esp32s2_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32s2_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s2_reset.c endif -endif ifeq ($(CONFIG_DEV_GPIO),y) CSRCS += esp32s2_gpio.c diff --git a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2-kaluga-1.h b/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2-kaluga-1.h index bc8eb010f03..ac9917331f2 100644 --- a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2-kaluga-1.h +++ b/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2-kaluga-1.h @@ -87,9 +87,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s2_bringup(void); diff --git a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_appinit.c b/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_appinit.c deleted file mode 100644 index 9803c1f2722..00000000000 --- a/boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s2/esp32s2-kaluga-1/src/esp32s2_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 - -#include -#include - -#include "esp32s2-kaluga-1.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s2_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/Make.defs b/boards/xtensa/esp32s2/esp32s2-saola-1/src/Make.defs index d75e972c568..172483bf26d 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/Make.defs +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32s2_boot.c esp32s2_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32s2_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s2_reset.c endif -endif ifeq ($(CONFIG_DEV_GPIO),y) CSRCS += esp32s2_gpio.c diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h index e242ba00af2..c9ff483eaea 100644 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h +++ b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2-saola-1.h @@ -89,9 +89,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s2_bringup(void); diff --git a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_appinit.c b/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_appinit.c deleted file mode 100644 index 7f51a08c14d..00000000000 --- a/boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s2/esp32s2-saola-1/src/esp32s2_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 - -#include -#include - -#include "esp32s2-saola-1.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s2_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s2/franzininho-wifi/src/Make.defs b/boards/xtensa/esp32s2/franzininho-wifi/src/Make.defs index c57cd6166eb..e42bf4af75a 100644 --- a/boards/xtensa/esp32s2/franzininho-wifi/src/Make.defs +++ b/boards/xtensa/esp32s2/franzininho-wifi/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32s2_boot.c esp32s2_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32s2_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s2_reset.c endif -endif ifeq ($(CONFIG_ONESHOT),y) CSRCS += esp32s2_oneshot.c diff --git a/boards/xtensa/esp32s2/franzininho-wifi/src/esp32s2_appinit.c b/boards/xtensa/esp32s2/franzininho-wifi/src/esp32s2_appinit.c deleted file mode 100644 index 4825f4c6266..00000000000 --- a/boards/xtensa/esp32s2/franzininho-wifi/src/esp32s2_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s2/franzininho-wifi/src/esp32s2_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 - -#include -#include - -#include "franzininho-wifi.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s2_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s2/franzininho-wifi/src/franzininho-wifi.h b/boards/xtensa/esp32s2/franzininho-wifi/src/franzininho-wifi.h index ca4323f41b9..dbc8d7daccb 100644 --- a/boards/xtensa/esp32s2/franzininho-wifi/src/franzininho-wifi.h +++ b/boards/xtensa/esp32s2/franzininho-wifi/src/franzininho-wifi.h @@ -74,9 +74,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s2_bringup(void); diff --git a/boards/xtensa/esp32s3/common/src/esp32s3_usbmsc.c b/boards/xtensa/esp32s3/common/src/esp32s3_usbmsc.c index a008e9216d0..b980764b318 100644 --- a/boards/xtensa/esp32s3/common/src/esp32s3_usbmsc.c +++ b/boards/xtensa/esp32s3/common/src/esp32s3_usbmsc.c @@ -53,10 +53,5 @@ int board_usbmsc_initialize(int port) { - /* If system/usbmsc is built as an NSH command, then SD slot should - * already have been initialized in board_app_initialize() - * In this case, there is nothing further to be done here. - */ - return OK; } diff --git a/boards/xtensa/esp32s3/esp32s3-8048S043/src/Make.defs b/boards/xtensa/esp32s3/esp32s3-8048S043/src/Make.defs index 7d7e93e7e67..03ac82e811b 100644 --- a/boards/xtensa/esp32s3/esp32s3-8048S043/src/Make.defs +++ b/boards/xtensa/esp32s3/esp32s3-8048S043/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32s3_boot.c esp32s3_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32s3_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s3_reset.c endif -endif ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += esp32s3_buttons.c diff --git a/boards/xtensa/esp32s3/esp32s3-8048S043/src/esp32s3-8048S043.h b/boards/xtensa/esp32s3/esp32s3-8048S043/src/esp32s3-8048S043.h index 43364f0833e..22ff2c668a5 100644 --- a/boards/xtensa/esp32s3/esp32s3-8048S043/src/esp32s3-8048S043.h +++ b/boards/xtensa/esp32s3/esp32s3-8048S043/src/esp32s3-8048S043.h @@ -77,9 +77,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s3_bringup(void); @@ -165,4 +162,4 @@ int board_lcd_initialize(void); #endif #endif /* __ASSEMBLY__ */ -#endif /* __BOARDS_XTENSA_ESP32S3_ESP32S3_8048S043_SRC_ESP32S3_8048S043_H */ \ No newline at end of file +#endif /* __BOARDS_XTENSA_ESP32S3_ESP32S3_8048S043_SRC_ESP32S3_8048S043_H */ diff --git a/boards/xtensa/esp32s3/esp32s3-8048S043/src/esp32s3_appinit.c b/boards/xtensa/esp32s3/esp32s3-8048S043/src/esp32s3_appinit.c deleted file mode 100644 index 2140a4f17a1..00000000000 --- a/boards/xtensa/esp32s3/esp32s3-8048S043/src/esp32s3_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s3/esp32s3-8048S043/src/esp32s3_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 - -#include -#include - -#include "esp32s3-8048S043.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s3_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s3/esp32s3-box/src/Make.defs b/boards/xtensa/esp32s3/esp32s3-box/src/Make.defs index ecf6e87dee8..4e4fff8857e 100644 --- a/boards/xtensa/esp32s3/esp32s3-box/src/Make.defs +++ b/boards/xtensa/esp32s3/esp32s3-box/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32s3_boot.c esp32s3_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32s3_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s3_reset.c endif -endif ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += esp32s3_buttons.c diff --git a/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3-box.h b/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3-box.h index 1ff4ef5d98b..f44e466acc5 100644 --- a/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3-box.h +++ b/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3-box.h @@ -101,9 +101,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s3_bringup(void); diff --git a/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_appinit.c b/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_appinit.c deleted file mode 100644 index b053b74d6ad..00000000000 --- a/boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s3/esp32s3-box/src/esp32s3_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 - -#include -#include - -#include "esp32s3-box.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s3_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/Make.defs b/boards/xtensa/esp32s3/esp32s3-devkit/src/Make.defs index 65e5a421f3e..496bb5d4323 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/src/Make.defs +++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32s3_boot.c esp32s3_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32s3_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s3_reset.c endif -endif ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += esp32s3_buttons.c diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3-devkit.h b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3-devkit.h index 215722a6b65..d08c982b78a 100644 --- a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3-devkit.h +++ b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3-devkit.h @@ -89,9 +89,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s3_bringup(void); diff --git a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_appinit.c b/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_appinit.c deleted file mode 100644 index f95282cf3b1..00000000000 --- a/boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s3/esp32s3-devkit/src/esp32s3_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 - -#include -#include - -#include "esp32s3-devkit.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s3_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s3/esp32s3-eye/src/Make.defs b/boards/xtensa/esp32s3/esp32s3-eye/src/Make.defs index 8bb59118672..2857f334049 100644 --- a/boards/xtensa/esp32s3/esp32s3-eye/src/Make.defs +++ b/boards/xtensa/esp32s3/esp32s3-eye/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32s3_boot.c esp32s3_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32s3_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s3_reset.c endif -endif ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += esp32s3_buttons.c diff --git a/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3-eye.h b/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3-eye.h index 0be1fd2dfdb..3005a0bb383 100644 --- a/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3-eye.h +++ b/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3-eye.h @@ -69,9 +69,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s3_bringup(void); diff --git a/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_appinit.c b/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_appinit.c deleted file mode 100644 index c582f0959c1..00000000000 --- a/boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s3/esp32s3-eye/src/esp32s3_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 - -#include -#include - -#include "esp32s3-eye.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s3_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/src/Make.defs b/boards/xtensa/esp32s3/esp32s3-korvo-2/src/Make.defs index c94f85d79e0..1f1d7b1103c 100644 --- a/boards/xtensa/esp32s3/esp32s3-korvo-2/src/Make.defs +++ b/boards/xtensa/esp32s3/esp32s3-korvo-2/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32s3_boot.c esp32s3_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32s3_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s3_reset.c endif -endif ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += esp32s3_buttons.c diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3-korvo-2.h b/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3-korvo-2.h index 9b1ce39e1e1..e5e4aa9955d 100644 --- a/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3-korvo-2.h +++ b/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3-korvo-2.h @@ -73,9 +73,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s3_bringup(void); diff --git a/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_appinit.c b/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_appinit.c deleted file mode 100644 index 38b1224d30e..00000000000 --- a/boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s3/esp32s3-korvo-2/src/esp32s3_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 - -#include -#include - -#include "esp32s3-korvo-2.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s3_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/Make.defs b/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/Make.defs index f98a5fed354..ebdce620fcf 100644 --- a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/Make.defs +++ b/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32s3_boot.c esp32s3_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32s3_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s3_reset.c endif -endif ifeq ($(CONFIG_ARCH_BUTTONS),y) CSRCS += esp32s3_buttons.c diff --git a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3-lcd-ev.h b/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3-lcd-ev.h index c2347cd3502..3967fc53d4f 100644 --- a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3-lcd-ev.h +++ b/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3-lcd-ev.h @@ -73,9 +73,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s3_bringup(void); diff --git a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_appinit.c b/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_appinit.c deleted file mode 100644 index 86ff333d464..00000000000 --- a/boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s3/esp32s3-lcd-ev/src/esp32s3_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 - -#include -#include - -#include "esp32s3-lcd-ev.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s3_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s3/esp32s3-lhcbit/src/Make.defs b/boards/xtensa/esp32s3/esp32s3-lhcbit/src/Make.defs index 1aa31c3d291..e7879dee49d 100644 --- a/boards/xtensa/esp32s3/esp32s3-lhcbit/src/Make.defs +++ b/boards/xtensa/esp32s3/esp32s3-lhcbit/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32s3_boot.c esp32s3_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32s3_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s3_reset.c endif -endif DEPPATH += --dep-path board VPATH += :board diff --git a/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3-lhcbit.h b/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3-lhcbit.h index a91556c9b09..1c1e85bc741 100644 --- a/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3-lhcbit.h +++ b/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3-lhcbit.h @@ -58,9 +58,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s3_bringup(void); diff --git a/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3_appinit.c b/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3_appinit.c deleted file mode 100644 index 0501ee68863..00000000000 --- a/boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s3/esp32s3-lhcbit/src/esp32s3_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 - -#include -#include - -#include "esp32s3-lhcbit.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s3_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s3/esp32s3-meadow/src/Make.defs b/boards/xtensa/esp32s3/esp32s3-meadow/src/Make.defs index bdcb207ae1a..5553ea6721c 100644 --- a/boards/xtensa/esp32s3/esp32s3-meadow/src/Make.defs +++ b/boards/xtensa/esp32s3/esp32s3-meadow/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32s3_boot.c esp32s3_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32s3_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s3_reset.c endif -endif DEPPATH += --dep-path board VPATH += :board diff --git a/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3-meadow.h b/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3-meadow.h index d2bcaeda7c5..48b48407047 100644 --- a/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3-meadow.h +++ b/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3-meadow.h @@ -58,9 +58,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s3_bringup(void); diff --git a/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3_appinit.c b/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3_appinit.c deleted file mode 100644 index b99776d8f6e..00000000000 --- a/boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s3/esp32s3-meadow/src/esp32s3_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 - -#include -#include - -#include "esp32s3-meadow.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s3_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s3/esp32s3-ws-lcd128/configs/notouch-lvgl/defconfig b/boards/xtensa/esp32s3/esp32s3-ws-lcd128/configs/notouch-lvgl/defconfig index 8cebfe09440..d1168981e55 100644 --- a/boards/xtensa/esp32s3/esp32s3-ws-lcd128/configs/notouch-lvgl/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-ws-lcd128/configs/notouch-lvgl/defconfig @@ -21,7 +21,6 @@ CONFIG_ARCH_NUSER_INTERRUPTS=2 CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_XTENSA=y CONFIG_BOARD_INITTHREAD_STACKSIZE=8192 -CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y diff --git a/boards/xtensa/esp32s3/esp32s3-ws-lcd128/configs/touch-lvgl/defconfig b/boards/xtensa/esp32s3/esp32s3-ws-lcd128/configs/touch-lvgl/defconfig index a81c3338a5a..82ea889a367 100644 --- a/boards/xtensa/esp32s3/esp32s3-ws-lcd128/configs/touch-lvgl/defconfig +++ b/boards/xtensa/esp32s3/esp32s3-ws-lcd128/configs/touch-lvgl/defconfig @@ -22,7 +22,6 @@ CONFIG_ARCH_NUSER_INTERRUPTS=2 CONFIG_ARCH_STACKDUMP=y CONFIG_ARCH_XTENSA=y CONFIG_BOARD_INITTHREAD_STACKSIZE=8192 -CONFIG_BOARD_LATE_INITIALIZE=y CONFIG_BOARD_LOOPSPERMSEC=16717 CONFIG_BUILTIN=y CONFIG_DEBUG_FULLOPT=y diff --git a/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/Make.defs b/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/Make.defs index a8b6eb27f16..a6443c18e3a 100644 --- a/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/Make.defs +++ b/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/Make.defs @@ -23,7 +23,6 @@ CSRCS = esp32s3_boot.c esp32s3_bringup.c ifeq ($(CONFIG_BOARDCTL),y) - CSRCS += esp32s3_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s3_reset.c endif diff --git a/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/esp32s3-ws-lcd128.h b/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/esp32s3-ws-lcd128.h index e99534fea82..41396ad1281 100644 --- a/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/esp32s3-ws-lcd128.h +++ b/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/esp32s3-ws-lcd128.h @@ -97,12 +97,6 @@ * Description: * Perform architecture-specific initialization * - * CONFIG_BOARD_LATE_INITIALIZE=y : - * Called from board_late_initialize(). - * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s3_bringup(void); diff --git a/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/esp32s3_appinit.c b/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/esp32s3_appinit.c deleted file mode 100644 index 6ec0a750d94..00000000000 --- a/boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/esp32s3_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s3/esp32s3-ws-lcd128/src/esp32s3_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 - -#include -#include - -#include "esp32s3-ws-lcd128.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s3_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s3/esp32s3-xiao/src/Make.defs b/boards/xtensa/esp32s3/esp32s3-xiao/src/Make.defs index cd086ae4c5f..05bf52fb187 100644 --- a/boards/xtensa/esp32s3/esp32s3-xiao/src/Make.defs +++ b/boards/xtensa/esp32s3/esp32s3-xiao/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32s3_boot.c esp32s3_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32s3_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s3_reset.c endif -endif ifeq ($(CONFIG_ARCH_LEDS),y) CSRCS += esp32s3_autoleds.c diff --git a/boards/xtensa/esp32s3/esp32s3-xiao/src/esp32s3-xiao.h b/boards/xtensa/esp32s3/esp32s3-xiao/src/esp32s3-xiao.h index d51784cea24..eed55595c00 100644 --- a/boards/xtensa/esp32s3/esp32s3-xiao/src/esp32s3-xiao.h +++ b/boards/xtensa/esp32s3/esp32s3-xiao/src/esp32s3-xiao.h @@ -58,9 +58,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s3_bringup(void); diff --git a/boards/xtensa/esp32s3/esp32s3-xiao/src/esp32s3_appinit.c b/boards/xtensa/esp32s3/esp32s3-xiao/src/esp32s3_appinit.c deleted file mode 100644 index a8f0482be95..00000000000 --- a/boards/xtensa/esp32s3/esp32s3-xiao/src/esp32s3_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s3/esp32s3-xiao/src/esp32s3_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 - -#include -#include - -#include "esp32s3-xiao.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s3_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */ diff --git a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/Make.defs b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/Make.defs index 8c0dace9727..69ec9e3727b 100644 --- a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/Make.defs +++ b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/Make.defs @@ -22,12 +22,9 @@ CSRCS = esp32s3_boot.c esp32s3_bringup.c -ifeq ($(CONFIG_BOARDCTL),y) -CSRCS += esp32s3_appinit.c ifeq ($(CONFIG_BOARDCTL_RESET),y) CSRCS += esp32s3_reset.c endif -endif ifeq ($(CONFIG_ESP32S3_SPI),y) CSRCS += esp32s3_board_spi.c diff --git a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3-szpi.h b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3-szpi.h index 544c15586f0..859ee6b93dd 100644 --- a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3-szpi.h +++ b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3-szpi.h @@ -76,9 +76,6 @@ * CONFIG_BOARD_LATE_INITIALIZE=y : * Called from board_late_initialize(). * - * CONFIG_BOARD_LATE_INITIALIZE=y && CONFIG_BOARDCTL=y : - * Called from the NSH library via board_app_initialize() - * ****************************************************************************/ int esp32s3_bringup(void); diff --git a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_appinit.c b/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_appinit.c deleted file mode 100644 index 1d358128664..00000000000 --- a/boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_appinit.c +++ /dev/null @@ -1,82 +0,0 @@ -/**************************************************************************** - * boards/xtensa/esp32s3/lckfb-szpi-esp32s3/src/esp32s3_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 - -#include -#include - -#include "esp32s3-szpi.h" - -#ifdef CONFIG_BOARDCTL - -/**************************************************************************** - * Pre-processor Definitions - ****************************************************************************/ - -/**************************************************************************** - * 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 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) -{ -#ifdef CONFIG_BOARD_LATE_INITIALIZE - /* Board initialization already performed by board_late_initialize() */ - - return OK; -#else - /* Perform board-specific initialization */ - - return esp32s3_bringup(); -#endif -} - -#endif /* CONFIG_BOARDCTL */