Trim old formula

Kconfig.nrf

@@ -80,10 +80,6 @@ config MCUMGR_TRANSPORT_NETBUF_SIZE
 	default 2475 if MCUMGR_TRANSPORT_BT_REASSEMBLY
 	default 1024 if UPDATEABLE_IMAGE_NUMBER > 1
 
-# When using HCI on the nRF5340 we need a larger command buffer.
-config BT_BUF_CMD_TX_COUNT
-	default 10 if SOC_COMPATIBLE_NRF5340_CPUAPP || SOC_COMPATIBLE_NRF5340_CPUNET
-
 config INIT_ARCH_HW_AT_BOOT
 	default y
 	help
@@ -104,9 +100,6 @@ config NORDIC_QSPI_NOR_FLASH_LAYOUT_PAGE_SIZE
 	  chosen Zephyr flash devicetree node to ensure that swapping can be
 	  performed.
 
-config GETOPT
-	default n
-
 # Temporary hack to be able to build samples and tests on the nRF51L15/nRF54L09 Eng A/nRF54L20 Eng A/nRF7120 FLPR core
 config FLASH_BASE_ADDRESS
 	hex

applications/connectivity_bridge/boards/thingy91_nrf52840.conf

@@ -18,6 +18,7 @@ CONFIG_BT_NUS=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_SMP=y
 CONFIG_BT_CTLR_RX_BUFFERS=10
+CONFIG_BT_BUF_EVT_RX_COUNT=11
 CONFIG_BT_BUF_ACL_TX_COUNT=10
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251
@@ -37,4 +38,7 @@ CONFIG_DP_DRIVER=y
 CONFIG_CMSIS_DAP_DEVICE_VENDOR="Nordic Semiconductor ASA"
 CONFIG_CMSIS_DAP_DEVICE_NAME="nrf91"
 
-CONFIG_USB_CDC_ACM_RINGBUF_SIZE=15360
+CONFIG_USB_CDC_ACM_RINGBUF_SIZE=12280
+
+# Reduce logging to save flash space
+CONFIG_LOG_MAX_LEVEL=1

applications/connectivity_bridge/boards/thingy91x_nrf5340_cpuapp.conf

@@ -17,6 +17,7 @@ CONFIG_BT_BUF_ACL_RX_SIZE=251
 CONFIG_BT_NUS=y
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_SMP=y
+CONFIG_BT_BUF_EVT_RX_COUNT=11
 CONFIG_BT_BUF_ACL_TX_COUNT=10
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_CTLR_DATA_LENGTH_MAX=251

applications/nrf_desktop/src/modules/usb_state.c

@@ -1137,13 +1137,15 @@ static uint32_t get_idle_next(const struct device *dev, const uint8_t id)
 	return usb_hid->idle_duration[id];
 }
 
-static void report_sent_cb_next(const struct device *dev)
+static void report_sent_cb_next(const struct device *dev, const uint8_t *report)
 {
 	struct usb_hid_device *usb_hid = dev_to_usb_hid(dev);
 	struct usb_hid_buf *buf = usb_hid_buf_find(usb_hid, USB_HID_BUF_SENDING);
 	/* USB next stack does not explicitly indicate failed transfers. */
 	bool error = !usb_hid->enabled;
 
+	ARG_UNUSED(report);
+
 	report_sent(usb_hid, buf, error);
 }
 

applications/serial_lte_modem/src/slm_ppp.c

@@ -14,6 +14,7 @@
 #include <modem/pdn.h>
 #include <zephyr/modem/ppp.h>
 #include <zephyr/modem/backend/uart.h>
+#include <zephyr/net/ethernet.h>
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/ppp.h>
 #include <zephyr/posix/sys/socket.h>
@@ -99,16 +100,17 @@ static bool open_ppp_sockets(void)
 {
 	int ret;
 
-	ppp_fds[ZEPHYR_FD_IDX] = zsock_socket(AF_PACKET, SOCK_RAW | SOCK_NATIVE,
-				        htons(IPPROTO_RAW));
+	ppp_fds[ZEPHYR_FD_IDX] = zsock_socket(AF_PACKET, SOCK_DGRAM | SOCK_NATIVE,
+					      htons(ETH_P_ALL));
 	if (ppp_fds[ZEPHYR_FD_IDX] < 0) {
 		LOG_ERR("Zephyr socket creation failed (%d).", errno);
 		return false;
 	}
 
 	ppp_zephyr_dst_addr = (struct sockaddr_ll){
 		.sll_family = AF_PACKET,
-		.sll_ifindex = net_if_get_by_iface(ppp_iface)
+		.sll_ifindex = net_if_get_by_iface(ppp_iface),
+		.sll_protocol = htons(ETH_P_ALL),
 	};
 	ret = zsock_bind(ppp_fds[ZEPHYR_FD_IDX],
 		   (const struct sockaddr *)&ppp_zephyr_dst_addr, sizeof(ppp_zephyr_dst_addr));
@@ -658,6 +660,19 @@ static void ppp_data_passing_thread(void*, void*, void*)
 			void *dst_addr = (dst == MODEM_FD_IDX) ? NULL : &ppp_zephyr_dst_addr;
 			socklen_t addrlen = (dst == MODEM_FD_IDX) ? 0 : sizeof(ppp_zephyr_dst_addr);
 
+			if (dst == ZEPHYR_FD_IDX) {
+				uint8_t type = ppp_data_buf[0] & 0xf0;
+
+				if (type == 0x60) {
+					ppp_zephyr_dst_addr.sll_protocol = htons(ETH_P_IPV6);
+				} else if (type == 0x40) {
+					ppp_zephyr_dst_addr.sll_protocol = htons(ETH_P_IP);
+				} else {
+					/* Not IP traffic, ignore. */
+					continue;
+				}
+			}
+
 			send_ret =
 				zsock_sendto(fds[dst].fd, ppp_data_buf, len, 0, dst_addr, addrlen);
 			if (send_ret == -1) {

dts/common/nordic/nrf7120_enga.dtsi

@@ -265,7 +265,6 @@
 				compatible = "nordic,nrf-timer";
 				reg = <0x55000 0x1000>;
 				interrupts = <85 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(256)>;
 				cc-num = <6>;
 				max-bit-width = <32>;
 				prescaler = <0>;
@@ -314,7 +313,6 @@
 				compatible = "nordic,nrf-timer";
 				reg = <0x85000 0x1000>;
 				interrupts = <133 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(32)>;
 				cc-num = <8>;
 				max-bit-width = <32>;
 				prescaler = <0>;
@@ -495,7 +493,6 @@
 				compatible = "nordic,nrf-timer";
 				reg = <0xca000 0x1000>;
 				interrupts = <202 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(16)>;
 				cc-num = <6>;
 				max-bit-width = <32>;
 				prescaler = <0>;
@@ -506,7 +503,6 @@
 				compatible = "nordic,nrf-timer";
 				reg = <0xcb000 0x1000>;
 				interrupts = <203 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(16)>;
 				cc-num = <6>;
 				max-bit-width = <32>;
 				prescaler = <0>;
@@ -517,7 +513,6 @@
 				compatible = "nordic,nrf-timer";
 				reg = <0xcc000 0x1000>;
 				interrupts = <204 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(16)>;
 				cc-num = <6>;
 				max-bit-width = <32>;
 				prescaler = <0>;
@@ -528,7 +523,6 @@
 				compatible = "nordic,nrf-timer";
 				reg = <0xcd000 0x1000>;
 				interrupts = <205 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(16)>;
 				cc-num = <6>;
 				max-bit-width = <32>;
 				prescaler = <0>;
@@ -539,7 +533,6 @@
 				compatible = "nordic,nrf-timer";
 				reg = <0xce000 0x1000>;
 				interrupts = <206 NRF_DEFAULT_IRQ_PRIORITY>;
-				max-frequency = <DT_FREQ_M(16)>;
 				cc-num = <6>;
 				max-bit-width = <32>;
 				prescaler = <0>;

ext/curl/Kconfig

@@ -10,7 +10,7 @@ config NRF_CURL_PROMPTLESS
 
 config NRF_CURL
 	bool "Curl" if !NRF_CURL_PROMPTLESS
-	depends on POSIX_API && !PTHREAD_IPC && NEWLIB_LIBC
+	depends on POSIX_API && NEWLIB_LIBC
 	imply NEWLIB_LIBC_FLOAT_PRINTF
 	help
 	  Curl support for NRF.

ext/iperf3/Kconfig

@@ -12,7 +12,7 @@ config NRF_IPERF3_PROMPTLESS
 
 config  NRF_IPERF3
 	bool "Iperf3 NRF integration" if !NRF_IPERF3_PROMPTLESS
-	depends on POSIX_API && !PTHREAD_IPC && NEWLIB_LIBC && CJSON_LIB
+	depends on POSIX_API && NEWLIB_LIBC && CJSON_LIB
 	help
 	  Enable Iperf3 NRF integration
 

include/bluetooth/gatt_pool.h

@@ -112,7 +112,7 @@ extern "C" {
 #define BT_GATT_POOL_CCC(_gp, _ccc, _ccc_changed, _perm)                       \
 	do {                                                                   \
 		int _ret;                                                      \
-		_ccc = (struct _bt_gatt_ccc)BT_GATT_CCC_INITIALIZER(\
+		_ccc = (struct bt_gatt_ccc_managed_user_data)BT_GATT_CCC_MANAGED_USER_DATA_INIT(\
 			_ccc_changed, NULL, NULL);      \
 		_ret = bt_gatt_pool_ccc_alloc(_gp, &_ccc, _perm);              \
 		__ASSERT_NO_MSG(!_ret);                                        \
@@ -176,7 +176,7 @@ int bt_gatt_pool_desc_alloc(struct bt_gatt_pool *gp,
  *  @return 0 or negative error code.
  */
 int bt_gatt_pool_ccc_alloc(struct bt_gatt_pool *gp,
-			   struct _bt_gatt_ccc *ccc,
+			   struct bt_gatt_ccc_managed_user_data *ccc,
 			   uint8_t perm);
 
 /** @brief Free the whole dynamically created GATT service.

include/bluetooth/services/hids.h

@@ -191,7 +191,7 @@ typedef void (*bt_hids_rep_handler_t) (struct bt_hids_rep *rep,
  */
 struct bt_hids_inp_rep {
 	/** CCC descriptor. */
-	struct _bt_gatt_ccc ccc;
+	struct bt_gatt_ccc_managed_user_data ccc;
 
 	/** Report ID defined in the HIDS Report Map. */
 	uint8_t id;
@@ -288,7 +288,7 @@ struct bt_hids_outp_feat_rep {
  */
 struct bt_hids_boot_mouse_inp_rep {
 	/** CCC descriptor. */
-	struct _bt_gatt_ccc ccc;
+	struct bt_gatt_ccc_managed_user_data ccc;
 
 	/** Index in the service attribute array. */
 	uint8_t att_ind;
@@ -301,7 +301,7 @@ struct bt_hids_boot_mouse_inp_rep {
  */
 struct bt_hids_boot_kb_inp_rep {
 	/** CCC descriptor. */
-	struct _bt_gatt_ccc ccc;
+	struct bt_gatt_ccc_managed_user_data ccc;
 
 	/** Index in the service attribute array. */
 	uint8_t att_ind;

include/dfu/dfu_target_smp.h

@@ -16,6 +16,7 @@
 
 #include <stddef.h>
 #include <dfu/dfu_target.h>
+#include <zephyr/mgmt/mcumgr/mgmt/mgmt.h>
 #include <zephyr/mgmt/mcumgr/grp/img_mgmt/img_mgmt_client.h>
 
 #ifdef __cplusplus

lib/edge_impulse/ei_wrapper.cpp

@@ -347,7 +347,7 @@ static void edge_impulse_thread_fn(void)
 		}
 
 		if (err) {
-			LOG_ERR("run_classifier err=%d", err);
+			LOG_ERR("run_classifier err=%d", (int)err);
 		}
 
 		processing_finished(err);