Index: conf/distro/ely.conf
===================================================================
diff -u -r4a5e4f589daf7be8828cc50ce1eb5826989c5b7c -r5fd42022e653642650885cb5403d25f25ea1fe11
--- conf/distro/ely.conf	(.../ely.conf)	(revision 4a5e4f589daf7be8828cc50ce1eb5826989c5b7c)
+++ conf/distro/ely.conf	(.../ely.conf)	(revision 5fd42022e653642650885cb5403d25f25ea1fe11)
@@ -3,14 +3,15 @@
 # Discrete version values.
 YOCTO_MAJOR = "5"
 YOCTO_MINOR = "0"
-# DEY_RELEASE = "6"
-# DEY_BUILD   = "2"
 
+DEY_RELEASE = "2"
+DEY_BUILD   = "2"
+
 ELY_RELEASE = "0"
 ELY_BUILD   = "2"
 
 # Firmware version of the system.
-DEY_FIRMWARE_VERSION ?= "${YOCTO_MAJOR}.${YOCTO_MINOR}.${ELY_RELEASE}.${ELY_BUILD}"
+DEY_FIRMWARE_VERSION ?= "${YOCTO_MAJOR}.${YOCTO_MINOR}.${DEY_RELEASE}.${DEY_BUILD}"
 
 # Distribution info.
 DISTRO = "ely"
@@ -38,26 +39,32 @@
 
 # Recovery initramfs image name.
 RECOVERY_INITRAMFS_IMAGE ?= "dey-image-recovery-initramfs"
+# Add initramfs into FIT image
+INITRAMFS_IMAGE = '${@bb.utils.contains("KERNEL_IMAGETYPE", "fitImage", "${RECOVERY_INITRAMFS_IMAGE}", "", d)}'
 
 # DEY image features (alphabetical order)
 FEATURE_PACKAGES_dey-audio      = "packagegroup-dey-audio"
 FEATURE_PACKAGES_dey-bluetooth  = "packagegroup-dey-bluetooth"
-FEATURE_PACKAGES_dey-crank      = "packagegroup-dey-crank"
 FEATURE_PACKAGES_dey-debug      = "packagegroup-dey-debug"
 FEATURE_PACKAGES_dey-examples   = "packagegroup-dey-examples"
 FEATURE_PACKAGES_dey-gstreamer  = "packagegroup-dey-gstreamer"
-FEATURE_PACKAGES_dey-lvgl       = "packagegroup-dey-lvgl"
 FEATURE_PACKAGES_dey-network    = "packagegroup-dey-network"
 FEATURE_PACKAGES_dey-qt         = "packagegroup-dey-qt"
 FEATURE_PACKAGES_dey-trustfence = "packagegroup-dey-trustfence"
 FEATURE_PACKAGES_dey-webkit     = "packagegroup-dey-webkit"
 FEATURE_PACKAGES_dey-wireless   = "packagegroup-dey-wireless"
 
-# There's a generic opencl-headers recipe in the thud branch of
-# meta-openembedded, but we should use the package provided by the imx-gpu-viv
-# recipe in case there are NXP-specific changes in it
-PREFERRED_PROVIDER_opencl-headers ?= "imx-gpu-viv"
+# Our layer only provides version 5.41, which we want to keep because
+# it was used for Bluetooth certification. However by default the newer
+# 5.72 version should be used, which is provided by the poky layer.
+PREFERRED_VERSION_bluez5 ?= "5.72"
 
+# Latest version of libgpiod (2.1.1) breaks API compatibility with previously
+# used version 1.6.3, causing libdigiapix compilation errors. Until we port
+# libdigiapix to 2.1.1, use 1.6.4 instead, which is also available in poky to
+# ensure compatibility with the old API.
+PREFERRED_VERSION_libgpiod ?= "1.6.4"
+
 # Use the FDO backend for WPE WebKit
 PREFERRED_PROVIDER_virtual/wpebackend = "wpebackend-fdo"