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

manifest: Upmerge #12112

Merged
merged 34 commits into from
Oct 2, 2023
Merged

manifest: Upmerge #12112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a0e6b3b
manifest: Upmerge of sdk-nrf repositories
de-nordic Aug 22, 2023
db51b11
treewide: Remove CONFIG_BOOT_ENCRYPT_ from config files
de-nordic Aug 24, 2023
172a289
net/l2_wifi: Use conn_mgr_connectivity_impl.h
de-nordic Sep 1, 2023
0297767
samples: Fix renamed conn_mgr headers and functions
de-nordic Sep 5, 2023
237a517
samples: wifi: twt: Rename get_twt_err_code_str
de-nordic Sep 5, 2023
0200a89
drivers: net: eth_rtt: Select CRC
de-nordic Sep 5, 2023
20c25f5
applications: Add MCUboot bootutil library
de-nordic Sep 5, 2023
084a5ab
samples: matter: Fix missing mcumgr header
de-nordic Sep 5, 2023
30098e4
treewide: Use CONFIG_NET_CONNECTION_MANAGER_MONITOR_STACK_SIZE
de-nordic Sep 6, 2023
5d4fa1f
samples: cellular: add Kconfigs to modem_trace_backend
richardmccrae-nordicsemi Sep 6, 2023
3527b5b
ext: iperf3: Disable compilation of iperf_catch_sigend()
trantanen Sep 8, 2023
1aa4ff2
samples: matter: Forced using minimal libc for mcuboot image
kkasperczyk-no Sep 13, 2023
56d117d
bootloader: bl_boot: update UART Kconfigs
eivindj-nordic Sep 7, 2023
f845fd1
applications: nrf_desktop: Disable GPIO ISR support in MCUboot
MarekPieta Sep 12, 2023
36398c7
applications: nrf_desktop: Use minimal libc for child images
MarekPieta Sep 12, 2023
93a7c4c
applications: nrf_desktop: Remove nrf52820 from quarantine
MarekPieta Sep 12, 2023
f8f2cfb
applications: nrf_desktop: Use minimal libc by default
MarekPieta Sep 13, 2023
a6af3e7
applications: nrf_desktop: Allow MCUboot to enable USB composite device
MarekPieta Sep 13, 2023
3f0fb68
applications: Update usage of k_mem_slab_free
MarkusLassila Sep 13, 2023
c7fcfc3
treewide: Force MCUboot to use Minimal C lib instead of Picolib
de-nordic Sep 13, 2023
18ff3bc
lib/edge_impulse/CMake: Ensure EI_URI is string
nvlsianpu Sep 15, 2023
af1ec68
applications: nrf5340_audio: Changes for upmerge
koffes Sep 4, 2023
5764248
lib: nrf_modem: lte_conn: include implementation header
eivindj-nordic Sep 18, 2023
ced6252
treewide: main requires int type
de-nordic Sep 22, 2023
d294396
bluetooth: rpc: Fix bt_conn_foreach declaration
de-nordic Sep 26, 2023
fc1aed8
tests: event_manager_proxy: Remove unneded Kconfig setting
de-nordic Sep 26, 2023
00d0aa5
tests: emds: Select CONFIG_CRC
de-nordic Sep 26, 2023
00f6575
lib: date_time: Use native system time.h when for native posix
de-nordic Sep 26, 2023
8fa6f7f
cmake: adjust PM related CMake variables to global properties
tejlmand Sep 27, 2023
594b7b9
lib: location: Use native system time.h when for native posix
de-nordic Sep 26, 2023
b03f2ff
samples: bluetooth: peripheral_mds: Disable LOG_PRINTK
de-nordic Sep 28, 2023
df16f75
samples/matter: Add bootutil for image definitions
de-nordic Sep 28, 2023
da2d601
tests: lib: edge_impulse: Add edge_impulse.ei_wrapper to quarantine
katgiadla Sep 29, 2023
0fe4020
samples: wifi: twt: Replace arrays to function calls
kapbh Sep 28, 2023
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
3 changes: 3 additions & 0 deletions applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9160dk_nrf9160_0_14_0.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
CONFIG_MULTITHREADING=y
CONFIG_MAIN_STACK_SIZE=2048
CONFIG_BOOT_MAX_IMG_SECTORS=256

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
3 changes: 3 additions & 0 deletions applications/asset_tracker_v2/child_image/mcuboot/boards/nrf9161dk_nrf9161.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ CONFIG_PM_OVERRIDE_EXTERNAL_DRIVER_CHECK=y
CONFIG_MULTITHREADING=y
CONFIG_MAIN_STACK_SIZE=2048
CONFIG_BOOT_MAX_IMG_SECTORS=256

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
2 changes: 1 addition & 1 deletion applications/connectivity_bridge/src/modules/ble_handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ static bool app_event_handler(const struct app_event_header *aeh)
cast_ble_data_event(aeh);

/* All subscribers have gotten a chance to copy data at this point */
k_mem_slab_free(&ble_rx_slab, (void **) &event->buf);
k_mem_slab_free(&ble_rx_slab, (void *)event->buf);

return false;
}
Expand Down
2 changes: 1 addition & 1 deletion applications/connectivity_bridge/src/modules/uart_handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ static void uart_rx_buf_unref(void *buf)

/* ref_counter is the uart_buf->ref_counter value prior to decrement */
if (ref_counter == 1) {
k_mem_slab_free(&uart_rx_slab, (void **)&uart_buf);
k_mem_slab_free(&uart_rx_slab, (void *)uart_buf);
}
}

Expand Down
4 changes: 2 additions & 2 deletions applications/connectivity_bridge/src/modules/usb_cdc_handler.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ static void cdc_uart_interrupt_handler(const struct device *dev, void *user_data
event->len = data_length;
APP_EVENT_SUBMIT(event);
} else {
k_mem_slab_free(&cdc_rx_slab, &rx_buf);
k_mem_slab_free(&cdc_rx_slab, rx_buf);
}
}
}
Expand Down Expand Up @@ -207,7 +207,7 @@ static bool app_event_handler(const struct app_event_header *aeh)
cast_cdc_data_event(aeh);

/* All subscribers have gotten a chance to copy data at this point */
k_mem_slab_free(&cdc_rx_slab, (void **) &event->buf);
k_mem_slab_free(&cdc_rx_slab, (void *)event->buf);

return true;
}
Expand Down
3 changes: 3 additions & 0 deletions ...ions/machine_learning/configuration/nrf5340dk_nrf5340_cpuapp/child_image/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,6 @@ CONFIG_FLASH_SIMULATOR_STATS=n
# Enable custom command to erase settings partition.
CONFIG_ENABLE_MGMT_PERUSER=y
CONFIG_BOOT_MGMT_CUSTOM_STORAGE_ERASE=y

# Use minimal C library instead of the Picolib
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

btw. Should also we update also MCUboot used by Thingy:53 (needs change in the sdk-mcuboot) or we allow it to switch to picolibc?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO everything MCUboot should be set to MINI, but I have seen that some of provided commits skip things like 7002.

CONFIG_MINIMAL_LIBC=y
4 changes: 2 additions & 2 deletions applications/machine_learning/src/modules/ei_data_forwarder_bt_nus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ static void clean_buffered_data(void)
while ((node = sys_slist_get(&send_queue))) {
struct ei_data_packet *packet = CONTAINER_OF(node, __typeof__(*packet), node);

k_mem_slab_free(&buf_slab, (void **)&packet);
k_mem_slab_free(&buf_slab, (void *)packet);
}
}

Expand Down Expand Up @@ -205,7 +205,7 @@ static void send_queued_fn(struct k_work *w)
pipeline_cnt++;
}

k_mem_slab_free(&buf_slab, (void **)&packet);
k_mem_slab_free(&buf_slab, (void *)packet);
}
}

Expand Down
3 changes: 3 additions & 0 deletions applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
#

CONFIG_GPIO=y

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
3 changes: 3 additions & 0 deletions applications/matter_bridge/child_image/mcuboot/boards/nrf7002dk_nrf5340_cpuapp_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@
#

CONFIG_GPIO=y

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
3 changes: 3 additions & 0 deletions applications/matter_bridge/child_image/mcuboot/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ CONFIG_SERIAL=n
CONFIG_UART_CONSOLE=n
CONFIG_USE_SEGGER_RTT=n
CONFIG_GPIO=n

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
3 changes: 3 additions & 0 deletions applications/matter_bridge/child_image/mcuboot/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,6 @@ CONFIG_SERIAL=n
CONFIG_UART_CONSOLE=n
CONFIG_USE_SEGGER_RTT=n
CONFIG_GPIO=n

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
3 changes: 3 additions & 0 deletions applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,6 @@ CONFIG_USB_DEVICE_PRODUCT="Thingy:53 Matter Weather"
CONFIG_USB_DEVICE_PID=0x530D
CONFIG_UART_LINE_CTRL=y
CONFIG_SHELL_BACKEND_SERIAL_INIT_PRIORITY=51

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
3 changes: 3 additions & 0 deletions applications/matter_weather_station/configuration/thingy53_nrf5340_cpuapp/prj_release.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,6 @@ CONFIG_ASSERT_NO_FILE_INFO=y

# Disable USB CDC ACM
CONFIG_BOARD_SERIAL_BACKEND_CDC_ACM=n

# Use minimal C library instead of the Picolib
CONFIG_MINIMAL_LIBC=y
4 changes: 4 additions & 0 deletions applications/nrf5340_audio/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ config TRANSPORT_CIS

endchoice

config ZBUS_RUNTIME_OBSERVERS_POOL_SIZE
int "Number of zbus observers"
default 6

#----------------------------------------------------------------------------#
rsource "Kconfig.defaults"
rsource "src/audio/Kconfig"
Expand Down
4 changes: 2 additions & 2 deletions applications/nrf5340_audio/Kconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ config NFCT_PINS_AS_GPIOS
config ZBUS
default y

config ZBUS_RUNTIME_OBSERVERS_POOL_SIZE
default 6
config ZBUS_RUNTIME_OBSERVERS
default y

config SENSOR
default y
Expand Down
5 changes: 3 additions & 2 deletions applications/nrf5340_audio/include/nrf5340_audio_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ enum le_audio_evt_type {
LE_AUDIO_EVT_PRES_DELAY_SET,
LE_AUDIO_EVT_STREAMING,
LE_AUDIO_EVT_NOT_STREAMING,
LE_AUDIO_EVT_PA_SYNC_LOST,
LE_AUDIO_EVT_SYNC_LOST,
LE_AUDIO_EVT_NO_VALID_CFG,
};

Expand All @@ -45,7 +45,8 @@ enum bt_mgmt_evt_type {
BT_MGMT_DISCONNECTED,
BT_MGMT_SECURITY_CHANGED,
BT_MGMT_EXT_ADV_READY,
BT_MGMT_PA_SYNC_OBJECT_READY,
BT_MGMT_PA_SYNCED,
BT_MGMT_PA_SYNC_LOST,
};

struct bt_mgmt_msg {
Expand Down
1 change: 1 addition & 0 deletions applications/nrf5340_audio/prj.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ CONFIG_LOG=y
CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
CONFIG_LOG_TAG_MAX_LEN=2
CONFIG_LOG_TAG_DEFAULT="--"
CONFIG_LOG_BACKEND_UART=y

# Console related defines
CONFIG_CONSOLE=y
Expand Down
2 changes: 1 addition & 1 deletion applications/nrf5340_audio/src/audio/audio_datapath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ static void audio_datapath_i2s_blk_complete(uint32_t frame_start_ts, uint32_t *r
K_NO_WAIT);
ERR_CHK(ret);

data_fifo_block_free(ctrl_blk.in.fifo, &data);
data_fifo_block_free(ctrl_blk.in.fifo, data);

ret = data_fifo_pointer_first_vacant_get(ctrl_blk.in.fifo, (void **)&rx_buf,
K_NO_WAIT);
Expand Down
6 changes: 3 additions & 3 deletions applications/nrf5340_audio/src/audio/audio_system.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static void encoder_thread(void *arg1, void *arg2, void *arg3)
memcpy(pcm_raw_data + (i * BLOCK_SIZE_BYTES), tmp_pcm_raw_data[i],
pcm_block_size);

data_fifo_block_free(&fifo_rx, &tmp_pcm_raw_data[i]);
data_fifo_block_free(&fifo_rx, tmp_pcm_raw_data[i]);
}

if (sw_codec_cfg.encoder.enabled) {
Expand Down Expand Up @@ -227,7 +227,7 @@ int audio_decode(void const *const encoded_data, size_t encoded_data_size, bool
break;
}

data_fifo_block_free(&fifo_tx, &old_data);
data_fifo_block_free(&fifo_tx, old_data);
}
}

Expand Down Expand Up @@ -363,7 +363,7 @@ int audio_system_fifo_rx_block_drop(void)
return -ECANCELED;
}

data_fifo_block_free(&fifo_rx, &temp);
data_fifo_block_free(&fifo_rx, temp);

LOG_DBG("Block dropped");
return 0;
Expand Down
45 changes: 38 additions & 7 deletions applications/nrf5340_audio/src/audio/streamctrl.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ static void le_audio_rx_data_handler(uint8_t const *const p_data, size_t data_si
K_NO_WAIT);
ERR_CHK(ret);

data_fifo_block_free(&ble_fifo_rx, &stale_data);
data_fifo_block_free(&ble_fifo_rx, stale_data);
}

ret = data_fifo_pointer_first_vacant_get(&ble_fifo_rx, (void *)&iso_received, K_NO_WAIT);
Expand Down Expand Up @@ -185,7 +185,7 @@ static void audio_datapath_thread(void *dummy1, void *dummy2, void *dummy3)
iso_received->sdu_ref, iso_received->bad_frame,
iso_received->recv_frame_ts);
#endif /* ((CONFIG_AUDIO_DEV == GATEWAY) && (CONFIG_AUDIO_SOURCE_USB)) */
data_fifo_block_free(&ble_fifo_rx, (void *)&iso_received);
data_fifo_block_free(&ble_fifo_rx, (void *)iso_received);

STACK_USAGE_PRINT("audio_datapath_thread", &audio_datapath_thread_data);
}
Expand Down Expand Up @@ -469,13 +469,23 @@ static void le_audio_msg_sub_thread(void)

break;

case LE_AUDIO_EVT_PA_SYNC_LOST:
LOG_DBG("PA sync lost");
case LE_AUDIO_EVT_SYNC_LOST:
LOG_INF("Sync lost");

if (strm_state == STATE_STREAMING) {
stream_state_set(STATE_PAUSED);
audio_system_stop();
ret = led_on(LED_APP_1_BLUE);
ERR_CHK(ret);
}

if (IS_ENABLED(CONFIG_BT_OBSERVER)) {
ret = bt_mgmt_scan_start(0, 0, BT_MGMT_SCAN_TYPE_BROADCAST, NULL);
if (ret) {
LOG_ERR("Failed to restart scanning: %d", ret);
if (ret != -EALREADY) {
LOG_ERR("Failed to restart scanning: %d", ret);
}

break;
}

Expand Down Expand Up @@ -616,15 +626,36 @@ static void bt_mgmt_evt_handler(const struct zbus_channel *chan)

break;

case BT_MGMT_PA_SYNC_OBJECT_READY:
LOG_INF("PA sync object ready");
case BT_MGMT_PA_SYNCED:
LOG_INF("PA synced");

ret = le_audio_pa_sync_set(msg->pa_sync, msg->broadcast_id);
if (ret) {
LOG_WRN("Failed to set PA sync");
}

break;

case BT_MGMT_PA_SYNC_LOST:
LOG_INF("PA sync lost");

if (IS_ENABLED(CONFIG_BT_OBSERVER)) {
ret = bt_mgmt_scan_start(0, 0, BT_MGMT_SCAN_TYPE_BROADCAST, NULL);
if (ret) {
if (ret == -EALREADY) {
return;
}

LOG_ERR("Failed to restart scanning: %d", ret);
break;
}

/* NOTE: The string below is used by the Nordic CI system */
LOG_INF("Restarted scanning for broadcaster");
}

break;

default:
LOG_WRN("Unexpected/unhandled bt_mgmt event: %d", event);

Expand Down
15 changes: 12 additions & 3 deletions applications/nrf5340_audio/src/bluetooth/Kconfig.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ config BT_ECC
config BT_EXT_ADV
default y

config BT_DEVICE_NAME
default "NRF5340_AUDIO"

# Mandatory to support at least 1 for ASCS
config BT_ATT_PREPARE_COUNT
default 1

config ZBUS_RUNTIME_OBSERVERS
default y

if TRANSPORT_CIS # Depends on TRANSPORT_CIS

config BT_GATT_CLIENT
Expand Down Expand Up @@ -225,12 +225,18 @@ config BT_ISO_SYNC_RECEIVER
config BT_BAP_BROADCAST_SINK
default y

config BT_ISO_MAX_BIG
default 2

config BT_BAP_SCAN_DELEGATOR
default y

config BT_BAP_BROADCAST_SNK_STREAM_COUNT
default 2

config BT_BAP_BROADCAST_SNK_COUNT
default 2

config BT_ISO_MAX_CHAN
default 2

Expand All @@ -243,6 +249,9 @@ config BT_PAC_SNK
config BT_AUDIO_RX
default y

config BT_PER_ADV_SYNC_MAX
default 2

endif # AUDIO_DEV = 1 (HEADSET)

# GATEWAY
Expand Down
Loading
Loading