diff --git a/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf b/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf index de88dbd229eb..500ba4225452 100644 --- a/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf +++ b/applications/connectivity_bridge/sysbuild/mcuboot/prj.conf @@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index ead9d77c741c..f19e2762bade 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/applications/machine_learning/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -12,7 +12,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_BT_MAX_CONN=6 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y # Improve debugging experience by disabling reset on fatal error diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf index 3da9ff366580..673b8b98e4d9 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf +++ b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf @@ -5,7 +5,6 @@ # CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y # Improve debugging experience by disabling reset on fatal error diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf index 3da9ff366580..673b8b98e4d9 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf +++ b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns.conf @@ -5,7 +5,6 @@ # CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y # Improve debugging experience by disabling reset on fatal error diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf index 3da9ff366580..673b8b98e4d9 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf +++ b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_ns_rtt.conf @@ -5,7 +5,6 @@ # CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y # Improve debugging experience by disabling reset on fatal error diff --git a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf index 3da9ff366580..673b8b98e4d9 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf +++ b/applications/machine_learning/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet_rtt.conf @@ -5,7 +5,6 @@ # CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y # Improve debugging experience by disabling reset on fatal error diff --git a/applications/machine_learning/sysbuild/ipc_radio/prj.conf b/applications/machine_learning/sysbuild/ipc_radio/prj.conf index 2a081a6896e0..a57e1eccccb2 100644 --- a/applications/machine_learning/sysbuild/ipc_radio/prj.conf +++ b/applications/machine_learning/sysbuild/ipc_radio/prj.conf @@ -16,7 +16,6 @@ CONFIG_BT_HCI_RAW=y CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/applications/machine_learning/sysbuild/mcuboot/prj.conf b/applications/machine_learning/sysbuild/mcuboot/prj.conf index 1bdee3845ce4..49069c128766 100644 --- a/applications/machine_learning/sysbuild/mcuboot/prj.conf +++ b/applications/machine_learning/sysbuild/mcuboot/prj.conf @@ -18,18 +18,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/applications/matter_bridge/sysbuild/ipc_radio/prj.conf b/applications/matter_bridge/sysbuild/ipc_radio/prj.conf index dedd0c2f61a6..f73b695a909a 100644 --- a/applications/matter_bridge/sysbuild/ipc_radio/prj.conf +++ b/applications/matter_bridge/sysbuild/ipc_radio/prj.conf @@ -29,7 +29,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/applications/matter_weather_station/prj.conf b/applications/matter_weather_station/prj.conf index 9a1e8eba45be..20230ea30763 100644 --- a/applications/matter_weather_station/prj.conf +++ b/applications/matter_weather_station/prj.conf @@ -73,10 +73,11 @@ CONFIG_SHELL=y CONFIG_SHELL_LOG_BACKEND=y # Configure USB CDC ACM -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n -CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Matter Weather" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x530D +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Thingy:53 Matter Weather" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x530D CONFIG_UART_LINE_CTRL=y CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51 diff --git a/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf b/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf index cd698e9029a5..92716ca1df9e 100644 --- a/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf +++ b/applications/matter_weather_station/sysbuild/ipc_radio/prj.conf @@ -35,7 +35,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/applications/nrf5340_audio/prj.conf b/applications/nrf5340_audio/prj.conf index 627d25ffa1a1..ec4855ec61a3 100644 --- a/applications/nrf5340_audio/prj.conf +++ b/applications/nrf5340_audio/prj.conf @@ -11,7 +11,6 @@ CONFIG_SAMPLE_RATE_CONVERTER_FILTER_SIMPLE=y # General CONFIG_DEBUG=y -CONFIG_DEBUG_INFO=y CONFIG_ASSERT=y CONFIG_STACK_USAGE=y CONFIG_THREAD_RUNTIME_STATS=y diff --git a/applications/nrf5340_audio/prj_fota.conf b/applications/nrf5340_audio/prj_fota.conf index db5980075acf..13ad6ca274d0 100644 --- a/applications/nrf5340_audio/prj_fota.conf +++ b/applications/nrf5340_audio/prj_fota.conf @@ -12,7 +12,6 @@ CONFIG_SAMPLE_RATE_CONVERTER_FILTER_SIMPLE=y # General CONFIG_DEBUG=y -CONFIG_DEBUG_INFO=y CONFIG_ASSERT=y CONFIG_STACK_USAGE=y CONFIG_THREAD_RUNTIME_STATS=y diff --git a/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf b/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf index ac2e241ee039..fa7c7c8d30c7 100644 --- a/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf +++ b/applications/nrf5340_audio/sysbuild/mcuboot/prj_fota.conf @@ -16,18 +16,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/applications/serial_lte_modem/src/slm_ctrl_pin.c b/applications/serial_lte_modem/src/slm_ctrl_pin.c index 6195199d6c1a..d762bee13ecc 100644 --- a/applications/serial_lte_modem/src/slm_ctrl_pin.c +++ b/applications/serial_lte_modem/src/slm_ctrl_pin.c @@ -99,7 +99,7 @@ static int configure_power_pin_interrupt(gpio_callback_handler_t handler, gpio_f */ err = gpio_pin_interrupt_configure(gpio_dev, pin, GPIO_INT_DISABLE); if (err) { - LOG_ERR("Failed to configure %s (0x%x) on power pin. (%d)", + LOG_ERR("Failed to configure %s (0x%lx) on power pin. (%d)", "interrupt", GPIO_INT_DISABLE, err); } diff --git a/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf b/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf index 1c0a3bc2438f..0820098ad277 100644 --- a/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf +++ b/applications/serial_lte_modem/sysbuild/mcuboot/prj.conf @@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/boards/nordic/nrf54lv10dk/Kconfig.defconfig b/boards/nordic/nrf54lv10dk/Kconfig.defconfig index 2b34c4881afc..f8264c25282e 100644 --- a/boards/nordic/nrf54lv10dk/Kconfig.defconfig +++ b/boards/nordic/nrf54lv10dk/Kconfig.defconfig @@ -5,7 +5,7 @@ DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition -config BT_CTLR +config HAS_BT_CTLR default BT config SOC_NRF54LX_SKIP_GLITCHDETECTOR_DISABLE diff --git a/boards/nordic/nrf7120pdk/Kconfig.defconfig b/boards/nordic/nrf7120pdk/Kconfig.defconfig index 8d0e2a796283..e472f4f0b5cf 100644 --- a/boards/nordic/nrf7120pdk/Kconfig.defconfig +++ b/boards/nordic/nrf7120pdk/Kconfig.defconfig @@ -3,7 +3,7 @@ if BOARD_NRF7120PDK_NRF7120_CPUAPP -config BT_CTLR +config HAS_BT_CTLR default BT config ROM_START_OFFSET @@ -14,7 +14,7 @@ endif # BOARD_NRF7120PDK_NRF7120_CPUAPP if BOARD_NRF7120PDK_NRF7120_CPUAPP_NS -config BT_CTLR +config HAS_BT_CTLR default BT # By default, if we build for a Non-Secure version of the board, diff --git a/boards/nordic/thingy91x/Kconfig.defconfig.nrf5340 b/boards/nordic/thingy91x/Kconfig.defconfig.nrf5340 index d03191722bd4..db0280497a86 100644 --- a/boards/nordic/thingy91x/Kconfig.defconfig.nrf5340 +++ b/boards/nordic/thingy91x/Kconfig.defconfig.nrf5340 @@ -48,9 +48,6 @@ endif # BUILD_WITH_TFM DT_CHOSEN_Z_CODE_PARTITION := zephyr,code-partition DT_CHOSEN_Z_SRAM_PARTITION := zephyr,sram-secure-partition -config NFCT_PINS_AS_GPIOS - default y - if BOARD_THINGY91X_NRF5340_CPUAPP && TRUSTED_EXECUTION_SECURE config FLASH_LOAD_SIZE diff --git a/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dtsi b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dtsi index b2ac367de398..2e9a90b5594a 100644 --- a/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dtsi +++ b/boards/nordic/thingy91x/thingy91x_nrf5340_cpuapp_common.dtsi @@ -129,6 +129,10 @@ pinctrl-names = "default", "sleep"; }; +&uicr { + nfct-pins-as-gpios; +}; + /* Include default memory partition configuration file. */ /* This is not the layout that's actually used! It's overridden by Partition Manager. */ #include diff --git a/drivers/mspi/mspi_sqspi.c b/drivers/mspi/mspi_sqspi.c index 84998fcc8ab1..f349d03e771a 100644 --- a/drivers/mspi/mspi_sqspi.c +++ b/drivers/mspi/mspi_sqspi.c @@ -21,9 +21,6 @@ #include #include #endif -#if defined(CONFIG_SOC_NRF54H20_GPD) -#include -#endif #include LOG_MODULE_REGISTER(mspi_sqspi, CONFIG_MSPI_LOG_LEVEL); @@ -432,13 +429,6 @@ static int dev_pm_action_cb(const struct device *dev, return rc; } -#if defined(CONFIG_SOC_NRF54H20_GPD) - rc = nrf_gpd_retain_pins_set(dev_config->pcfg, false); - if (rc < 0) { - LOG_ERR("Cannot clear RETAIN for pins (%d)", rc); - return rc; - } -#endif nrf_sqspi_activate(&dev_config->sqspi); #if defined(CONFIG_SOC_SERIES_NRF54LX) nrf_memconf_ramblock_ret_enable_set(NRF_MEMCONF, @@ -452,13 +442,6 @@ static int dev_pm_action_cb(const struct device *dev, if (IS_ENABLED(CONFIG_PM_DEVICE) && action == PM_DEVICE_ACTION_SUSPEND) { -#if defined(CONFIG_SOC_NRF54H20_GPD) - rc = nrf_gpd_retain_pins_set(dev_config->pcfg, true); - if (rc < 0) { - LOG_ERR("Cannot set RETAIN for pins (%d)", rc); - return rc; - } -#endif rc = pinctrl_apply_state(dev_config->pcfg, PINCTRL_STATE_SLEEP); if (rc < 0) { diff --git a/modules/memfault-firmware-sdk/memfault_lte_coredump.c b/modules/memfault-firmware-sdk/memfault_lte_coredump.c index afab39903f47..128099626942 100644 --- a/modules/memfault-firmware-sdk/memfault_lte_coredump.c +++ b/modules/memfault-firmware-sdk/memfault_lte_coredump.c @@ -83,17 +83,17 @@ static void schedule_send_backoff(struct fsm_state_object *state_object); /* Forward declarations: State Machine Functions */ static void state_running_entry(void *o); -static void state_running_run(void *o); +static enum smf_state_result state_running_run(void *o); static void state_running_exit(void *o); static void state_waiting_for_nrf_modem_lib_init_entry(void *o); -static void state_waiting_for_nrf_modem_lib_init_run(void *o); -static void state_waiting_for_network_connection_run(void *o); +static enum smf_state_result state_waiting_for_nrf_modem_lib_init_run(void *o); +static enum smf_state_result state_waiting_for_network_connection_run(void *o); static void state_network_connected_entry(void *o); -static void state_network_connected_run(void *o); +static enum smf_state_result state_network_connected_run(void *o); static void state_coredump_send_attempt_entry(void *o); -static void state_coredump_send_attempt_run(void *o); +static enum smf_state_result state_coredump_send_attempt_run(void *o); static void state_coredump_send_backoff_entry(void *o); -static void state_coredump_send_backoff_run(void *o); +static enum smf_state_result state_coredump_send_backoff_run(void *o); static void state_finished_entry(void *o); static void state_error_entry(void *o); @@ -232,7 +232,7 @@ static void state_waiting_for_nrf_modem_lib_init_entry(void *o) state_object->retry_count = 0; } -static void state_waiting_for_nrf_modem_lib_init_run(void *o) +static enum smf_state_result state_waiting_for_nrf_modem_lib_init_run(void *o) { struct fsm_state_object *state_object = o; @@ -240,7 +240,10 @@ static void state_waiting_for_nrf_modem_lib_init_run(void *o) if (state_object->event == EVENT_NRF_MODEM_LIB_INITED) { smf_set_state(SMF_CTX(state_object), &states[STATE_RUNNING]); + return SMF_EVENT_HANDLED; } + + return SMF_EVENT_PROPAGATE; } static void state_running_entry(void *o) @@ -269,7 +272,7 @@ static void state_running_entry(void *o) } } -static void state_running_run(void *o) +static enum smf_state_result state_running_run(void *o) { struct fsm_state_object *state_object = o; @@ -277,9 +280,13 @@ static void state_running_run(void *o) if (state_object->event == EVENT_NRF_MODEM_LIB_SHUTDOWN) { smf_set_state(SMF_CTX(state_object), &states[STATE_WAITING_FOR_NRF_MODEM_LIB_INIT]); + return SMF_EVENT_HANDLED; } else if (state_object->event == EVENT_ERROR) { smf_set_state(SMF_CTX(state_object), &states[STATE_ERROR]); + return SMF_EVENT_HANDLED; } + + return SMF_EVENT_PROPAGATE; } static void state_running_exit(void *o) @@ -307,7 +314,7 @@ static void state_running_exit(void *o) (void)k_work_cancel_delayable(&state_object->backoff_work); } -static void state_waiting_for_network_connection_run(void *o) +static enum smf_state_result state_waiting_for_network_connection_run(void *o) { struct fsm_state_object *state_object = o; @@ -333,7 +340,10 @@ static void state_waiting_for_network_connection_run(void *o) if (state_object->lte_registered && state_object->pdn_active) { smf_set_state(SMF_CTX(state_object), &states[STATE_NETWORK_CONNECTED]); + return SMF_EVENT_HANDLED; } + + return SMF_EVENT_PROPAGATE; } static void state_network_connected_entry(void *o) @@ -345,7 +355,7 @@ static void state_network_connected_entry(void *o) state_object->retry_count = 0; } -static void state_network_connected_run(void *o) +static enum smf_state_result state_network_connected_run(void *o) { struct fsm_state_object *state_object = o; @@ -355,11 +365,15 @@ static void state_network_connected_run(void *o) state_object->lte_registered = false; smf_set_state(SMF_CTX(state_object), &states[STATE_WAITING_FOR_NETWORK_CONNECTION]); + return SMF_EVENT_HANDLED; } else if (state_object->event == EVENT_PDN_DEACTIVATED) { state_object->pdn_active = false; smf_set_state(SMF_CTX(state_object), &states[STATE_WAITING_FOR_NETWORK_CONNECTION]); + return SMF_EVENT_HANDLED; } + + return SMF_EVENT_PROPAGATE; } static void state_coredump_send_attempt_entry(void *o) @@ -399,7 +413,7 @@ static void state_coredump_send_attempt_entry(void *o) } } -static void state_coredump_send_attempt_run(void *o) +static enum smf_state_result state_coredump_send_attempt_run(void *o) { struct fsm_state_object *state_object = o; @@ -407,9 +421,13 @@ static void state_coredump_send_attempt_run(void *o) if (state_object->event == EVENT_COREDUMP_SEND_FAIL) { smf_set_state(SMF_CTX(state_object), &states[STATE_COREDUMP_SEND_BACKOFF]); + return SMF_EVENT_HANDLED; } else if (state_object->event == EVENT_COREDUMP_SEND_SUCCESS) { smf_set_state(SMF_CTX(state_object), &states[STATE_FINISHED]); + return SMF_EVENT_HANDLED; } + + return SMF_EVENT_PROPAGATE; } static void state_coredump_send_backoff_entry(void *o) @@ -421,7 +439,7 @@ static void state_coredump_send_backoff_entry(void *o) schedule_send_backoff(state_object); } -static void state_coredump_send_backoff_run(void *o) +static enum smf_state_result state_coredump_send_backoff_run(void *o) { struct fsm_state_object *state_object = o; @@ -429,7 +447,10 @@ static void state_coredump_send_backoff_run(void *o) if (state_object->event == EVENT_BACKOFF_TIMER_EXPIRED) { smf_set_state(SMF_CTX(state_object), &states[STATE_COREDUMP_SEND_ATTEMPT]); + return SMF_EVENT_HANDLED; } + + return SMF_EVENT_PROPAGATE; } static void state_finished_entry(void *o) diff --git a/samples/bluetooth/central_hr_coded/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/central_hr_coded/sysbuild/ipc_radio/prj.conf index 97c2ce32264a..389ad37e59f8 100644 --- a/samples/bluetooth/central_hr_coded/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/central_hr_coded/sysbuild/ipc_radio/prj.conf @@ -22,7 +22,6 @@ CONFIG_BT_CTLR_PHY_CODED=y CONFIG_BT_EXT_ADV_CODING_SELECTION=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/channel_sounding_ras_initiator/src/main.c b/samples/bluetooth/channel_sounding_ras_initiator/src/main.c index 7f5a5d0265b7..3b27d1715259 100644 --- a/samples/bluetooth/channel_sounding_ras_initiator/src/main.c +++ b/samples/bluetooth/channel_sounding_ras_initiator/src/main.c @@ -648,8 +648,7 @@ int main(void) struct bt_le_cs_create_config_params config_params = { .id = CS_CONFIG_ID, - .main_mode_type = BT_CONN_LE_CS_MAIN_MODE_2, - .sub_mode_type = BT_CONN_LE_CS_SUB_MODE_1, + .mode = BT_CONN_LE_CS_MAIN_MODE_2_SUB_MODE_1, .min_main_mode_steps = 2, .max_main_mode_steps = 5, .main_mode_repetition = 0, diff --git a/samples/bluetooth/direct_test_mode/sysbuild/remote_shell/prj_usb.conf b/samples/bluetooth/direct_test_mode/sysbuild/remote_shell/prj_usb.conf index e4df2db7d0a1..dad566644391 100644 --- a/samples/bluetooth/direct_test_mode/sysbuild/remote_shell/prj_usb.conf +++ b/samples/bluetooth/direct_test_mode/sysbuild/remote_shell/prj_usb.conf @@ -17,10 +17,13 @@ CONFIG_IPC_SERVICE_BACKEND_RPMSG=y CONFIG_HEAP_MEM_POOL_SIZE=4096 -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_PRODUCT="Nordic Remote Shell sample" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x53AA +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Nordic Remote Shell sample" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x53AA +CONFIG_UDC_DRIVER_LOG_LEVEL_ERR=y +CONFIG_USBD_LOG_LEVEL_ERR=y # Config logger CONFIG_LOG=y @@ -28,7 +31,5 @@ CONFIG_LOG_PRINTK=y CONFIG_USE_SEGGER_RTT=y CONFIG_LOG_BACKEND_RTT=y CONFIG_LOG_BACKEND_UART=n -CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y -CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y CONFIG_SOC_NRF53_CPUNET_ENABLE=y diff --git a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf index 494465dd5198..d16ed90f0bf2 100644 --- a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf +++ b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.conf @@ -1,12 +1,5 @@ -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_REMOTE_WAKEUP=n -CONFIG_USB_DEVICE_PRODUCT="LLPM sample console" -CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="LLPM sample console" +CONFIG_LOG=n CONFIG_UART_CONSOLE=y -CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_LINE_CTRL=y - -# Since the default LOG_MODE_MINIMAL is synchronous, it will mess with the USB -# driver/subsys. Use the deferred mode instead. -CONFIG_LOG_MODE_DEFERRED=y diff --git a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.overlay b/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.overlay deleted file mode 100644 index acf3f4a3d20b..000000000000 --- a/samples/bluetooth/llpm/boards/nrf52840dongle_nrf52840.overlay +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2021 Nordic Semiconductor ASA - * - * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause - */ - -/ { - chosen { - zephyr,console = &cdc_acm_uart0; - }; -}; - -&zephyr_udc0 { - cdc_acm_uart0: cdc_acm_uart0 { - compatible = "zephyr,cdc-acm-uart"; - }; -}; diff --git a/samples/bluetooth/llpm/src/main.c b/samples/bluetooth/llpm/src/main.c index 3d321848b45a..559c0f124564 100644 --- a/samples/bluetooth/llpm/src/main.c +++ b/samples/bluetooth/llpm/src/main.c @@ -9,11 +9,7 @@ #include #include -#if defined(CONFIG_USB_DEVICE_STACK) -#include #include -#endif - #include #include #include @@ -426,14 +422,10 @@ int main(void) { int err; -#if defined(CONFIG_USB_DEVICE_STACK) +#if DT_NODE_HAS_COMPAT(DT_CHOSEN(zephyr_console), zephyr_cdc_acm_uart) const struct device *uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_console)); uint32_t dtr = 0; - if (usb_enable(NULL)) { - return 0; - } - /* Poll if the DTR flag was set, optional */ while (!dtr) { uart_line_ctrl_get(uart_dev, UART_LINE_CTRL_DTR, &dtr); diff --git a/samples/bluetooth/llpm/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/llpm/sysbuild/ipc_radio/prj.conf index 0df07621e6db..ac34baa24930 100644 --- a/samples/bluetooth/llpm/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/llpm/sysbuild/ipc_radio/prj.conf @@ -19,7 +19,6 @@ CONFIG_BT_HCI_RAW=y CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/multiple_adv_sets/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/multiple_adv_sets/sysbuild/ipc_radio/prj.conf index f64686af27e1..45b2a9cb2008 100644 --- a/samples/bluetooth/multiple_adv_sets/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/multiple_adv_sets/sysbuild/ipc_radio/prj.conf @@ -20,7 +20,6 @@ CONFIG_BT_CTLR_ADV_SET=2 CONFIG_BT_CTLR_ADV_EXT=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/nrf_auraconfig/prj.conf b/samples/bluetooth/nrf_auraconfig/prj.conf index 39c370ab770a..b15cbed9265e 100644 --- a/samples/bluetooth/nrf_auraconfig/prj.conf +++ b/samples/bluetooth/nrf_auraconfig/prj.conf @@ -7,7 +7,6 @@ # General CONFIG_REBOOT=y CONFIG_DEBUG=y -CONFIG_DEBUG_INFO=y CONFIG_ASSERT=y CONFIG_STACK_USAGE=y CONFIG_THREAD_RUNTIME_STATS=y diff --git a/samples/bluetooth/peripheral_hids_keyboard/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_hids_keyboard/sysbuild/ipc_radio/prj.conf index 80ac771b2a71..a94d5c5ecb73 100644 --- a/samples/bluetooth/peripheral_hids_keyboard/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_hids_keyboard/sysbuild/ipc_radio/prj.conf @@ -20,7 +20,6 @@ CONFIG_BT_MAX_CONN=2 CONFIG_BT_CENTRAL=n CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/peripheral_hr_coded/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_hr_coded/sysbuild/ipc_radio/prj.conf index b288cf3c93a9..bc8c9369809d 100644 --- a/samples/bluetooth/peripheral_hr_coded/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_hr_coded/sysbuild/ipc_radio/prj.conf @@ -5,7 +5,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_BT=y diff --git a/samples/bluetooth/peripheral_mds/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_mds/sysbuild/ipc_radio/prj.conf index 3a956da37281..10fac7b05bdf 100644 --- a/samples/bluetooth/peripheral_mds/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_mds/sysbuild/ipc_radio/prj.conf @@ -24,7 +24,6 @@ CONFIG_BT_BUF_ACL_RX_SIZE=251 CONFIG_BT_MAX_CONN=2 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/peripheral_power_profiling/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_power_profiling/sysbuild/ipc_radio/prj.conf index f09dd696bd0f..9b6ebfafcd66 100644 --- a/samples/bluetooth/peripheral_power_profiling/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_power_profiling/sysbuild/ipc_radio/prj.conf @@ -20,7 +20,6 @@ CONFIG_BT_CTLR_ADV_EXT=y CONFIG_BT_CTLR_PHY_CODED=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf b/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf index f66cb06cdd0b..30ee7ffa8bf4 100644 --- a/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf +++ b/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/boards/thingy53_nrf5340_cpunet.conf @@ -22,7 +22,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251 CONFIG_BT_BUF_ACL_RX_SIZE=502 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/prj.conf index 802ba7cb25ec..83eef015f4f0 100644 --- a/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_status/sysbuild/ipc_radio/prj.conf @@ -17,7 +17,6 @@ CONFIG_BT_MAX_CONN=16 # CONFIG_BT_BUF_CMD_TX_SIZE=255 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf index 41a76acf2081..0ef784231d13 100644 --- a/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf +++ b/samples/bluetooth/peripheral_status/sysbuild/mcuboot/prj.conf @@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/bluetooth/peripheral_uart/prj_cdc.conf b/samples/bluetooth/peripheral_uart/prj_cdc.conf index 858feb5f5d31..3a02a3fc5ba7 100644 --- a/samples/bluetooth/peripheral_uart/prj_cdc.conf +++ b/samples/bluetooth/peripheral_uart/prj_cdc.conf @@ -8,10 +8,10 @@ CONFIG_UART_LINE_CTRL=y CONFIG_UART_INTERRUPT_DRIVEN=y CONFIG_UART_ASYNC_ADAPTER=y -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_REMOTE_WAKEUP=n -CONFIG_USB_CDC_ACM=y -CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y + +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_USBD_CDC_ACM_LOG_LEVEL_OFF=y # Disable the UARTE0 enabled in default project configuration CONFIG_NRFX_UARTE0=n diff --git a/samples/bluetooth/peripheral_uart/src/main.c b/samples/bluetooth/peripheral_uart/src/main.c index 6d9b94226c2e..e9d535c112df 100644 --- a/samples/bluetooth/peripheral_uart/src/main.c +++ b/samples/bluetooth/peripheral_uart/src/main.c @@ -12,7 +12,6 @@ #include #include #include -#include #include #include @@ -243,14 +242,6 @@ static int uart_init(void) return -ENODEV; } - if (IS_ENABLED(CONFIG_USB_DEVICE_STACK)) { - err = usb_enable(NULL); - if (err && (err != -EALREADY)) { - LOG_ERR("Failed to enable USB"); - return err; - } - } - rx = k_malloc(sizeof(*rx)); if (rx) { rx->len = 0; diff --git a/samples/bluetooth/peripheral_with_multiple_identities/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/peripheral_with_multiple_identities/sysbuild/ipc_radio/prj.conf index ab6e84349d84..92a707c20844 100644 --- a/samples/bluetooth/peripheral_with_multiple_identities/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/peripheral_with_multiple_identities/sysbuild/ipc_radio/prj.conf @@ -5,7 +5,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_BT=y diff --git a/samples/bluetooth/scanning_while_connecting/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/scanning_while_connecting/sysbuild/ipc_radio/prj.conf index 538983a5fb9b..1fad06d9b425 100644 --- a/samples/bluetooth/scanning_while_connecting/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/scanning_while_connecting/sysbuild/ipc_radio/prj.conf @@ -5,7 +5,6 @@ CONFIG_HEAP_MEM_POOL_SIZE=8192 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=2048 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_BT=y diff --git a/samples/bluetooth/throughput/sysbuild/ipc_radio/prj.conf b/samples/bluetooth/throughput/sysbuild/ipc_radio/prj.conf index 76b72aa9c3b0..1d9d27ebe1df 100644 --- a/samples/bluetooth/throughput/sysbuild/ipc_radio/prj.conf +++ b/samples/bluetooth/throughput/sysbuild/ipc_radio/prj.conf @@ -25,7 +25,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=502 CONFIG_BT_MAX_CONN=2 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf b/samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf index 137bb57531be..63e9968f7d2c 100644 --- a/samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/ciphersuites/sysbuild/mcuboot/prj.conf @@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/cellular/lte_ble_gateway/prj.conf b/samples/cellular/lte_ble_gateway/prj.conf index bcaf435416bb..f80c0f8a7a23 100644 --- a/samples/cellular/lte_ble_gateway/prj.conf +++ b/samples/cellular/lte_ble_gateway/prj.conf @@ -55,7 +55,6 @@ CONFIG_CONSOLE_GETCHAR=y # Enable Bluetooth stack and libraries CONFIG_BT=y CONFIG_BT_HCI=y -CONFIG_BT_CTLR=n CONFIG_BT_WAIT_NOP=y CONFIG_BT_CENTRAL=y CONFIG_BT_GATT_CLIENT=y diff --git a/samples/cellular/modem_shell/prj.conf b/samples/cellular/modem_shell/prj.conf index 06180293e503..3bda9c750dc8 100644 --- a/samples/cellular/modem_shell/prj.conf +++ b/samples/cellular/modem_shell/prj.conf @@ -159,7 +159,6 @@ CONFIG_ASSERT=y CONFIG_LOG=y # Keep printk() synchronous CONFIG_LOG_PRINTK=n -CONFIG_DEBUG_INFO=y #CONFIG_DEBUG_OPTIMIZATIONS=y #CONFIG_NO_OPTIMIZATIONS=y #CONFIG_FORCE_NO_ASSERT=y diff --git a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf index 41a76acf2081..0ef784231d13 100644 --- a/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/nrf_cloud_multi_service/sysbuild/mcuboot/prj.conf @@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf b/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf index 7515f3cbd3a6..b14f23471808 100644 --- a/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/nrf_cloud_rest_fota/sysbuild/mcuboot/prj.conf @@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf b/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf index bfd2a6e11956..8e13e683be8f 100644 --- a/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf +++ b/samples/cellular/smp_svr/sysbuild/mcuboot/prj.conf @@ -10,18 +10,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/common/mcumgr_bt_ota_dfu/CMakeLists.txt b/samples/common/mcumgr_bt_ota_dfu/CMakeLists.txt index 1ef975a7dd1a..13afc6eb6d77 100644 --- a/samples/common/mcumgr_bt_ota_dfu/CMakeLists.txt +++ b/samples/common/mcumgr_bt_ota_dfu/CMakeLists.txt @@ -6,7 +6,7 @@ if (CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU_VALIDATION) - if (CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU_SPEEDUP AND CONFIG_BT_CTLR) + if (CONFIG_NCS_SAMPLE_MCUMGR_BT_OTA_DFU_SPEEDUP AND CONFIG_HAS_BT_CTLR) if ((NOT (CONFIG_BT_BUF_ACL_TX_SIZE EQUAL 251)) OR (NOT (CONFIG_BT_BUF_ACL_RX_SIZE EQUAL 502)) OR (NOT (CONFIG_BT_CTLR_DATA_LENGTH_MAX EQUAL 251)) diff --git a/samples/dect/dect_phy/dect_shell/prj.conf b/samples/dect/dect_phy/dect_shell/prj.conf index 856c3d22fbd0..94c5e09deee7 100644 --- a/samples/dect/dect_phy/dect_shell/prj.conf +++ b/samples/dect/dect_phy/dect_shell/prj.conf @@ -78,7 +78,6 @@ CONFIG_LOG=y CONFIG_PRINTK=y CONFIG_LOG_PRINTK=n -CONFIG_DEBUG_INFO=y #CONFIG_DEBUG_OPTIMIZATIONS=y #CONFIG_NO_OPTIMIZATIONS=y #CONFIG_FORCE_NO_ASSERT=y diff --git a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index c595604cea21..3e7c776e5a03 100644 --- a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/light_bulb/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index c595604cea21..3e7c776e5a03 100644 --- a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/light_switch/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index c595604cea21..3e7c776e5a03 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf index cc6e788f8684..8db73dce6d00 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf +++ b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet_thread_wifi_switched.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf +++ b/samples/matter/lock/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet_nrf7001.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index 8476b1077adc..d8bd22a3ca1a 100644 --- a/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/manufacturer_specific/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/smoke_co_alarm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/smoke_co_alarm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index 5df075031318..c3fc7b02051a 100644 --- a/samples/matter/smoke_co_alarm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/smoke_co_alarm/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/temperature_sensor/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/temperature_sensor/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index 8476b1077adc..d8bd22a3ca1a 100644 --- a/samples/matter/temperature_sensor/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/temperature_sensor/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index c595604cea21..3e7c776e5a03 100644 --- a/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/template/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/template/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index c595604cea21..3e7c776e5a03 100644 --- a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/thermostat/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf index c595604cea21..3e7c776e5a03 100644 --- a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf +++ b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf5340dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf index 9aa8903ed90d..19f2761ce222 100644 --- a/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf +++ b/samples/matter/window_covering/sysbuild/ipc_radio/boards/nrf7002dk_nrf5340_cpunet.conf @@ -32,7 +32,6 @@ CONFIG_BT_CTLR_PHY_2M=n # Debug and assert configuration CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_RESET_ON_FATAL_ERROR=n CONFIG_REBOOT=n diff --git a/samples/net/aws_iot/sysbuild/mcuboot/prj.conf b/samples/net/aws_iot/sysbuild/mcuboot/prj.conf index fb07827136b9..ca7adf35ff53 100644 --- a/samples/net/aws_iot/sysbuild/mcuboot/prj.conf +++ b/samples/net/aws_iot/sysbuild/mcuboot/prj.conf @@ -18,18 +18,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set # CONFIG_LOG=y diff --git a/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf b/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf index 41a76acf2081..0ef784231d13 100644 --- a/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf +++ b/samples/net/azure_iot_hub/sysbuild/mcuboot/prj.conf @@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/net/https_client/sysbuild/mcuboot/prj.conf b/samples/net/https_client/sysbuild/mcuboot/prj.conf index 137bb57531be..63e9968f7d2c 100644 --- a/samples/net/https_client/sysbuild/mcuboot/prj.conf +++ b/samples/net/https_client/sysbuild/mcuboot/prj.conf @@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/net/mqtt/src/modules/transport/transport.c b/samples/net/mqtt/src/modules/transport/transport.c index 8a76879bb559..68cf5e51ee78 100644 --- a/samples/net/mqtt/src/modules/transport/transport.c +++ b/samples/net/mqtt/src/modules/transport/transport.c @@ -270,7 +270,7 @@ static void disconnected_entry(void *o) } /* Function executed when the module is in the disconnected state. */ -static void disconnected_run(void *o) +static enum smf_state_result disconnected_run(void *o) { struct s_object *user_object = o; @@ -289,6 +289,8 @@ static void disconnected_run(void *o) */ k_work_reschedule_for_queue(&transport_queue, &connect_work, K_SECONDS(5)); } + + return SMF_EVENT_HANDLED; } /* Function executed when the module enters the connected state. */ @@ -309,7 +311,7 @@ static void connected_entry(void *o) } /* Function executed when the module is in the connected state. */ -static void connected_run(void *o) +static enum smf_state_result connected_run(void *o) { struct s_object *user_object = o; @@ -319,14 +321,16 @@ static void connected_run(void *o) * The call to this function will cause on_mqtt_disconnect() to be called. */ (void)mqtt_helper_disconnect(); - return; + return SMF_EVENT_HANDLED; } if (user_object->chan != &PAYLOAD_CHAN) { - return; + return SMF_EVENT_HANDLED; } publish(&user_object->payload); + + return SMF_EVENT_HANDLED; } /* Function executed when the module exits the connected state. */ diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf index 8fb46597374d..d32556bb2253 100644 --- a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf +++ b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj.conf @@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf index 62f90733eb0a..43b45134abe3 100644 --- a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf +++ b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core.conf @@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf index 62f90733eb0a..43b45134abe3 100644 --- a/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf +++ b/samples/nrf5340/extxip_smp_svr/sysbuild/mcuboot/prj_no_network_core_directxip.conf @@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/nrf5340/remote_shell/prj.conf b/samples/nrf5340/remote_shell/prj.conf index d9cc289a4a67..f1be5985c1fa 100644 --- a/samples/nrf5340/remote_shell/prj.conf +++ b/samples/nrf5340/remote_shell/prj.conf @@ -7,15 +7,17 @@ CONFIG_STDOUT_CONSOLE=y -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_PRODUCT="Nordic Remote Shell sample" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x53AA +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Nordic Remote Shell sample" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x53AA CONFIG_LOG=y -CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y -CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y +CONFIG_UDC_DRIVER_LOG_LEVEL_ERR=y +CONFIG_USBD_LOG_LEVEL_ERR=y CONFIG_SERIAL=y CONFIG_UART_INTERRUPT_DRIVEN=y diff --git a/samples/nrf5340/remote_shell/src/main.c b/samples/nrf5340/remote_shell/src/main.c index b7ad0b73cc74..7d238453c538 100644 --- a/samples/nrf5340/remote_shell/src/main.c +++ b/samples/nrf5340/remote_shell/src/main.c @@ -11,7 +11,6 @@ #include #include #include -#include #include "shell_ipc_host.h" @@ -139,14 +138,6 @@ int main(void) return 0; } - if (IS_ENABLED(CONFIG_USB_DEVICE_STACK)) { - err = usb_enable(NULL); - if (err != 0) { - LOG_ERR("Failed to enable USB, err %d", err); - return 0; - } - } - if (IS_ENABLED(CONFIG_UART_LINE_CTRL)) { LOG_INF("Wait for DTR"); diff --git a/samples/openthread/cli/snippets/usb/usb.conf b/samples/openthread/cli/snippets/usb/usb.conf index 7e6d32c1e164..f84c63d80f49 100644 --- a/samples/openthread/cli/snippets/usb/usb.conf +++ b/samples/openthread/cli/snippets/usb/usb.conf @@ -8,11 +8,11 @@ CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51 CONFIG_UART_LINE_CTRL=y CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y -CONFIG_USB_CDC_ACM_LOG_LEVEL_OFF=y +CONFIG_USBD_CDC_ACM_LOG_LEVEL_OFF=y -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_REMOTE_WAKEUP=n -CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" -CONFIG_USB_DEVICE_PRODUCT="Thread CLI" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x0000 +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Thread CLI" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x0000 diff --git a/samples/openthread/cli/src/main.c b/samples/openthread/cli/src/main.c index c169cbcefbcd..f3e29aaebc92 100644 --- a/samples/openthread/cli/src/main.c +++ b/samples/openthread/cli/src/main.c @@ -16,7 +16,6 @@ #endif #include -#include LOG_MODULE_REGISTER(cli_sample, CONFIG_OT_COMMAND_LINE_INTERFACE_LOG_LEVEL); @@ -37,12 +36,6 @@ int main(void) const struct device *dev; uint32_t dtr = 0U; - ret = usb_enable(NULL); - if (ret != 0 && ret != -EALREADY) { - LOG_ERR("Failed to enable USB"); - return 0; - } - dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_shell_uart)); if (dev == NULL) { LOG_ERR("Failed to find specific UART device"); diff --git a/samples/openthread/cli/sysbuild/ipc_radio/prj_ble.conf b/samples/openthread/cli/sysbuild/ipc_radio/prj_ble.conf index 0390bce97567..4e5316fda470 100644 --- a/samples/openthread/cli/sysbuild/ipc_radio/prj_ble.conf +++ b/samples/openthread/cli/sysbuild/ipc_radio/prj_ble.conf @@ -22,7 +22,6 @@ CONFIG_BT_MAX_CONN=4 CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_NRF_802154_SER_RADIO=y diff --git a/samples/openthread/coap_client/sysbuild/ipc_radio/prj_ble.conf b/samples/openthread/coap_client/sysbuild/ipc_radio/prj_ble.conf index 2db76a00c55a..8f3b2548ef62 100644 --- a/samples/openthread/coap_client/sysbuild/ipc_radio/prj_ble.conf +++ b/samples/openthread/coap_client/sysbuild/ipc_radio/prj_ble.conf @@ -22,7 +22,6 @@ CONFIG_BT_MAX_CONN=4 CONFIG_BT_CTLR_ASSERT_HANDLER=y CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_NRF_802154_SER_RADIO=y diff --git a/samples/openthread/coprocessor/sample.yaml b/samples/openthread/coprocessor/sample.yaml index 1cf94b14b0c3..822fd30c03b3 100644 --- a/samples/openthread/coprocessor/sample.yaml +++ b/samples/openthread/coprocessor/sample.yaml @@ -102,7 +102,7 @@ tests: - nrf54lm20dk/nrf54lm20a/cpuapp - nrf54l15dk/nrf54l15/cpuapp/ns extra_args: - - cli_SNIPPET="ci;l2" + - coprocessor_SNIPPET="ci;l2" integration_platforms: - nrf52840dk/nrf52840 - nrf54l15dk/nrf54l15/cpuapp diff --git a/samples/openthread/coprocessor/snippets/hci/rcp_hci.conf b/samples/openthread/coprocessor/snippets/hci/rcp_hci.conf index ae78427c5881..5d2307037f9d 100644 --- a/samples/openthread/coprocessor/snippets/hci/rcp_hci.conf +++ b/samples/openthread/coprocessor/snippets/hci/rcp_hci.conf @@ -24,12 +24,11 @@ CONFIG_BT_BUF_EVT_DISCARDABLE_SIZE=255 # Host number of completed commands does not follow normal flow control. CONFIG_BT_BUF_CMD_TX_COUNT=10 -CONFIG_USB_CDC_ACM=y -CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" -CONFIG_USB_DEVICE_PRODUCT="Thread Co-Processor with BLE HCI" -CONFIG_USB_DEVICE_VID=0xCAFD -CONFIG_USB_DEVICE_PID=0x0000 -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Thread Co-Processor" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x0000 CONFIG_UART_LINE_CTRL=y diff --git a/samples/openthread/coprocessor/snippets/usb/usb.conf b/samples/openthread/coprocessor/snippets/usb/usb.conf index c7cac6bb7b84..5b1d8c715808 100644 --- a/samples/openthread/coprocessor/snippets/usb/usb.conf +++ b/samples/openthread/coprocessor/snippets/usb/usb.conf @@ -4,12 +4,11 @@ # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause # -CONFIG_USB_CDC_ACM=y -CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" -CONFIG_USB_DEVICE_PRODUCT="Thread Co-Processor" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x0000 -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_REMOTE_WAKEUP=n +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Thread Co-Processor" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x0000 CONFIG_UART_LINE_CTRL=y diff --git a/samples/openthread/coprocessor/src/rcp_hci.c b/samples/openthread/coprocessor/src/rcp_hci.c index 3d721f445d5b..cf13233e0f24 100644 --- a/samples/openthread/coprocessor/src/rcp_hci.c +++ b/samples/openthread/coprocessor/src/rcp_hci.c @@ -17,8 +17,6 @@ #include #include -#include - #include #include #include @@ -26,6 +24,8 @@ #include #include +#include + LOG_MODULE_REGISTER(rcp_hci_module, CONFIG_OT_COPROCESSOR_LOG_LEVEL); static const struct device *const hci_uart_dev = DEVICE_DT_GET(DT_CHOSEN(zephyr_bt_c2h_uart)); diff --git a/samples/peripheral/802154_sniffer/prj.conf b/samples/peripheral/802154_sniffer/prj.conf index 2baa60af5b66..008ebead08bf 100644 --- a/samples/peripheral/802154_sniffer/prj.conf +++ b/samples/peripheral/802154_sniffer/prj.conf @@ -21,15 +21,17 @@ CONFIG_SHELL_VT100_COLORS=n CONFIG_DK_LIBRARY=y # USB configuration -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_MANUFACTURER="Nordic Semiconductor ASA" -CONFIG_USB_DEVICE_PRODUCT="nRF 802154 Sniffer" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x154b CONFIG_SHELL_BACKEND_SERIAL_CHECK_DTR=y CONFIG_UART_LINE_CTRL=y CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51 -CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=y + +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_PID=0x0004 +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="nRF 802154 Sniffer" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x154b # Disable boot banner CONFIG_BOOT_BANNER=n diff --git a/samples/peripheral/radio_test/sysbuild/remote_shell/prj_usb.conf b/samples/peripheral/radio_test/sysbuild/remote_shell/prj_usb.conf index e4df2db7d0a1..f7ac8327acd4 100644 --- a/samples/peripheral/radio_test/sysbuild/remote_shell/prj_usb.conf +++ b/samples/peripheral/radio_test/sysbuild/remote_shell/prj_usb.conf @@ -17,10 +17,13 @@ CONFIG_IPC_SERVICE_BACKEND_RPMSG=y CONFIG_HEAP_MEM_POOL_SIZE=4096 -CONFIG_USB_DEVICE_STACK=y -CONFIG_USB_DEVICE_PRODUCT="Nordic Remote Shell sample" -CONFIG_USB_DEVICE_VID=0x1915 -CONFIG_USB_DEVICE_PID=0x53AA +CONFIG_USB_DEVICE_STACK_NEXT=y +CONFIG_CDC_ACM_SERIAL_INITIALIZE_AT_BOOT=y +CONFIG_CDC_ACM_SERIAL_MANUFACTURER_STRING="Nordic Semiconductor ASA" +CONFIG_CDC_ACM_SERIAL_PRODUCT_STRING="Nordic Remote Shell sample" +CONFIG_CDC_ACM_SERIAL_VID=0x1915 +CONFIG_CDC_ACM_SERIAL_PID=0x53AA + # Config logger CONFIG_LOG=y @@ -28,7 +31,7 @@ CONFIG_LOG_PRINTK=y CONFIG_USE_SEGGER_RTT=y CONFIG_LOG_BACKEND_RTT=y CONFIG_LOG_BACKEND_UART=n -CONFIG_USB_DRIVER_LOG_LEVEL_ERR=y -CONFIG_USB_DEVICE_LOG_LEVEL_ERR=y +CONFIG_UDC_DRIVER_LOG_LEVEL_ERR=y +CONFIG_USBD_LOG_LEVEL_ERR=y CONFIG_SOC_NRF53_CPUNET_ENABLE=y diff --git a/samples/pmic/native/npm13xx_fuel_gauge/README.rst b/samples/pmic/native/npm13xx_fuel_gauge/README.rst index 5407acf5441c..f2a69ab0c1a9 100644 --- a/samples/pmic/native/npm13xx_fuel_gauge/README.rst +++ b/samples/pmic/native/npm13xx_fuel_gauge/README.rst @@ -121,7 +121,7 @@ You can use either the nRF Connect for VS Code extension or the command line. .. code-block:: bash - -DSHIELD=npm1300_ek + -Dnpm13xx_fuel_gauge_SHIELD=npm1300_ek To apply an extra overlay, choose the respective file from the **Extra Devicetree overlays** drop-down menu diff --git a/samples/pmic/native/npm13xx_fuel_gauge/sample.yaml b/samples/pmic/native/npm13xx_fuel_gauge/sample.yaml index c162acf8b5a6..f65e59432412 100644 --- a/samples/pmic/native/npm13xx_fuel_gauge/sample.yaml +++ b/samples/pmic/native/npm13xx_fuel_gauge/sample.yaml @@ -30,11 +30,11 @@ tests: sysbuild: true build_only: true extra_args: - - SHIELD=npm1300_ek + - npm13xx_fuel_gauge_SHIELD=npm1300_ek - EXTRA_DTC_OVERLAY_FILE=npm1300.overlay sample.npm1304_fuel_gauge_compile: sysbuild: true build_only: true extra_args: - - SHIELD=npm1304_ek + - npm13xx_fuel_gauge_SHIELD=npm1304_ek - EXTRA_DTC_OVERLAY_FILE=npm1304.overlay diff --git a/samples/pmic/native/npm13xx_one_button/README.rst b/samples/pmic/native/npm13xx_one_button/README.rst index 109885875935..95819fb9d0cc 100644 --- a/samples/pmic/native/npm13xx_one_button/README.rst +++ b/samples/pmic/native/npm13xx_one_button/README.rst @@ -118,7 +118,7 @@ You can use either the nRF Connect for VS Code extension or the command line. .. code-block:: bash - -DSHIELD=npm1300_ek + -Dnpm13xx_one_button_SHIELD=npm1300_ek To apply an extra overlay, choose the respective file from the **Extra Devicetree overlays** drop-down menu diff --git a/samples/pmic/native/npm13xx_one_button/sample.yaml b/samples/pmic/native/npm13xx_one_button/sample.yaml index 31d8893df7ef..b23f85c3ef8d 100644 --- a/samples/pmic/native/npm13xx_one_button/sample.yaml +++ b/samples/pmic/native/npm13xx_one_button/sample.yaml @@ -30,11 +30,11 @@ tests: sysbuild: true build_only: true extra_args: - - SHIELD=npm1300_ek + - npm13xx_one_button_SHIELD=npm1300_ek - EXTRA_DTC_OVERLAY_FILE=npm1300.overlay sample.npm1304_one_button_compile: sysbuild: true build_only: true extra_args: - - SHIELD=npm1304_ek + - npm13xx_one_button_SHIELD=npm1304_ek - EXTRA_DTC_OVERLAY_FILE=npm1304.overlay diff --git a/samples/wifi/ble_coex/sysbuild/ipc_radio/prj.conf b/samples/wifi/ble_coex/sysbuild/ipc_radio/prj.conf index a54ac9e71052..c819ff23f2bd 100644 --- a/samples/wifi/ble_coex/sysbuild/ipc_radio/prj.conf +++ b/samples/wifi/ble_coex/sysbuild/ipc_radio/prj.conf @@ -26,7 +26,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=502 CONFIG_BT_MAX_CONN=2 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_IPC_RADIO_BT=y CONFIG_IPC_RADIO_BT_HCI_IPC=y diff --git a/samples/wifi/monitor/overlay-netusb.conf b/samples/wifi/monitor/overlay-netusb.conf index e7a3a45a09e4..ee8233f61b9f 100644 --- a/samples/wifi/monitor/overlay-netusb.conf +++ b/samples/wifi/monitor/overlay-netusb.conf @@ -14,3 +14,6 @@ CONFIG_NET_SOCKETS_POLL_MAX=10 # DUT responses are > 1500, so, need to fragment CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=10 + +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y diff --git a/samples/wifi/promiscuous/overlay-netusb.conf b/samples/wifi/promiscuous/overlay-netusb.conf index e7a3a45a09e4..ee8233f61b9f 100644 --- a/samples/wifi/promiscuous/overlay-netusb.conf +++ b/samples/wifi/promiscuous/overlay-netusb.conf @@ -14,3 +14,6 @@ CONFIG_NET_SOCKETS_POLL_MAX=10 # DUT responses are > 1500, so, need to fragment CONFIG_NET_IPV4_FRAGMENT=y CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=10 + +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y diff --git a/samples/wifi/provisioning/softap/prj.conf b/samples/wifi/provisioning/softap/prj.conf index 4c43dfcea34a..328d8847f63d 100644 --- a/samples/wifi/provisioning/softap/prj.conf +++ b/samples/wifi/provisioning/softap/prj.conf @@ -23,6 +23,7 @@ CONFIG_WIFI_NM_WPA_SUPPLICANT=y CONFIG_WIFI_NM_WPA_SUPPLICANT_AP=y CONFIG_NET_L2_ETHERNET=y CONFIG_WIFI_CREDENTIALS=y +CONFIG_SETTINGS=y # General CONFIG_LOG=y diff --git a/samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf b/samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf index c02f67e58778..67f04add5b53 100644 --- a/samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf +++ b/samples/wifi/shell/boards/thingy91x_nrf5340_cpuapp.conf @@ -11,8 +11,6 @@ CONFIG_SPI_NOR_FLASH_LAYOUT_PAGE_SIZE=4096 CONFIG_SPI_NOR_SFDP_DEVICETREE=y CONFIG_I2C=y -CONFIG_NFCT_PINS_AS_GPIOS=y - # USB CONFIG_USB_DEVICE_STACK=y CONFIG_USB_DEVICE_PRODUCT="Thingy:91 X Wi-Fi Shell" @@ -32,3 +30,6 @@ CONFIG_RTT_CONSOLE=n CONFIG_FW_INFO=y CONFIG_SECURE_BOOT_STORAGE=y + +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y diff --git a/samples/wifi/shell/overlay-netusb.conf b/samples/wifi/shell/overlay-netusb.conf index abdc8dc6e222..5136b086e81b 100644 --- a/samples/wifi/shell/overlay-netusb.conf +++ b/samples/wifi/shell/overlay-netusb.conf @@ -17,3 +17,6 @@ CONFIG_NET_IPV4_FRAGMENT_MAX_COUNT=10 # For netusb WFA_THREADS_NUM CONFIG_POSIX_THREAD_THREADS_MAX=5 + +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y diff --git a/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf index 9b840fc2b9ac..b6ab59846315 100644 --- a/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf +++ b/samples/wifi/shell/sysbuild/mcuboot/boards/thingy91x_nrf5340_cpuapp.conf @@ -83,3 +83,6 @@ CONFIG_MFD_NPM13XX=n CONFIG_BOOT_SERIAL_NO_APPLICATION=y CONFIG_PM_DEVICE_RUNTIME=y + +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y diff --git a/samples/wifi/shell/sysbuild/mcuboot/prj.conf b/samples/wifi/shell/sysbuild/mcuboot/prj.conf index 04f385356e12..7b6aba30942a 100644 --- a/samples/wifi/shell/sysbuild/mcuboot/prj.conf +++ b/samples/wifi/shell/sysbuild/mcuboot/prj.conf @@ -18,18 +18,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/samples/wifi/wfa_qt_app/overlay-netusb.conf b/samples/wifi/wfa_qt_app/overlay-netusb.conf index 45049168260c..6a93f45c60c6 100644 --- a/samples/wifi/wfa_qt_app/overlay-netusb.conf +++ b/samples/wifi/wfa_qt_app/overlay-netusb.conf @@ -12,3 +12,6 @@ CONFIG_NET_IF_MAX_IPV4_COUNT=2 CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=2 CONFIG_NET_CONFIG_USB_IPV4_ADDR="192.0.2.1" CONFIG_USB_NRFX_WORK_QUEUE_STACK_SIZE=2048 + +# Sample uses deprecated code and needs to be ported to the new USB device stack. +CONFIG_DEPRECATION_TEST=y diff --git a/samples/zephyr/drivers/i2c/rtio_loopback/Kconfig b/samples/zephyr/drivers/i2c/rtio_loopback/Kconfig new file mode 100644 index 000000000000..820e72f8d52b --- /dev/null +++ b/samples/zephyr/drivers/i2c/rtio_loopback/Kconfig @@ -0,0 +1 @@ +source "samples/drivers/i2c/rtio_loopback/Kconfig" diff --git a/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_merged_slot.overlay b/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_merged_slot.overlay index 80537ee8643b..267c6263d9cb 100644 --- a/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_merged_slot.overlay +++ b/samples/zephyr/subsys/mgmt/mcumgr/smp_svr/sysbuild/mcuboot_merged_slot.overlay @@ -11,3 +11,58 @@ zephyr,code-partition = &boot_partition; }; }; + +/* + * Copy required overlay for mcuboot from bootloader/mcuboot. + * + * Required as the overlay in bootloader/mcuboot is ignored due to + * FILE_SUFFIX="merged_slot" matching this overlay instead. + */ + +&gdpwr { + status = "disabled"; +}; + +&gdpwr_fast_active_0 { + status = "disabled"; +}; + +&gdpwr_fast_active_1 { + status = "disabled"; +}; + +&gdpwr_fast_main { + status = "disabled"; +}; + +&gdpwr_slow_active { + status = "disabled"; +}; + +&gdpwr_slow_main { + status = "disabled"; +}; + +&gpio_pad_group0 { + status = "disabled"; +}; + +&gpio_pad_group1 { + status = "disabled"; +}; + +&gpio_pad_group2 { + status = "disabled"; +}; + +&gpio_pad_group6 { + status = "disabled"; +}; + +&gpio_pad_group7 { + status = "disabled"; +}; + +&gpio_pad_group9 { + status = "disabled"; +}; diff --git a/scripts/quarantine.yaml b/scripts/quarantine.yaml index c02ff859b1b7..9d882cb9d499 100644 --- a/scripts/quarantine.yaml +++ b/scripts/quarantine.yaml @@ -99,3 +99,9 @@ platforms: - nrf54h20dk@0.9.0/nrf54h20/cpuapp comment: "https://nordicsemi.atlassian.net/browse/NCSDK-35382" + +- scenarios: + - sample.bluetooth.mesh.sensor_client + platforms: + - nrf52dk/nrf52832 + comment: "https://nordicsemi.atlassian.net/browse/NCSDK-35409" diff --git a/scripts/quarantine_zephyr.yaml b/scripts/quarantine_zephyr.yaml index de8bef1fa29c..93dc249cc125 100644 --- a/scripts/quarantine_zephyr.yaml +++ b/scripts/quarantine_zephyr.yaml @@ -297,6 +297,7 @@ - kernel.threads.dynamic_thread.stack.no_pool.alloc.no_user - kernel.threads.dynamic_thread.stack.pool.no_alloc.no_user - kernel.threads.dynamic_thread.stack.no_pool.no_alloc.user + - kernel.poll.minimallibc - kernel.scheduler.no_timeslicing - kernel.scheduler.dumb_no_timeslicing - kernel.scheduler.dumb_timeslicing @@ -365,6 +366,7 @@ - sample.net.sockets.socketpair - sample.drivers.crypto.mbedtls - kernel.workqueue.api + - kernel.workqueue.work_timeout - sample.posix.env - sample.shell.shell_module - kernel.common @@ -390,6 +392,7 @@ - crypto.tinycrypt.hmac_prng - drivers.can.shell - kernel.common + - kernel.common.lto - kernel.common.minimallibc - kernel.common.misra - kernel.common.nano32 diff --git a/subsys/bluetooth/controller/hci_internal.c b/subsys/bluetooth/controller/hci_internal.c index 7e23b38412de..864284b962d3 100644 --- a/subsys/bluetooth/controller/hci_internal.c +++ b/subsys/bluetooth/controller/hci_internal.c @@ -1789,7 +1789,7 @@ int hci_internal_msg_get(uint8_t *msg_out, sdc_hci_msg_type_t *msg_type_out) return 0; } - const int retval = sdc_hci_get(msg_out, msg_type_out); + const int retval = sdc_hci_get(msg_out, (uint8_t*)msg_type_out); #if defined(CONFIG_BT_CTLR_SDC_PAWR_SYNC) if (retval == 0 && *msg_type_out == SDC_HCI_MSG_TYPE_EVT diff --git a/subsys/bluetooth/cs_de/cs_de.c b/subsys/bluetooth/cs_de/cs_de.c index cd8f6a21cd25..468115c838e9 100644 --- a/subsys/bluetooth/cs_de/cs_de.c +++ b/subsys/bluetooth/cs_de/cs_de.c @@ -387,7 +387,7 @@ static bool process_step_data(struct bt_le_cs_subevent_step *local_step, { cs_de_report_t *p_report = (cs_de_report_t *)user_data; - if (local_step->mode == BT_CONN_LE_CS_MAIN_MODE_2) { + if (local_step->mode == BT_HCI_OP_LE_CS_MAIN_MODE_2) { struct bt_hci_le_cs_step_data_mode_2 *local_step_data = (struct bt_hci_le_cs_step_data_mode_2 *)local_step->data; struct bt_hci_le_cs_step_data_mode_2 *peer_step_data = diff --git a/subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c b/subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c index a6b3b28d59e0..e925e5f1ec92 100644 --- a/subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c +++ b/subsys/net/lib/softap_wifi_provision/softap_wifi_provision.c @@ -600,7 +600,7 @@ static void init_entry(void *o) parser_settings.on_url = on_url; } -static void init_run(void *o) +static enum smf_state_result init_run(void *o) { struct s_object *user_object = o; @@ -611,6 +611,8 @@ static void init_run(void *o) } else { LOG_DBG("Unknown event, skipping state transition."); } + + return SMF_EVENT_HANDLED; } /* Scan and cache Wi-Fi results in unprovisioned state. */ @@ -630,7 +632,7 @@ static void unprovisioned_entry(void *o) } } -static void unprovisioned_run(void *o) +static enum smf_state_result unprovisioned_run(void *o) { struct s_object *user_object = o; @@ -641,6 +643,8 @@ static void unprovisioned_run(void *o) } else { LOG_DBG("Unknown event, skipping state transition."); } + + return SMF_EVENT_HANDLED; } static void unprovisioned_exit(void *o) @@ -685,7 +689,7 @@ static void provisioning_entry(void *o) notify_app(SOFTAP_WIFI_PROVISION_EVT_STARTED); } -static void provisioning_run(void *o) +static enum smf_state_result provisioning_run(void *o) { struct s_object *user_object = o; @@ -699,6 +703,8 @@ static void provisioning_run(void *o) } else { LOG_DBG("Unknown event, skipping state transition."); } + + return SMF_EVENT_HANDLED; } /* Wi-Fi credentials received, provisioning complete, cleanup and disable AP mode. */ @@ -732,7 +738,7 @@ static void provisioning_exit(void *o) } } -static void provisioned_run(void *o) +static enum smf_state_result provisioned_run(void *o) { struct s_object *user_object = o; @@ -743,6 +749,8 @@ static void provisioned_run(void *o) } else { LOG_DBG("Unknown event, skipping state transition."); } + + return SMF_EVENT_HANDLED; } static void provisioned_exit(void *o) @@ -766,7 +774,7 @@ static void finished_entry(void *o) k_sem_give(&softap_wifi_provision_sem); } -static void finished_run(void *o) +static enum smf_state_result finished_run(void *o) { struct s_object *user_object = o; @@ -775,6 +783,8 @@ static void finished_run(void *o) } else { LOG_DBG("Unknown event, skipping state transition."); } + + return SMF_EVENT_HANDLED; } /* Delete Wi-Fi credentials upon exit of the provisioning state. */ diff --git a/tests/benchmarks/multicore/idle/testcase.yaml b/tests/benchmarks/multicore/idle/testcase.yaml index 5e48bde7b1a3..6bd404c5c917 100644 --- a/tests/benchmarks/multicore/idle/testcase.yaml +++ b/tests/benchmarks/multicore/idle/testcase.yaml @@ -103,6 +103,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -110,6 +112,8 @@ tests: - CONFIG_SERIAL=n - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n @@ -135,6 +139,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -143,6 +149,8 @@ tests: - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n - CONFIG_FPU=y + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n @@ -168,6 +176,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -175,6 +185,8 @@ tests: - CONFIG_SERIAL=n - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n @@ -201,6 +213,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -208,6 +222,8 @@ tests: - CONFIG_SERIAL=n - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n @@ -234,6 +250,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -241,6 +259,8 @@ tests: - CONFIG_SERIAL=n - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n @@ -266,6 +286,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -273,6 +295,8 @@ tests: - CONFIG_SERIAL=n - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n @@ -299,6 +323,8 @@ tests: - CONFIG_FIRST_SLEEP_OFFSET=y - CONFIG_PM=y - CONFIG_PM_S2RAM=y + - CONFIG_PM_DEVICE=y + - CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - CONFIG_POWEROFF=y - CONFIG_PM_S2RAM_CUSTOM_MARKING=y - CONFIG_CONSOLE=n @@ -306,6 +332,8 @@ tests: - CONFIG_SERIAL=n - CONFIG_GPIO=n - CONFIG_BOOT_BANNER=n + - remote_CONFIG_PM_DEVICE=y + - remote_CONFIG_PM_DEVICE_RUNTIME_ASYNC=n - remote_CONFIG_PM=y - remote_CONFIG_POWEROFF=y - remote_CONFIG_CONSOLE=n diff --git a/tests/bluetooth/bsim/nrf_auraconfig/prj.conf b/tests/bluetooth/bsim/nrf_auraconfig/prj.conf index bc76f8487071..2c1581bdb3c3 100644 --- a/tests/bluetooth/bsim/nrf_auraconfig/prj.conf +++ b/tests/bluetooth/bsim/nrf_auraconfig/prj.conf @@ -8,7 +8,6 @@ # General CONFIG_REBOOT=y CONFIG_DEBUG=y -CONFIG_DEBUG_INFO=y CONFIG_ASSERT=y CONFIG_STACK_USAGE=y CONFIG_THREAD_RUNTIME_STATS=y diff --git a/tests/samples/bluetooth/samples_test_app/sysbuild/ipc_radio/prj.conf b/tests/samples/bluetooth/samples_test_app/sysbuild/ipc_radio/prj.conf index 3899ab7c72df..ebb081af3839 100644 --- a/tests/samples/bluetooth/samples_test_app/sysbuild/ipc_radio/prj.conf +++ b/tests/samples/bluetooth/samples_test_app/sysbuild/ipc_radio/prj.conf @@ -26,7 +26,6 @@ CONFIG_BT_BUF_ACL_TX_SIZE=502 CONFIG_BT_MAX_CONN=2 CONFIG_ASSERT=y -CONFIG_DEBUG_INFO=y CONFIG_EXCEPTION_STACK_TRACE=y CONFIG_IPC_RADIO_BT=y diff --git a/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.c b/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.c index 0ff828c432a4..f73c221a9f21 100644 --- a/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.c +++ b/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.c @@ -84,7 +84,7 @@ DEFINE_FAKE_VALUE_FUNC(int, dfu_target_modem_delta_reset); DEFINE_FAKE_VALUE_FUNC(bool, dfu_target_modem_delta_identify, const void *const); DEFINE_FAKE_VALUE_FUNC(int, modem_info_string_get, enum modem_info, char *, const size_t); DEFINE_FAKE_VALUE_FUNC(int, boot_read_bank_header, uint8_t, struct mcuboot_img_header *, size_t); -DEFINE_FAKE_VOID_FUNC(clear_attrs, void *); +DEFINE_FAKE_VOID_FUNC(clear_attrs, uint8_t, void *); DEFINE_FAKE_VALUE_FUNC(int, lwm2m_notify_observer_path, const struct lwm2m_obj_path *); DEFINE_FAKE_VOID_FUNC(engine_remove_observer_by_id, uint16_t, int32_t); DEFINE_FAKE_VALUE_FUNC(int, lwm2m_firmware_start_transfer, uint16_t, char *); diff --git a/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.h b/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.h index b318cf26a027..2f70c73ce81b 100644 --- a/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.h +++ b/tests/subsys/net/lib/lwm2m_fota_utils/src/stubs.h @@ -81,7 +81,7 @@ DECLARE_FAKE_VALUE_FUNC(int, dfu_target_modem_delta_reset); DECLARE_FAKE_VALUE_FUNC(bool, dfu_target_modem_delta_identify, const void *const); DECLARE_FAKE_VALUE_FUNC(int, modem_info_string_get, enum modem_info, char *, const size_t); DECLARE_FAKE_VALUE_FUNC(int, boot_read_bank_header, uint8_t, struct mcuboot_img_header *, size_t); -DECLARE_FAKE_VOID_FUNC(clear_attrs, void *); +DECLARE_FAKE_VOID_FUNC(clear_attrs, uint8_t, void *); DECLARE_FAKE_VALUE_FUNC(int, lwm2m_notify_observer_path, const struct lwm2m_obj_path *); DECLARE_FAKE_VOID_FUNC(engine_remove_observer_by_id, uint16_t, int32_t); DECLARE_FAKE_VALUE_FUNC(int, lwm2m_firmware_start_transfer, uint16_t, char *); diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.conf b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.conf index dd8a2f1f68e2..55c9b5607f1c 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.conf +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.conf @@ -8,3 +8,7 @@ CONFIG_SPI_NOR=n CONFIG_FPROTECT=n CONFIG_BOOT_WATCHDOG_FEED=n + +# Power domains forced on by default on boot, no need +# to manage them in bootloader. +CONFIG_POWER_DOMAIN=n diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.overlay index 31d9b441aa51..6c30ddb34989 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.overlay +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/boards/nrf54h20dk_nrf54h20_cpuapp.overlay @@ -11,3 +11,58 @@ zephyr,code-partition = &boot_partition; }; }; + +/* + * Copy required overlay for mcuboot from bootloader/mcuboot. + * + * Required as the overlay in bootloader/mcuboot is ignored due to + * board overlay in this test. + */ + +&gdpwr { + status = "disabled"; +}; + +&gdpwr_fast_active_0 { + status = "disabled"; +}; + +&gdpwr_fast_active_1 { + status = "disabled"; +}; + +&gdpwr_fast_main { + status = "disabled"; +}; + +&gdpwr_slow_active { + status = "disabled"; +}; + +&gdpwr_slow_main { + status = "disabled"; +}; + +&gpio_pad_group0 { + status = "disabled"; +}; + +&gpio_pad_group1 { + status = "disabled"; +}; + +&gpio_pad_group2 { + status = "disabled"; +}; + +&gpio_pad_group6 { + status = "disabled"; +}; + +&gpio_pad_group7 { + status = "disabled"; +}; + +&gpio_pad_group9 { + status = "disabled"; +}; diff --git a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf index 5e0496c33ae4..c461ed29f056 100644 --- a/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf +++ b/tests/subsys/nrf_compress/decompression/mcuboot_update/sysbuild/mcuboot/prj.conf @@ -12,18 +12,11 @@ CONFIG_BOOT_BOOTSTRAP=n ### mbedTLS has its own heap # CONFIG_HEAP_MEM_POOL_SIZE is not set -### We never want Zephyr's copy of tinycrypt. If tinycrypt is needed, -### MCUboot has its own copy in tree. -# CONFIG_TINYCRYPT is not set -# CONFIG_TINYCRYPT_ECC_DSA is not set -# CONFIG_TINYCRYPT_SHA256 is not set - CONFIG_FLASH=y CONFIG_FPROTECT=y ### Various Zephyr boards enable features that we don't want. # CONFIG_BT is not set -# CONFIG_BT_CTLR is not set # CONFIG_I2C is not set CONFIG_LOG=y diff --git a/west.yml b/west.yml index 91e175e68ffb..87286724cb93 100644 --- a/west.yml +++ b/west.yml @@ -65,7 +65,7 @@ manifest: # https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html - name: zephyr repo-path: sdk-zephyr - revision: 25ced410af6caf6fea810b49ef4cf9b3bcb40b2b + revision: pull/3178/head import: # In addition to the zephyr repository itself, NCS also # imports the contents of zephyr/west.yml at the above @@ -128,7 +128,7 @@ manifest: compare-by-default: true - name: mcuboot repo-path: sdk-mcuboot - revision: 7b333ffd5ba2d01b731f528f2be89864abbf7ca3 + revision: pull/513/head path: bootloader/mcuboot - name: qcbor url: https://github.com/laurencelundblade/QCBOR @@ -137,7 +137,7 @@ manifest: - name: mbedtls path: modules/crypto/mbedtls repo-path: sdk-mbedtls - revision: c5115abac477249fab42e61368b8f87c3c9265e1 + revision: pull/44/head - name: oberon-psa-crypto path: modules/crypto/oberon-psa-crypto repo-path: sdk-oberon-psa-crypto