Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upmerge 16.05.2024 #15351

Merged
merged 39 commits into from
May 28, 2024
+460 −486
Merged

Upmerge 16.05.2024 #15351

Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
ca49f68
manifest: Pull upmerged repositories
rlubos May 16, 2024
a6b21d7
doc: mcuboot: Make sure PORTING.md is visible
rlubos May 16, 2024
ae5208f
bluetooth: Don't reference removed Kconfig symbols
rlubos May 16, 2024
3dbff88
bluetooth: Remove CONFIG_BT_HCI_RAW_RESERVE
MarekPieta May 17, 2024
f2e2c53
sample: wifi: ble_coex: Ignore zperf periodic results
rlubos May 17, 2024
bf2a4f6
net: lwm2m: Align with lwm2m_engine_set_data_cb_t API change
rlubos May 17, 2024
c2066c7
kernel: Remove NCS boot banner dependency
rlubos May 17, 2024
38517da
nrf_security: Fix incompatibility with MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
rlubos May 17, 2024
2ad82ec
samples: net: mqtt: Align with SFM_CREATE_STATE API changes
rlubos May 17, 2024
86b881c
bluetooth: Remove bt_read_static_addr() "hack"
MarekPieta May 17, 2024
f3ddf95
bluetooth: controller: Merge BT_HCI_VS_EXT into BT_HCI_VS
MarekPieta May 17, 2024
6aafb28
lib: fatal_error: Don't enable fatal handler by default globally
rlubos May 20, 2024
956e61f
applications: nrf_desktop: Disable NCS boot banner
MarekPieta May 20, 2024
d1b0c9f
modules: memfault: Override MEMFAULT_HTTP_USES_MBEDTLS config default
rlubos May 20, 2024
5027929
samples: matter: Renamed rram0 label for nRF54l15pdk
kkasperczyk-no May 21, 2024
8734032
boards: shields: disable NCS_BOOT_BANNER for nRF22xx shields
May 21, 2024
c6ebff7
debug: etb_trace: Covert SOC_ON_EXIT_CPU_IDLE handler to C
rlubos May 21, 2024
80db85c
samples: wifi: sta: Fix RAM overflow for nRF52840
krish2718 May 21, 2024
62b36e8
scripts: Quarantine Wi-Fi on nRF54L15
krish2718 May 21, 2024
44b6c2a
applications: nrf_desktop: Align RRAM configuration for nRF54L15 PDK
MarekPieta May 21, 2024
c052a60
Applications: nrf5340_audio: Upmerge fixes
koffes May 21, 2024
8d3647f
scripts: Extend Zephyr tests/samples quarantine
rlubos May 21, 2024
50b0fed
samples: wifi: shell: Increase net management buffers
krish2718 May 22, 2024
3fedac2
boards: 54l: ns: Delete the deprecated nrf54l15_cpuapp_ns.dtsi
SebastianBoe May 22, 2024
88b4d53
Applications: nrf5340_audio: Upmerge fixes2
koffes May 22, 2024
48493db
requirements: Updated pylint version
PerMac May 22, 2024
a55423b
samples: cellular: fmfu_smp_svr: Enable CRC in the sample
rlubos May 23, 2024
8ea9e77
samples: Use default nrf54l15pdk/nrf54l15/cpuapp revision in twister
rlubos May 23, 2024
72d9ef5
applications: nrf_desktop: Change watchdog instance for nrf54l15
rlubos May 23, 2024
6c477e0
scripts: Qurantine nRF54H Wi-Fi test
krish2718 May 23, 2024
c30ea28
lib: net: softap_wifi_provision: Align with SFM API changes
rlubos May 24, 2024
ec5957f
suit: flash_companion: Adjust minimal configuration
tomchy May 24, 2024
540f98f
samples: matter: Disabled NCS boot banner in the sysbuild mcuboot
kkasperczyk-no May 24, 2024
a50bde9
samples: Don't use deprecated NET_SOCKETS_POSIX_NAMES
rlubos May 25, 2024
24ddd07
samples: fast_pair: input_device: Fix build failures on nRF5340 DK
MarekPieta May 24, 2024
a76b81c
samples: bluetooth: Remove uses of auto name in advertising
grochu May 27, 2024
38309fe
doc: release-notes-changelog: Update Zephyr SHAs used in the upmerge
rlubos May 27, 2024
cf31f50
scripts: Quarantine iso_time_sync on nrf54l15pdk
rlubos May 27, 2024
0d202c3
samples: bluetooth: connection_event_trigger: Increase BT_RX_STACK_SIZE
rlubos May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion applications/asset_tracker_v2/boards/native_sim.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ CONFIG_NET_NATIVE=y
CONFIG_NET_TCP=y
CONFIG_NET_UDP=y
CONFIG_NET_SOCKETS_OFFLOAD=n
CONFIG_NET_SOCKETS_POSIX_NAMES=y
CONFIG_POSIX_API=y
CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
CONFIG_NET_PKT_RX_COUNT=32
CONFIG_NET_PKT_TX_COUNT=32
Expand Down
4 changes: 3 additions & 1 deletion applications/asset_tracker_v2/src/cloud/cloud_codec/lwm2m/lwm2m_codec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ static cloud_codec_evt_handler_t module_evt_handler;

/* Function that is called whenever the configuration object is written to. */
static int config_update_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id,
uint8_t *data, uint16_t data_len, bool last_block, size_t total_size)
uint8_t *data, uint16_t data_len, bool last_block,
size_t total_size, size_t offset)
rlubos marked this conversation as resolved.
Show resolved Hide resolved
{
/* Because we are dependent on providing all configurations in the
* CLOUD_CODEC_EVT_CONFIG_UPDATE event, all configuration is retrieved whenever the
Expand All @@ -41,6 +42,7 @@ static int config_update_cb(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_
ARG_UNUSED(data_len);
ARG_UNUSED(last_block);
ARG_UNUSED(total_size);
ARG_UNUSED(offset);

int err;
struct cloud_data_cfg cfg = { 0 };
Expand Down
4 changes: 3 additions & 1 deletion applications/asset_tracker_v2/tests/lwm2m_codec_helpers/src/lwm2m_codec_helpers_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ static int date_time_now_stub(int64_t *unix_time_ms, int no_of_calls)
* test_codec_helpers_setup_configuration_object_handler.
*/
static int callback(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id,
uint8_t *data, uint16_t data_len, bool last_block, size_t total_size)
uint8_t *data, uint16_t data_len, bool last_block,
size_t total_size, size_t offset)
{
ARG_UNUSED(obj_inst_id);
ARG_UNUSED(res_id);
rlubos marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -63,6 +64,7 @@ static int callback(uint16_t obj_inst_id, uint16_t res_id, uint16_t res_inst_id,
ARG_UNUSED(data_len);
ARG_UNUSED(last_block);
ARG_UNUSED(total_size);
ARG_UNUSED(offset);

return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion applications/asset_tracker_v2/tests/lwm2m_integration/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ target_compile_options(app PRIVATE
-DCONFIG_LWM2M_ENGINE_VALIDATION_BUFFER_SIZE=128
-DCONFIG_LWM2M_ENGINE_DEFAULT_LIFETIME=60
-DCONFIG_LWM2M_INTEGRATION_MODEM_MODE_REQUEST_RETRY_SECONDS=10
-DCONFIG_NET_SOCKETS_POSIX_NAMES=1
-DCONFIG_POSIX_API=y
-DCONFIG_LWM2M_CLIENT_UTILS_SECURITY_OBJ_SUPPORT=y
-DCONFIG_LWM2M_CLIENT_UTILS_FIRMWARE_UPDATE_OBJ_SUPPORT=y
-DCONFIG_CLOUD_CLIENT_ID_USE_CUSTOM=y
Expand Down
1 change: 0 additions & 1 deletion applications/ipc_radio/overlay-bt_hci_ipc.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ CONFIG_IPC_SERVICE=y
CONFIG_BT=y
CONFIG_BT_HCI_RAW=y
CONFIG_BT_CTLR_ASSERT_HANDLER=y
CONFIG_BT_HCI_RAW_RESERVE=1

CONFIG_ASSERT=y
CONFIG_DEBUG_INFO=y
Expand Down
1 change: 0 additions & 1 deletion applications/machine_learning/sysbuild/hci_ipc/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ CONFIG_BT=y
CONFIG_BT_MAX_CONN=10
CONFIG_BT_HCI_RAW=y
CONFIG_BT_CTLR_ASSERT_HANDLER=y
CONFIG_BT_HCI_RAW_RESERVE=1
CONFIG_BT_BUF_CMD_TX_COUNT=10
1 change: 0 additions & 1 deletion applications/matter_bridge/sysbuild/hci_ipc/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ CONFIG_BT=y
CONFIG_BT_HCI_RAW=y
CONFIG_BT_MAX_CONN=10
CONFIG_BT_CTLR_ASSERT_HANDLER=y
CONFIG_BT_HCI_RAW_RESERVE=1
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=y
CONFIG_BT_EXT_ADV=y
Expand Down
1 change: 1 addition & 0 deletions applications/matter_bridge/sysbuild/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ CONFIG_BOOT_MAX_IMG_SECTORS=256
CONFIG_LOG=n
CONFIG_CONSOLE_HANDLER=n
CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n
CONFIG_TIMESLICING=n
CONFIG_RESET_ON_FATAL_ERROR=n
CONFIG_MULTITHREADING=n
Expand Down
1 change: 0 additions & 1 deletion applications/matter_weather_station/sysbuild/multiprotocol_rpmsg/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ CONFIG_BT=y
CONFIG_BT_HCI_RAW=y
CONFIG_BT_MAX_CONN=1
CONFIG_BT_CTLR_ASSERT_HANDLER=y
CONFIG_BT_HCI_RAW_RESERVE=1
CONFIG_BT_PERIPHERAL=y
CONFIG_BT_CENTRAL=n
CONFIG_BT_BUF_ACL_RX_SIZE=502
Expand Down
1 change: 1 addition & 0 deletions applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1249,6 +1249,7 @@ static void disconnected_cleanup(uint8_t chan_idx)
}

static void unicast_discovery_complete_cb(struct bt_conn *conn, int err,
const struct bt_csip_set_coordinator_set_member *member,
const struct bt_csip_set_coordinator_csis_inst *csis_inst)
{
if (err) {
Expand Down
4 changes: 1 addition & 3 deletions applications/nrf5340_audio/src/bluetooth/bt_stream/unicast/unicast_server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ enum csip_set_rank {

static le_audio_receive_cb receive_cb;
static struct bt_csip_set_member_svc_inst *csip;
/* Left or right channel headset */
static enum audio_channel channel;

/* Advertising data for peer connection */
static uint8_t csip_rsi_adv_data[BT_CSIP_RSI_SIZE];
Expand Down Expand Up @@ -349,7 +347,7 @@ static void stream_recv_cb(struct bt_bap_stream *stream, const struct bt_iso_rec
bad_frame = true;
}

receive_cb(buf->data, buf->len, bad_frame, info->ts, channel,
receive_cb(buf->data, buf->len, bad_frame, info->ts, 0,
bt_audio_codec_cfg_get_octets_per_frame(stream->codec_cfg));
}
#endif /* (CONFIG_BT_AUDIO_RX) */
Expand Down
3 changes: 3 additions & 0 deletions applications/nrf5340_audio/unicast_client/Kconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ config BT_GATT_DYNAMIC_DB
config BT_ISO_MAX_CHAN
default 4

config BT_BAP_UNICAST
default y

config BT_BAP_UNICAST_CLIENT
default y

Expand Down
9 changes: 9 additions & 0 deletions applications/nrf5340_audio/unicast_server/Kconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,12 @@ config BT_GATT_AUTO_SEC_REQ


## ISO related configs ##
config BT_ISO_PERIPHERAL
default y

config BT_BAP_UNICAST
default y

config BT_BAP_UNICAST_SERVER
default y

Expand All @@ -35,6 +41,9 @@ config BT_DEVICE_APPEARANCE
config BT_GAP_PERIPHERAL_PREF_PARAMS
default n

config BT_ASCS
default y

config BT_ASCS_ASE_SNK_COUNT
default 1

Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ CONFIG_MAIN_STACK_SIZE=840
CONFIG_BT_RECV_WORKQ_SYS=y

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52810dmouse_nrf52810/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ CONFIG_MAIN_STACK_SIZE=840
CONFIG_BT_RECV_WORKQ_SYS=y

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/images/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ CONFIG_UART_LINE_CTRL=n
CONFIG_TIMESLICING=n
CONFIG_PRINTK=n
CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n
CONFIG_ERRNO=n
CONFIG_ARM_MPU=n
CONFIG_BOOT_SERIAL_IMG_GRP_HASH=n
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE=1536
CONFIG_BT_RECV_WORKQ_SYS=y

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52820dongle_nrf52820/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE=1536
CONFIG_BT_RECV_WORKQ_SYS=y

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n
CONFIG_PRINTK=n

CONFIG_NUM_COOP_PRIORITIES=10
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52820/images/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ CONFIG_USE_SEGGER_RTT=n
CONFIG_CONSOLE=n
CONFIG_UART_CONSOLE=n
CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n
CONFIG_ERRNO=n
CONFIG_ARM_MPU=n
CONFIG_BOOT_SERIAL_IMG_GRP_HASH=n
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE=1536
CONFIG_BT_RECV_WORKQ_SYS=y

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52820/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE=1536
CONFIG_BT_RECV_WORKQ_SYS=y

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n
CONFIG_PRINTK=n

CONFIG_NUM_COOP_PRIORITIES=10
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ CONFIG_LOG_MODE_IMMEDIATE=y
CONFIG_LOG_BACKEND_SHOW_COLOR=n
CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n
CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52833/images/mcuboot/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ CONFIG_UART_USE_RUNTIME_CONFIGURE=n
CONFIG_UART_LINE_CTRL=n
CONFIG_TIMESLICING=n
CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
CONFIG_BT_HCI_TX_STACK_SIZE=1536

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52833dk_nrf52833/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
CONFIG_BT_HCI_TX_STACK_SIZE=1536

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ CONFIG_LOG_MODE_IMMEDIATE=y
CONFIG_LOG_BACKEND_SHOW_COLOR=n
CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n
CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
Expand Down
1 change: 1 addition & 0 deletions ...cations/nrf_desktop/configuration/nrf52833dongle_nrf52833/images/mcuboot/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ CONFIG_UART_LINE_CTRL=n
CONFIG_TIMESLICING=n
CONFIG_PRINTK=n
CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
CONFIG_BT_HCI_TX_STACK_SIZE=1536

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52833dongle_nrf52833/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
CONFIG_BT_HCI_TX_STACK_SIZE=1536

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n
CONFIG_MAIN_STACK_SIZE=2048

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n
CONFIG_PRINTK=n
CONFIG_CONSOLE=n
CONFIG_UART_CONSOLE=n
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_dongle.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n
CONFIG_MAIN_STACK_SIZE=2048

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n
CONFIG_PRINTK=n
CONFIG_CONSOLE=n
CONFIG_UART_CONSOLE=n
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_keyboard.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n
CONFIG_MAIN_STACK_SIZE=2048

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n
CONFIG_PRINTK=n
CONFIG_CONSOLE=n
CONFIG_UART_CONSOLE=n
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n
CONFIG_MAIN_STACK_SIZE=2048

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n
CONFIG_PRINTK=n
CONFIG_CONSOLE=n
CONFIG_UART_CONSOLE=n
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/b0/prj_wwcb.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ CONFIG_EXT_API_PROVIDE_EXT_API_ENABLED=n
CONFIG_MAIN_STACK_SIZE=2048

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n
CONFIG_PRINTK=n
CONFIG_CONSOLE=n
CONFIG_UART_CONSOLE=n
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_fast_pair.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ CONFIG_SOC_FLASH_NRF_EMULATE_ONE_BYTE_WRITE_ACCESS=y

# Reduce memory consumption
CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n
CONFIG_GPIO=n
CONFIG_SERIAL=n
CONFIG_CONSOLE=n
Expand Down
1 change: 1 addition & 0 deletions ...ations/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_qspi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ CONFIG_CONSOLE=y
CONFIG_TIMESLICING=n
CONFIG_CBPRINTF_NANO=y
CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
Expand Down
1 change: 1 addition & 0 deletions ...cations/nrf_desktop/configuration/nrf52840dk_nrf52840/images/mcuboot/prj_mcuboot_smp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ CONFIG_LOG_MODE_IMMEDIATE=y
CONFIG_LOG_BACKEND_SHOW_COLOR=n
CONFIG_LOG_BACKEND_FORMAT_TIMESTAMP=n
CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
CONFIG_BT_HCI_TX_STACK_SIZE=1536

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_dongle.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
CONFIG_BT_HCI_TX_STACK_SIZE=1536

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_fast_pair.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
CONFIG_BT_HCI_TX_STACK_SIZE=1536

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_keyboard.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
CONFIG_BT_HCI_TX_STACK_SIZE=1536

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_qspi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
CONFIG_BT_HCI_TX_STACK_SIZE=1536

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_mcuboot_smp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
CONFIG_BT_HCI_TX_STACK_SIZE=1536

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
1 change: 1 addition & 0 deletions applications/nrf_desktop/configuration/nrf52840dk_nrf52840/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ CONFIG_BT_HCI_TX_STACK_SIZE_WITH_PROMPT=y
CONFIG_BT_HCI_TX_STACK_SIZE=1536

CONFIG_BOOT_BANNER=n
CONFIG_NCS_BOOT_BANNER=n

CONFIG_NUM_COOP_PRIORITIES=10
CONFIG_NUM_PREEMPT_PRIORITIES=11
Expand Down
Loading
Loading