From 8ec79ed7bf0b7bb54de879b9417a5076aa85e4fd Mon Sep 17 00:00:00 2001 From: Matteo Golin Date: Wed, 6 May 2026 16:27:06 -0400 Subject: [PATCH 1/3] boards/esp32p4-function-ev-board: Normalize configuration Normalize configuration following change to NuttX initialization process. Signed-off-by: Matteo Golin --- .../esp32p4/esp32p4-function-ev-board/configs/ethernet/defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/ethernet/defconfig b/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/ethernet/defconfig index 34d313a977c2a..c9e1307c3b090 100644 --- a/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/ethernet/defconfig +++ b/boards/risc-v/esp32p4/esp32p4-function-ev-board/configs/ethernet/defconfig @@ -52,7 +52,6 @@ CONFIG_NET_ICMP_SOCKET=y CONFIG_NET_TCP=y CONFIG_NET_UDP=y CONFIG_NFILE_DESCRIPTORS_PER_BLOCK=6 -CONFIG_NSH_ARCHINIT=y CONFIG_NSH_BUILTIN_APPS=y CONFIG_NSH_DISABLE_LOSMART=y CONFIG_NSH_FILEIOSIZE=512 From 9ab3136091f0b3b47fd67e6ef90724d322705e9a Mon Sep 17 00:00:00 2001 From: Matteo Golin Date: Sat, 2 May 2026 09:08:22 -0400 Subject: [PATCH 2/3] !boards/boardctl: Remove BOARDIOC_INIT BREAKING CHANGE: Remove BOARDIOC_INIT macro now that the interface is removed in favour of CONFIG_BOARD_LATE_INITIALIZE. Quick fix: instead of calling BOARDIOC_INIT from your application, instead enable late initialization to have it performed automatically prior to application entry. If you need custom initialization logic, use the board_final_initialize function and `BOARDIOC_FINALINIT` command instead. Signed-off-by: Matteo Golin --- Documentation/components/nxgraphics/nx.rst | 14 ++----- boards/boardctl.c | 8 ---- include/sys/boardctl.h | 47 +++++++++++----------- 3 files changed, 27 insertions(+), 42 deletions(-) diff --git a/Documentation/components/nxgraphics/nx.rst b/Documentation/components/nxgraphics/nx.rst index 37bdce5a3252e..3cb4955a934d3 100644 --- a/Documentation/components/nxgraphics/nx.rst +++ b/Documentation/components/nxgraphics/nx.rst @@ -21,7 +21,7 @@ features: * **Multi-User Support** NX includes front-end logic to an NX server daemon that can serve multiple NX client threads. The NX sever thread/daemon serializes graphics operations from multiple clients. - + * **Minimal Graphics Toolset** The actual implementation of the graphics operations is performed by common, back-end logic. This back-end supports only a primitive set of graphic and rendering operations. @@ -124,16 +124,10 @@ start this daemon. There are two ways that this can be done: calling the function ``nxmu_start()``. The board startup logic usually resides the ``boards/arch/chip/board/src`` directory. The board startup logic can run automatically during the early system if - ``CONFIG_BOARD_LATE_INITIALIZE`` is defined in the configuration. Or, - the board startup logic can execute under control of the application - by calling :c:func:`boardctl` as: - - .. code-block:: c - - boardctl(BOARDIOC_INIT, arg) + ``CONFIG_BOARD_LATE_INITIALIZE`` is defined in the configuration. - The board initialization logic will run in either case and the simple - call to ``nxmu_start()`` will start the NX server. + The board initialization logic will run and the simple call to + ``nxmu_start()`` will start the NX server. #. The NX server may also be started later by the application via :c:func:`boardctl` as: diff --git a/boards/boardctl.c b/boards/boardctl.c index 31ba2c245caed..3b63ca4d5aef7 100644 --- a/boards/boardctl.c +++ b/boards/boardctl.c @@ -387,14 +387,6 @@ int boardctl(unsigned int cmd, uintptr_t arg) switch (cmd) { - case BOARDIOC_INIT: - { - /* WARNING: deprecated, will be removed */ - - ret = -ENOTTY; - } - break; - #ifdef CONFIG_BOARDCTL_FINALINIT /* CMD: BOARDIOC_FINALINIT * DESCRIPTION: Perform one-time application initialization after diff --git a/include/sys/boardctl.h b/include/sys/boardctl.h index 00716bbcc4c70..7ef05eb31c7f3 100644 --- a/include/sys/boardctl.h +++ b/include/sys/boardctl.h @@ -181,30 +181,29 @@ * DEPENDENCIES: Board logic must provide the board_reset_cause() interface. */ -#define BOARDIOC_INIT _BOARDIOC(0x0001) -#define BOARDIOC_FINALINIT _BOARDIOC(0x0002) -#define BOARDIOC_POWEROFF _BOARDIOC(0x0003) -#define BOARDIOC_RESET _BOARDIOC(0x0004) -#define BOARDIOC_PM_CONTROL _BOARDIOC(0x0005) -#define BOARDIOC_UNIQUEID _BOARDIOC(0x0006) -#define BOARDIOC_MKRD _BOARDIOC(0x0007) -#define BOARDIOC_ROMDISK _BOARDIOC(0x0008) -#define BOARDIOC_APP_SYMTAB _BOARDIOC(0x0009) -#define BOARDIOC_OS_SYMTAB _BOARDIOC(0x000a) -#define BOARDIOC_BUILTINS _BOARDIOC(0x000b) -#define BOARDIOC_USBDEV_CONTROL _BOARDIOC(0x000c) -#define BOARDIOC_NX_START _BOARDIOC(0x000d) -#define BOARDIOC_VNC_START _BOARDIOC(0x000e) -#define BOARDIOC_NXTERM _BOARDIOC(0x000f) -#define BOARDIOC_NXTERM_IOCTL _BOARDIOC(0x0010) -#define BOARDIOC_SPINLOCK _BOARDIOC(0x0011) -#define BOARDIOC_UNIQUEKEY _BOARDIOC(0x0012) -#define BOARDIOC_SWITCH_BOOT _BOARDIOC(0x0013) -#define BOARDIOC_BOOT_IMAGE _BOARDIOC(0x0014) -#define BOARDIOC_RESET_CAUSE _BOARDIOC(0x0015) -#define BOARDIOC_IRQ_AFFINITY _BOARDIOC(0x0016) -#define BOARDIOC_START_CPU _BOARDIOC(0x0017) -#define BOARDIOC_MACADDR _BOARDIOC(0x0018) +#define BOARDIOC_FINALINIT _BOARDIOC(0x0001) +#define BOARDIOC_POWEROFF _BOARDIOC(0x0002) +#define BOARDIOC_RESET _BOARDIOC(0x0003) +#define BOARDIOC_PM_CONTROL _BOARDIOC(0x0004) +#define BOARDIOC_UNIQUEID _BOARDIOC(0x0005) +#define BOARDIOC_MKRD _BOARDIOC(0x0006) +#define BOARDIOC_ROMDISK _BOARDIOC(0x0007) +#define BOARDIOC_APP_SYMTAB _BOARDIOC(0x0008) +#define BOARDIOC_OS_SYMTAB _BOARDIOC(0x0009) +#define BOARDIOC_BUILTINS _BOARDIOC(0x000a) +#define BOARDIOC_USBDEV_CONTROL _BOARDIOC(0x000b) +#define BOARDIOC_NX_START _BOARDIOC(0x000c) +#define BOARDIOC_VNC_START _BOARDIOC(0x000d) +#define BOARDIOC_NXTERM _BOARDIOC(0x000e) +#define BOARDIOC_NXTERM_IOCTL _BOARDIOC(0x000f) +#define BOARDIOC_SPINLOCK _BOARDIOC(0x0010) +#define BOARDIOC_UNIQUEKEY _BOARDIOC(0x0011) +#define BOARDIOC_SWITCH_BOOT _BOARDIOC(0x0012) +#define BOARDIOC_BOOT_IMAGE _BOARDIOC(0x0013) +#define BOARDIOC_RESET_CAUSE _BOARDIOC(0x0014) +#define BOARDIOC_IRQ_AFFINITY _BOARDIOC(0x0015) +#define BOARDIOC_START_CPU _BOARDIOC(0x0016) +#define BOARDIOC_MACADDR _BOARDIOC(0x0017) /* If CONFIG_BOARDCTL_IOCTL=y, then board-specific commands will be support. * In this case, all commands not recognized by boardctl() will be forwarded From 2bd7f656593c9d7d883afcd3e9386ac077a8b868 Mon Sep 17 00:00:00 2001 From: Matteo Golin Date: Wed, 6 May 2026 16:26:31 -0400 Subject: [PATCH 3/3] docs/risc-v: Remove mention of NSH_ARCHINIT Removes mention of NSH_ARCHINIT since this configuration option no longer exists. Signed-off-by: Matteo Golin --- .../platforms/arm/tiva/boards/tm4c123g-launchpad/index.rst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/Documentation/platforms/arm/tiva/boards/tm4c123g-launchpad/index.rst b/Documentation/platforms/arm/tiva/boards/tm4c123g-launchpad/index.rst index 7d9ca13314ce8..adc51b2670459 100644 --- a/Documentation/platforms/arm/tiva/boards/tm4c123g-launchpad/index.rst +++ b/Documentation/platforms/arm/tiva/boards/tm4c123g-launchpad/index.rst @@ -125,12 +125,6 @@ Device Drivers -> Memory Technology Device (MTD) Support CONFIG_AT24XX_SIZE=512 : Specifies the AT 24C512 part CONFIG_AT24XX_ADDR=0x53 : AT24 I2C address -Application Configuration -> NSH Library - -.. code-block:: console - - CONFIG_NSH_ARCHINIT=y : NSH board-initialization - File systems .. code-block:: console