nrfconnect · nordicjm · Jan 10, 2024 · Dec 8, 2023 · Nov 3, 2023 · Oct 31, 2023
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2018 Nordic Semiconductor
+# Copyright (c) 2018-2023 Nordic Semiconductor
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
@@ -28,6 +28,12 @@ endif # BUILD_WITH_TFM
 
 menu "Nordic nRF Connect"
 
+# Hides child parent configuration options
+config HIDE_CHILD_PARENT_CONFIG
+	bool
+	default y if "$(HIDE_CHILD_PARENT_CONFIG)" = "True"
+	default n
+
 # Override boot banner
 config BOOT_BANNER_STRING
 	default "Booting nRF Connect SDK"

@@ -21,7 +21,9 @@ config ASSET_TRACKER_V2_APP_VERSION_MAX_LEN
 
 config ASSET_TRACKER_V2_LTO
 	bool "Enable link time optimization"
-	default y if SIZE_OPTIMIZATIONS
+	default y if (SIZE_OPTIMIZATIONS && !NATIVE_LIBRARY)
+	# not for NATIVE_LIBRARY as otherwise the native simulator build will produce a warning when
+	# mixing lto and non lto code causing twister runs to fail
 	help
 	  Compile the Asset Tracker application code with link time optimization enabled. This
 	  option is only applied for the application code and not the libraries and external modules

@@ -57,7 +57,7 @@ CONFIG_SENSOR_MODULE=n
 CONFIG_MODEM_MODULE=n
 CONFIG_UI_MODULE=n
 
-# Running the application in native_posix emulator requires functionality
+# Running the application in native_sim emulator requires functionality
 # that is present in the debug module
 CONFIG_DEBUG_MODULE=y
 

@@ -104,16 +104,9 @@ The application provides predefined configuration files for typical use cases.
 
 Following are the available configuration files:
 
-* :file:`prj.conf` - Configuration file common for ``nrf9161dk_nrf9161_ns``, ``thingy91_nrf9160_ns``, and ``nrf9160dk_nrf9160_ns`` build targets.
-* :file:`prj_qemu_x86.conf` - Configuration file common for ``qemu_x86`` build target.
-* :file:`prj_native_posix.conf` - Configuration file common for ``native_posix`` build target.
-* :file:`boards/nrf9161dk_nrf9161_ns.conf` - Configuration file specific for nRF9161 DK.
-  This file is automatically merged with the :file:`prj.conf` file when you build for the ``nrf9161dk_nrf9161_ns`` build target.
-* :file:`boards/thingy91_nrf9160_ns.conf` - Configuration file specific for Thingy:91.
-  This file is automatically merged with the :file:`prj.conf` file when you build for the ``thingy91_nrf9160_ns`` build target.
-* :file:`boards/nrf9160dk_nrf9160_ns.conf` - Configuration file specific for nRF9160 DK.
-  This file is automatically merged with the :file:`prj.conf` file when you build for the ``nrf9160dk_nrf9160_ns`` build target.
-* :file:`boards/<BOARD>/led_state_def.h` - Header file that describes the LED behavior of the CAF LEDs module.
+* :file:`prj.conf` - Configuration file for all build targets.
+* :file:`boards/<BOARD>.conf` - Configuration overlay file specific for <BOARD>.
+  This file is automatically merged with the :file:`prj.conf` file when you build for that target.
 
 Overlay configurations files that enable specific features:
 
@@ -134,6 +127,8 @@ Custom DTC overlay file for enabling a specific feature:
 
 Multiple overlay files can be included to enable multiple features at the same time.
 
+Header file that describes the LED behavior of the CAF LEDs module: file:`include/<BOARD>/led_state_def.h`.
+
 .. note::
 
    Generally, Kconfig overlays have an ``overlay-`` prefix and a :file:`.conf` extension.

@@ -30,11 +30,11 @@ Running unit tests using West
 
 Enter the following west commands to execute the tests on different board targets:
 
-* :ref:`zephyr:native_posix` board target:
+* :ref:`zephyr:native_sim` board target:
 
 .. code-block:: console
 
-   west build -b native_posix -t run
+   west build -b native_sim -t run
 
 * ``qemu_cortex_m3`` board target:
 
@@ -47,7 +47,7 @@ Running unit tests using Twister
 
 Enter the following twister commands to execute the tests on different board targets:
 
-* On both :ref:`zephyr:native_posix` and ``qemu_cortex_m3`` board targets:
+* On both :ref:`zephyr:native_sim` and ``qemu_cortex_m3`` board targets:
 
 .. code-block:: console
 

@@ -4,11 +4,11 @@ tests:
   applications.asset_tracker_v2.nrf_cloud:
     build_only: true
     build_on_all: true
-    platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns thingy91_nrf9160_ns native_posix
+    platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns thingy91_nrf9160_ns native_sim
     integration_platforms:
       - nrf9160dk_nrf9160_ns
       - thingy91_nrf9160_ns
-      - native_posix
+      - native_sim
     tags: ci_build
   applications.asset_tracker_v2.nrf_cloud.sysbuild:
     build_only: true
@@ -60,11 +60,11 @@ tests:
   applications.asset_tracker_v2.aws:
     build_only: true
     build_on_all: true
-    platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns thingy91_nrf9160_ns native_posix
+    platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns thingy91_nrf9160_ns native_sim
     integration_platforms:
       - nrf9160dk_nrf9160_ns
       - thingy91_nrf9160_ns
-      - native_posix
+      - native_sim
     extra_configs:
       - CONFIG_AWS_IOT_BROKER_HOST_NAME="example-hostname.aws.com"
     extra_args: EXTRA_CONF_FILE="overlay-aws.conf"
@@ -134,11 +134,11 @@ tests:
   applications.asset_tracker_v2.azure:
     build_only: true
     build_on_all: true
-    platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns thingy91_nrf9160_ns native_posix
+    platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns thingy91_nrf9160_ns native_sim
     integration_platforms:
       - nrf9160dk_nrf9160_ns
       - thingy91_nrf9160_ns
-      - native_posix
+      - native_sim
     extra_configs:
       - CONFIG_AZURE_IOT_HUB_DPS_HOSTNAME="global.azure-devices-provisioning.net"
       - CONFIG_AZURE_IOT_HUB_DPS_ID_SCOPE="IDSCOPE"
@@ -160,11 +160,11 @@ tests:
   applications.asset_tracker_v2.debug:
     build_only: true
     build_on_all: true
-    platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns thingy91_nrf9160_ns native_posix
+    platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns thingy91_nrf9160_ns native_sim
     integration_platforms:
       - nrf9160dk_nrf9160_ns
       - thingy91_nrf9160_ns
-      - native_posix
+      - native_sim
     extra_args: EXTRA_CONF_FILE=overlay-debug.conf
     tags: ci_build
   applications.asset_tracker_v2.debug.sysbuild:

@@ -1,8 +1,8 @@
 tests:
   asset_tracker_v2.debug_module_test.tester:
-    platform_allow: native_posix qemu_cortex_m3 nrf9160dk_nrf9160_ns
+    platform_allow: native_sim qemu_cortex_m3 nrf9160dk_nrf9160_ns
     integration_platforms:
-      - native_posix
+      - native_sim
       - qemu_cortex_m3
       - nrf9160dk_nrf9160_ns
     tags: debug_module
@@ -1,18 +1,18 @@
 tests:
   applications.asset_tracker_v2.cloud.cloud_codec.json_common.aws:
-    platform_allow: nrf9160dk_nrf9160 native_posix qemu_cortex_m3
+    platform_allow: nrf9160dk_nrf9160 native_sim qemu_cortex_m3
     integration_platforms:
       - nrf9160dk_nrf9160
-      - native_posix
+      - native_sim
       - qemu_cortex_m3
     tags: json_common_test-aws
     extra_configs:
       - CONFIG_CLOUD_CODEC_AWS_IOT=y
   applications.asset_tracker_v2.cloud.cloud_codec.json_common.azure:
-    platform_allow: nrf9160dk_nrf9160 native_posix qemu_cortex_m3
+    platform_allow: nrf9160dk_nrf9160 native_sim qemu_cortex_m3
     integration_platforms:
       - nrf9160dk_nrf9160
-      - native_posix
+      - native_sim
       - qemu_cortex_m3
     tags: json_common_test-azure
     extra_configs:

@@ -1,8 +1,8 @@
 tests:
   asset_tracker_v2.location_module_test.tester:
-    platform_allow: native_posix qemu_cortex_m3 nrf9160dk_nrf9160_ns
+    platform_allow: native_sim qemu_cortex_m3 nrf9160dk_nrf9160_ns
     integration_platforms:
-      - native_posix
+      - native_sim
       - qemu_cortex_m3
       - nrf9160dk_nrf9160_ns
     tags: location_module
@@ -1,8 +1,8 @@
 tests:
   asset_tracker_v2.lwm2m_codec:
-    platform_allow: native_posix qemu_cortex_m3 nrf9160dk_nrf9160_ns
+    platform_allow: native_sim qemu_cortex_m3 nrf9160dk_nrf9160_ns
     integration_platforms:
-      - native_posix
+      - native_sim
       - qemu_cortex_m3
       - nrf9160dk_nrf9160_ns
     tags: lwm2m_codec
@@ -1,8 +1,8 @@
 tests:
   asset_tracker_v2.lwm2m_integration:
-    platform_allow: native_posix qemu_cortex_m3 nrf9160dk_nrf9160_ns
+    platform_allow: native_sim qemu_cortex_m3 nrf9160dk_nrf9160_ns
     integration_platforms:
-      - native_posix
+      - native_sim
       - qemu_cortex_m3
       - nrf9160dk_nrf9160_ns
     tags: lwm2m_integration
@@ -1,8 +1,8 @@
 tests:
   asset_tracker_v2.nrf_cloud_codec_test:
-    platform_allow: native_posix qemu_cortex_m3 nrf9160dk_nrf9160_ns
+    platform_allow: native_sim qemu_cortex_m3 nrf9160dk_nrf9160_ns
     integration_platforms:
-      - native_posix
+      - native_sim
       - qemu_cortex_m3
       - nrf9160dk_nrf9160_ns
     tags: nrf_cloud_codec
@@ -1,7 +1,7 @@
 tests:
   asset_tracker_v2.nrf_cloud_codec_mocked_cjson_test:
-    platform_allow: native_posix qemu_cortex_m3
+    platform_allow: native_sim qemu_cortex_m3
     integration_platforms:
-      - native_posix
+      - native_sim
       - qemu_cortex_m3
     tags: nrf_cloud_codec_mocked_cJSON
@@ -1,8 +1,8 @@
 tests:
   asset_tracker_v2.ui_module_test.tester:
-    platform_allow: native_posix qemu_cortex_m3 nrf9160dk_nrf9160_ns
+    platform_allow: native_sim qemu_cortex_m3 nrf9160dk_nrf9160_ns
     integration_platforms:
-      - native_posix
+      - native_sim
       - qemu_cortex_m3
       - nrf9160dk_nrf9160_ns
     tags: ui_module
@@ -24,6 +24,13 @@
 };
 
 / {
+	ramdisk0 {
+		compatible = "zephyr,ram-disk";
+		disk-name = "RAM";
+		sector-size = <512>;
+		sector-count = <128>;
+	};
+
 	chosen {
 		zephyr,console = &rtt0;
 		zephyr,shell-uart = &rtt0;

@@ -29,7 +29,6 @@ CONFIG_USB_CDC_ACM_RINGBUF_SIZE=16384
 # Disk and file system
 CONFIG_DISK_ACCESS=y
 CONFIG_DISK_DRIVER_RAM=y
-CONFIG_DISK_RAM_VOLUME_SIZE=64
 CONFIG_FILE_SYSTEM=y
 CONFIG_FAT_FILESYSTEM_ELM=y
 CONFIG_FS_FATFS_LFN=y

@@ -14,7 +14,7 @@
  */
 
 #include <string.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 
 #include <app_event_manager.h>
 #include <app_event_manager_profiler_tracer.h>

@@ -14,7 +14,7 @@
  */
 
 #include <string.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 
 #include <app_event_manager.h>
 #include <app_event_manager_profiler_tracer.h>

@@ -14,7 +14,7 @@
  */
 
 #include <string.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 
 #include <app_event_manager.h>
 #include <app_event_manager_profiler_tracer.h>

@@ -14,7 +14,7 @@
  */
 
 #include <string.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 
 #include <app_event_manager.h>
 #include <app_event_manager_profiler_tracer.h>

@@ -14,7 +14,7 @@
  */
 
 #include <string.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 
 #include <app_event_manager.h>
 #include <app_event_manager_profiler_tracer.h>

@@ -14,7 +14,7 @@
  */
 
 #include <string.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 
 #include <app_event_manager.h>
 #include <app_event_manager_profiler_tracer.h>

@@ -14,7 +14,7 @@
  */
 
 #include <string.h>
-#include <zephyr/toolchain/common.h>
+#include <zephyr/toolchain.h>
 
 #include <app_event_manager.h>
 #include <app_event_manager_profiler_tracer.h>

@@ -39,6 +39,6 @@ add_subdirectory(src/events)
 add_subdirectory(src/modules)
 add_subdirectory(src/util)
 
-if(CONFIG_BT_RPMSG)
-  assert_exists(hci_rpmsg_CONF_FILE)
+if(CONFIG_BT_HCI_IPC)
+  assert_exists(hci_ipc_CONF_FILE)
 endif()