Skip to content

Commit 1bc1718

Browse files
nordicjmrlubos
authored andcommitted
samples: nrf5340: Move and rename empty_net_core project
Moves this project to a new folder - multicore, as this (simple) project can be built for many other multi-core CPUs. Also updates sysbuild configuration to use the new folder location Signed-off-by: Jamie McCrae <[email protected]>
1 parent d66e654 commit 1bc1718

File tree

9 files changed

+14
-11
lines changed

9 files changed

+14
-11
lines changed

CODEOWNERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@
429429
/samples/app_event_manager/ @nrfconnect/ncs-si-muffin @nrfconnect/ncs-si-bluebagel
430430
/samples/app_event_manager_profiler_tracer/ @nrfconnect/ncs-si-muffin @nrfconnect/ncs-si-bluebagel
431431
/samples/app_jwt/ @nrfconnect/ncs-modem @ayla-nordicsemi
432+
/samples/basic/ @nrfconnect/ncs-co-build-system
432433
/samples/benchmarks/coremark/ @nrfconnect/ncs-si-muffin
433434
/samples/bluetooth/nrf_auraconfig/ @nrfconnect/ncs-audio
434435
/samples/bluetooth/central_and_peripheral_hr/ @nrfconnect/ncs-si-muffin
@@ -561,6 +562,7 @@
561562
/samples/app_event_manager/*.rst @nrfconnect/ncs-si-muffin-doc @nrfconnect/ncs-si-bluebagel-doc
562563
/samples/app_event_manager_profiler_tracer/*.rst @nrfconnect/ncs-si-muffin-doc
563564
/samples/app_jwt/*.rst @nrfconnect/ncs-modem-doc @ayla-nordicsemi
565+
/samples/basic/empty/*.rst @nrfconnect/ncs-doc-leads
564566
/samples/benchmarks/coremark/*.rst @nrfconnect/ncs-si-muffin-doc
565567
/samples/bluetooth/**/*.rst @nrfconnect/ncs-si-bluebagel-doc @nrfconnect/ncs-si-muffin-doc
566568
/samples/bluetooth/central_and_peripheral_hr/*.rst @nrfconnect/ncs-si-muffin-doc
@@ -648,7 +650,6 @@
648650
/samples/net/coap_client/*.rst @nrfconnect/ncs-iot-oulu-tampere-doc
649651
/samples/nfc/**/*.rst @nrfconnect/ncs-si-muffin-doc
650652
/samples/nrf5340/empty_app_core/*.rst @nrfconnect/ncs-si-muffin-doc
651-
/samples/nrf5340/empty_net_core/*.rst @nrfconnect/ncs-si-bluebagel-doc
652653
/samples/nrf5340/extxip_smp_svr/*.rst @nrfconnect/ncs-eris-doc
653654
/samples/nrf5340/netboot/*.rst @nrfconnect/ncs-eris-doc
654655
/samples/nrf5340/remote_shell/*.rst @nrfconnect/ncs-si-muffin-doc

doc/_utils/redirects.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@
447447
("samples/samples_other", "samples/other"), # Other samples (landing)
448448
("samples/pmic/native/npm1300_fuel_gauge/README", "samples/pmic/native/npm13xx_fuel_gauge/README"),
449449
("samples/pmic/native/npm1300_one_button/README", "samples/pmic/native/npm13xx_one_button/README"),
450+
("samples/nrf5340/empty_network_core/README", "samples/basic/empty/README"),
450451
("libraries/bluetooth_services/index", "libraries/bluetooth/index"), # Changed the folder name libraries/bluetooth_services to libraries/bluetooth to better match the include folder structure
451452
("libraries/bluetooth_services/adv_prov", "libraries/bluetooth/adv_prov"),
452453
("libraries/bluetooth_services/conn_ctx", "libraries/bluetooth/conn_ctx"),

doc/nrf/samples/other.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ This section lists single |NCS| samples for various uses that are not part of ot
2424
../../../samples/ironside_se/*/README
2525
../../../tests/benchmarks/multicore/*/README
2626
../../../samples/zephyr/smp_svr_mini_boot/README
27+
../../../samples/basic/*/README

samples/nrf5340/empty_net_core/CMakeLists.txt renamed to samples/basic/empty/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
cmake_minimum_required(VERSION 3.20.0)
88

99
find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
10-
project(empty_net_core)
10+
project(empty)
1111

1212
target_sources(app PRIVATE src/main.c)

samples/nrf5340/empty_net_core/README.rst renamed to samples/basic/empty/README.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
.. _nrf5340_empty_net_core:
22

3-
nRF5340: Empty firmware for network core
4-
########################################
3+
Empty firmware for multiple core SoCs
4+
#####################################
55

66
.. contents::
77
:local:
88
:depth: 2
99

10-
The sample demonstrates how to generate an empty network core firmware.
11-
The sample is used only by the applications that do not use the network core.
10+
The sample demonstrates how to generate an empty network (or other) core firmware.
11+
The sample is used only by the applications that do not use the other core(s).
1212
In the mentioned case, the empty network core sample is automatically added to build by the :kconfig:option:`SB_CONFIG_NETCORE_EMPTY` sysbuild Kconfig option.
1313

1414
Requirements
@@ -21,7 +21,7 @@ The sample supports the following development kits:
2121
Building and running
2222
********************
2323

24-
.. |sample path| replace:: :file:`samples/nrf5340/empty_net_core`
24+
.. |sample path| replace:: :file:`samples/basic/empty`
2525

2626
.. include:: /includes/build_and_run.txt
2727

File renamed without changes.

samples/nrf5340/empty_net_core/sample.yaml renamed to samples/basic/empty/sample.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
sample:
2-
description: Minimal configuration sample that works as empty netcore image.
3-
name: Empty firmware for network core
2+
description: Minimal configuration sample that works as empty network (or other) core image.
3+
name: Empty firmware for multicore MCUs
44
tests:
5-
sample.nrf5340.empty_net_core.build:
5+
sample.basic.empty:
66
sysbuild: true
77
build_only: true
88
integration_platforms:
File renamed without changes.

sysbuild/Kconfig.netcore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ config NETCORE_IMAGE_NAME
142142

143143
config NETCORE_IMAGE_PATH
144144
string
145-
default "$(ZEPHYR_NRF_MODULE_DIR)/samples/nrf5340/empty_net_core" if NETCORE_EMPTY
145+
default "$(ZEPHYR_NRF_MODULE_DIR)/samples/basic/empty" if NETCORE_EMPTY
146146
default "$(ZEPHYR_BASE)/samples/bluetooth/hci_ipc" if NETCORE_HCI_IPC
147147
default "$(ZEPHYR_NRF_MODULE_DIR)/samples/bluetooth/rpc_host" if NETCORE_RPC_HOST
148148
default "$(ZEPHYR_BASE)/samples/boards/nordic/ieee802154/802154_rpmsg" if NETCORE_802154_RPMSG

0 commit comments

Comments
 (0)