From 537d460065dfc4ed175e5b59f08750b05682d9d9 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Tue, 9 Jun 2026 11:44:25 +0200 Subject: [PATCH 1/2] nimble/porting: Update example to latest NuttX changes Architecture-specific initialization is no longer required from application code. --- porting/examples/nuttx/main.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/porting/examples/nuttx/main.c b/porting/examples/nuttx/main.c index 2c74122606..440284fb4d 100644 --- a/porting/examples/nuttx/main.c +++ b/porting/examples/nuttx/main.c @@ -73,12 +73,6 @@ int main(int argc, char *argv[]) ble_hci_sock_set_device(atoi(argv[1])); } -#ifndef CONFIG_NSH_ARCHINIT - /* Perform architecture-specific initialization */ - - boardctl(BOARDIOC_INIT, 0); -#endif - #ifndef CONFIG_NSH_NETINIT /* Bring up the network */ From d3493b357c6f68009d890261d53cb464ab805be5 Mon Sep 17 00:00:00 2001 From: Szymon Janc Date: Tue, 9 Jun 2026 11:52:11 +0200 Subject: [PATCH 2/2] ci: Use proper NuttX sample for testing Select example app from NimBLE tree instead of Nuttx upstream. Also properly tune build for PR hash and include upstream NimBLE configuration with sample. This is due to NuttX not following our master branch but selected snapshots/releases with custom configuration. --- .github/workflows/build_ports.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build_ports.yml b/.github/workflows/build_ports.yml index 059a3de18e..20cd0a623e 100644 --- a/.github/workflows/build_ports.yml +++ b/.github/workflows/build_ports.yml @@ -62,5 +62,9 @@ jobs: git clone --depth=1 https://github.com/apache/nuttx.git nuttx-build/nuttx git clone --depth=1 https://github.com/apache/nuttx-apps nuttx-build/apps ./nuttx-build/nuttx/tools/configure.sh -l nrf52840-dk:sdc_nimble - sed -i 's|CONFIG_NIMBLE_REF :=.*|CONFIG_NIMBLE_REF := ${{ github.sha }}|' nuttx-build/apps/wireless/bluetooth/nimble/Makefile + kconfig-tweak --file nuttx-build/nuttx/.config --set-str NIMBLE_REF ${{ github.sha }} + kconfig-tweak --file nuttx-build/nuttx/.config --enable NIMBLE_PORTING_EXAMPLE + echo '#include "../../../../mynewt-nimble/porting/examples/nuttx/include/syscfg/syscfg.h"'\ + >> nuttx-build/apps/wireless/bluetooth/nimble/include/syscfg/syscfg.h + make -C nuttx-build/nuttx olddefconfig make -C nuttx-build/nuttx