build: make FOTA the default firmware layout

.github/workflows/build_firmware.yaml

@@ -93,8 +93,7 @@ jobs:
           # using VSCode + Nordic Plugins
           west build \
             --board openearable_v2/nrf5340/cpuapp \
-            --pristine=always open-earable-v2 \
-            -- -DFILE_SUFFIX="fota"
+            --pristine=always open-earable-v2
           # print detailed ccache statistics
           ccache -sv
 

CMakeLists.txt

@@ -1,9 +1,3 @@
-#
-# Copyright (c) 2022 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
-#
-
 cmake_minimum_required(VERSION 3.20.0)
 
 # Flag which defines whether application is compiled as gateway/dongle or headset
@@ -14,9 +8,8 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
 project(openearable_v2_1)
 
-#set(OVERLAY_CONFIG 
-#    ${CMAKE_CURRENT_SOURCE_DIR}/unicast_server/overlay-unicast_server.conf
-#)
+# Suppress -Wwrite-strings from Zephyr SDK headers that we cannot fix.
+add_compile_options(-Wno-write-strings)
 
 string(TIMESTAMP NRF5340_AUDIO_CORE_APP_COMP_DATE "%a %b %d %H:%M:%S %Y")
 
@@ -27,24 +20,17 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/utils/fw_info_app.c.in"
 
 # Target sources below are specific to the nRF5340 Audio DK HW
 target_sources(app PRIVATE
-#    src/openearable_common.c
+    src/main.cpp
     ${CMAKE_BINARY_DIR}/fw_info_app.c
     )
 
-if (CONFIG_BT_BAP_BROADCAST_SINK)
-	add_subdirectory(broadcast_sink)
-endif()
-
-if (CONFIG_BT_BAP_UNICAST_SERVER)
-	add_subdirectory(unicast_server)
-endif()
-
 
 # Include application events and configuration headers
 zephyr_library_include_directories(
     include
     src/audio
     src/Battery
+    src/buttons
     src/Wire
     src/bluetooth
     src/drivers
@@ -88,3 +74,8 @@ endif()
 
 include(version.cmake)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
+
+# New USB device stack sample init (provides sample_usbd_init_device)
+if(CONFIG_USB_DEVICE_STACK_NEXT)
+    include(${ZEPHYR_BASE}/samples/subsys/usb/common/common.cmake)
+endif()

Kconfig

@@ -1,9 +1,3 @@
-#
-# Copyright (c) 2018 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
-#
-
 menuconfig NRF5340_AUDIO
 	 bool "nRF5340 Audio [EXPERIMENTAL]"
 	 select EXPERIMENTAL
@@ -38,23 +32,6 @@ config TRANSPORT_CIS
 
 endchoice
 
-#----------------------------------------------------------------------------#
-# if (TRANSPORT_BIS && AUDIO_DEV = 1)
-# rsource "broadcast_sink/Kconfig.defaults"
-# endif # TRANSPORT_BIS && AUDIO_DEV = 1
-
-# if (TRANSPORT_BIS && AUDIO_DEV = 2)
-# rsource "broadcast_source/Kconfig.defaults"
-# endif # TRANSPORT_BIS && AUDIO_DEV = 2
-
-# if (TRANSPORT_CIS && AUDIO_DEV = 1)
-rsource "unicast_server/Kconfig.defaults"
-# endif # TRANSPORT_CIS && AUDIO_DEV = 1
-
-# if (TRANSPORT_CIS && AUDIO_DEV = 2)
-# rsource "unicast_client/Kconfig.defaults"
-# endif # TRANSPORT_CIS && AUDIO_DEV = 2
-
 rsource "Kconfig.defaults"
 rsource "src/audio/Kconfig"
 rsource "src/bluetooth/Kconfig"
@@ -81,4 +58,6 @@ endmenu # Log levels
 #----------------------------------------------------------------------------#
 endif # NRF5340_AUDIO
 
+rsource "$(ZEPHYR_BASE)/samples/subsys/usb/common/Kconfig.sample_usbd"
+
 source "Kconfig.zephyr"

Kconfig.defaults

@@ -1,9 +1,3 @@
-#
-# Copyright (c) 2022 Nordic Semiconductor ASA
-#
-# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
-#
-
 config REBOOT
 	default y
 
@@ -126,3 +120,112 @@ config WATCHDOG
 
 config TASK_WDT
 	default y
+
+# Bluetooth Audio / Unicast Server defaults
+config BT_GATT_AUTO_DISCOVER_CCC
+	default y
+
+config BT_GATT_AUTO_RESUBSCRIBE
+	default n
+
+config BT_GATT_AUTO_SEC_REQ
+	default n
+
+config BT_GATT_AUTO_UPDATE_MTU
+	default y
+
+config BT_GATT_CACHING
+	default n
+
+config BT_GATT_CLIENT
+	default y
+
+config BT_GATT_DYNAMIC_DB
+	default y
+
+config BT_MAX_CONN
+	default 4
+
+config BT_MAX_PAIRED
+	default 4
+
+config BT_EXT_ADV
+	default y
+
+config BT_AUDIO
+	default y
+
+config BT_PERIPHERAL
+	default y
+
+config BT_ISO_PERIPHERAL
+	default y
+
+config BT_BAP_UNICAST_SERVER
+	default y
+
+config BT_CAP_ACCEPTOR
+	default y
+
+config BT_CAP_ACCEPTOR_SET_MEMBER
+	default y
+
+config BT_PAC_SNK
+	default y
+
+config BT_PAC_SNK_NOTIFIABLE
+	default y
+
+config BT_PAC_SRC
+	default y
+
+config BT_PAC_SRC_NOTIFIABLE
+	default y
+
+config BT_CSIP_SET_MEMBER
+	default y
+
+config BT_DEVICE_APPEARANCE
+	default 2369
+
+config BT_ISO_MAX_CHAN
+	default 2
+
+config BT_ASCS
+	default y
+
+config BT_ASCS_MAX_ASE_SNK_COUNT
+	default 1
+
+config BT_ASCS_MAX_ASE_SRC_COUNT
+	default 1
+
+config BT_VCP_VOL_REND
+	default y
+
+config BT_MCC
+	default y
+
+config BT_MCC_READ_MEDIA_STATE
+	default y
+
+config BT_MCC_SET_MEDIA_CONTROL_POINT
+	default y
+
+config BT_GAP_PERIPHERAL_PREF_PARAMS
+	default n
+
+config BT_AUDIO_CODEC_CFG_MAX_METADATA_SIZE
+	default 25
+
+config LC3_ENC_CHAN_MAX
+	default 1
+
+config LC3_DEC_CHAN_MAX
+	default 1
+
+config MBEDTLS_ENABLE_HEAP
+	default y
+
+config MBEDTLS_HEAP_SIZE
+	default 2048

Kconfig.sysbuild

@@ -1,9 +1,3 @@
-#
-# Copyright (c) 2024 Nordic Semiconductor
-#
-# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
-#
-
 config NRF_DEFAULT_IPC_RADIO
 	default y
 

VERSION

@@ -1,5 +1,5 @@
 VERSION_MAJOR = 2
 VERSION_MINOR = 2
-PATCHLEVEL = 2
+PATCHLEVEL = 104 
 VERSION_TWEAK = 0
-EXTRAVERSION =
+EXTRAVERSION =

boards/openearable_v2_nrf5340_cpuapp.overlay

@@ -0,0 +1,35 @@
+/ {
+	chosen {
+		nordic,pm-ext-flash = &mx25r64;
+	};
+};
+
+&qspi {
+	status = "disabled";
+};
+
+&spi4 {
+	cs-gpios = <&gpio0 11 GPIO_ACTIVE_LOW>,<&gpio1 1 GPIO_ACTIVE_LOW>;
+	status = "okay";
+	mx25r64: mx25r6435f@1 {
+		compatible = "jedec,spi-nor";
+		reg = <1>;
+		spi-max-frequency = <32000000>;
+
+		jedec-id = [c2 28 17];
+		sfdp-bfp = [
+			e5 20 f1 ff  ff ff ff 03  44 eb 08 6b  08 3b 04 bb
+			ee ff ff ff  ff ff 00 ff  ff ff 00 ff  0c 20 0f 52
+			10 d8 00 ff  23 72 f5 00  82 ed 04 cc  44 83 68 44
+			30 b0 30 b0  f7 c4 d5 5c  00 be 29 ff  f0 d0 ff ff
+		];
+		size = <67108864>;
+		has-dpd;
+		t-enter-dpd = <10000>;
+		t-exit-dpd = <5000>;
+		dpd-wakeup-sequence = <30000 20 45000>;
+		mxicy,mx25r-power-mode = "high-performance";
+
+		zephyr,pm-device-runtime-auto;
+	};
+};

boards/teco/openearable_v2/CMakeLists.txt

@@ -1,8 +1,7 @@
-
 if ((CONFIG_BOARD_OPENEARABLE_V2_NRF5340_CPUAPP OR CONFIG_BOARD_OPENEARABLE_V2_NRF5340_CPUAPP_NS) AND NOT CONFIG_MCUBOOT)
     zephyr_library()
     zephyr_library_sources(board_init.c)
-    # openearable_v2_nrf5340_cpunet_reset
+    zephyr_library_include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../../include) # For openearable_common.h
 endif()
 
 if((CONFIG_BOARD_OPENEARABLE_V2_NRF5340_CPUAPP OR CONFIG_BOARD_OPENEARABLE_V2_NRF5340_CPUAPP_NS) AND CONFIG_MCUBOOT)

boards/teco/openearable_v2/Kconfig

@@ -1,7 +1,4 @@
-# nRF5340 Audio DK board configuration
-
-# Copyright (c) 2019 Nordic Semiconductor ASA
-# SPDX-License-Identifier: Apache-2.0
+# OpenEarable v2 board configuration
 
 if BOARD_OPENEARABLE_V2_NRF5340_CPUAPP || BOARD_OPENEARABLE_V2_NRF5340_CPUAPP_NS