diff --git a/README.md b/README.md
index c0bb79b55..0b42bc669 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,10 @@ OS versions:
 
 Software for the following hardware platforms is in production support:
 
+## ConnectCore 91
+* ConnectCore 91 System-on-Module (SOM)
+  * [CC-WMX-XXXX-XX](https://www.digi.com/products/models/cc-wmx-yc7d-kn)
+
 ## ConnectCore 93
 * ConnectCore 93 System-on-Module (SOM)
   * [CC-WMX-YC7D-KN](https://www.digi.com/products/models/cc-wmx-yc7d-kn)
diff --git a/meta-digi-arm/conf/machine/ccimx91-dvk.conf b/meta-digi-arm/conf/machine/ccimx91-dvk.conf
new file mode 100644
index 000000000..823e31953
--- /dev/null
+++ b/meta-digi-arm/conf/machine/ccimx91-dvk.conf
@@ -0,0 +1,44 @@
+#@TYPE: Machine
+#@NAME: ConnectCore 91 Development Kit
+#@DESCRIPTION: Machine configuration for Digi's ConnectCore 91 DVK
+
+DIGI_SOM = "ccimx91"
+MACHINEOVERRIDES =. "mx91:${DIGI_FAMILY}:${DIGI_SOM}:"
+
+# Include the machine configuration for Digi's ConnectCore 9 module
+include conf/machine/include/ccimx9.inc
+
+IMXBOOT_TARGETS = "flash_singleboot"
+
+# U-Boot configurations
+UBOOT_CONFIG ??= "ccimx91-dvk"
+UBOOT_CONFIG[ccimx91-dvk] = "ccimx91-dvk_defconfig"
+
+BOOTLOADER_SEEK_USERDATA = "32"
+
+KERNEL_DEVICETREE ?= " \
+    digi/ccimx91-dvk.dtb \
+    digi/_ov_board_enet2_ccimx9-dvk.dtbo \
+    digi/_ov_board_mikroe-accel2-click_ccimx9-dvk.dtbo \
+    digi/_ov_board_mikroe-gyro-click_ccimx9-dvk.dtbo \
+    digi/_ov_som_bt_ccimx9.dtbo \
+    digi/_ov_som_bt-dtm_ccimx9.dtbo \
+    digi/_ov_som_wifi_ccimx9.dtbo \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'digi/_ov_board_eqos-tsn_ccimx9-dvk.dtbo', '', d)} \
+"
+
+# Boot artifacts to be copied from the deploy dir to the installer ZIP
+BOOTABLE_ARTIFACTS = " \
+    imx-boot-ccimx91-dvk.bin \
+"
+
+# Add secure enclave
+SOC_TOOLS_TEST:append:mx91-nxp-bsp = " imx-secure-enclave"
+# Add AFE support
+NXPAFE_INSTALL:mx91-nxp-bsp = "nxp-afe nxp-afe-voiceseeker"
+
+IMXBOOT_TARGETS = "flash_singleboot"
+IMX_BOOT_SOC_TARGET = "iMX91"
+
+# Set ATF platform name
+ATF_PLATFORM = "imx91p"
diff --git a/meta-digi-arm/conf/machine/ccimx93-dvk.conf b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
index 1c125a626..2d9dfb45b 100644
--- a/meta-digi-arm/conf/machine/ccimx93-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx93-dvk.conf
@@ -5,38 +5,34 @@
 DIGI_SOM = "ccimx93"
 MACHINEOVERRIDES =. "mx93:${DIGI_FAMILY}:${DIGI_SOM}:"
 
-require include/ccimx93.inc
+# Include the machine configuration for Digi's ConnectCore 9 module
+include conf/machine/include/ccimx9.inc
 
 # U-Boot configurations
 UBOOT_CONFIG ??= "ccimx93-dvk"
 UBOOT_CONFIG[ccimx93-dvk] = "ccimx93-dvk_defconfig"
-UBOOT_DTB_NAME = "ccimx93-dvk.dtb"
 
-BOOTLOADER_SEEK_USERDATA = "32"
+# Set ATF platform name
+ATF_PLATFORM = "imx93"
+IMX_BOOT_SOC_TARGET = "iMX93"
+IMXBOOT_TARGETS = "flash_singleboot flash_singleboot_a0"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx93-dvk.dtb \
     digi/_ov_board_dsi_display_ccimx93-dvk.dtbo \
-    digi/_ov_board_enet2_ccimx93-dvk.dtbo \
     digi/_ov_board_lvds_ccimx93-dvk.dtbo \
-    digi/_ov_board_mikroe-accel2-click_ccimx93-dvk.dtbo \
-    digi/_ov_board_mikroe-gyro-click_ccimx93-dvk.dtbo \
-    digi/_ov_som_bt_ccimx93.dtbo \
-    digi/_ov_som_bt-dtm_ccimx93.dtbo \
+    digi/_ov_board_enet2_ccimx9-dvk.dtbo \
+    digi/_ov_board_mikroe-accel2-click_ccimx9-dvk.dtbo \
+    digi/_ov_board_mikroe-gyro-click_ccimx9-dvk.dtbo \
+    digi/_ov_som_bt_ccimx9.dtbo \
+    digi/_ov_som_bt-dtm_ccimx9.dtbo \
     digi/_ov_som_npu_ccimx93.dtbo \
-    digi/_ov_som_wifi_ccimx93.dtbo \
-    ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'digi/_ov_board_eqos-tsn_ccimx93-dvk.dtbo', '', d)} \
+    digi/_ov_som_wifi_ccimx9.dtbo \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'tsn', 'digi/_ov_board_eqos-tsn_ccimx9-dvk.dtbo', '', d)} \
 "
 
-# Wireless external module
-WIRELESS_MODULE ?= ""
-WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-nxp-wlan', '', d)}"
-HAS_WIFI_VIRTWLANS = "true"
-
-# Machine firmware
-MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-nxp-wifi-nxpiw612 firmware-murata-nxp', '', d)}"
-
-MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
+# Add additional firmware
+MACHINE_FIRMWARE:append = " ethos-u-firmware"
 
 IMAGE_BOOT_FILES:append:use-nxp-bsp = " \
     imx93_m33_TCM_rpmsg_lite_pingpong_rtos_linux_remote.bin \
@@ -44,23 +40,8 @@ IMAGE_BOOT_FILES:append:use-nxp-bsp = " \
 "
 WKS_FILE_DEPENDS:append = " imx-m33-demos"
 
-# XBee
-XBEE_RESET_N_GPIO ?= "gpio2@19"
-XBEE_SLEEP_RQ_GPIO ?= ""
-XBEE_TTY ?= "ttyLP3"
-
-# Image FS types
-IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \
-				       "boot.vfat recovery.vfat squashfs tar.bz2", \
-				       "boot.vfat recovery.vfat ext4.gz tar.bz2 sdcard.gz", d)}'
-
 # Boot artifacts to be copied from the deploy dir to the installer ZIP
 BOOTABLE_ARTIFACTS = " \
     imx-boot-ccimx93-dvk.bin \
     imx-boot-ccimx93-dvk-A0.bin \
 "
-
-# Default overlayfs_etc mount point and type
-OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data"
-OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7"
-OVERLAYFS_ETC_FSTYPE ?= "ext4"
diff --git a/meta-digi-arm/conf/machine/include/ccimx9.inc b/meta-digi-arm/conf/machine/include/ccimx9.inc
new file mode 100644
index 000000000..3f045fbfe
--- /dev/null
+++ b/meta-digi-arm/conf/machine/include/ccimx9.inc
@@ -0,0 +1,121 @@
+#@TYPE: Machine
+#@NAME: ConnectCore 9 family of SOMs
+#@DESCRIPTION: Machine configuration for Digi's ConnectCore 9 family of SOMs
+
+DIGI_FAMILY = "ccimx9"
+
+require conf/machine/include/imx-digi-base.inc
+require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
+
+# Platform u-boot settings
+UBOOT_DTB_LOADADDRESS = "0x83000000"
+UBOOT_DTBO_LOADADDRESS = "0x83000000"
+UBOOT_ENTRYPOINT = "0x80400000"
+UBOOT_ENV = "boot"
+UBOOT_PREFIX = "imx-boot"
+UBOOT_SUFFIX = "bin"
+
+# Platform kernel settings (keep the override as otherwise KERNEL_IMAGETYPE
+# from imx-digi-base.inc takes precedence)
+KERNEL_CLASSES = "kernel-fitimage"
+KERNEL_IMAGETYPE:ccimx9 = "${@oe.utils.vartrue('TRUSTFENCE_SIGN_ARTIFACTS', 'fitImage', 'Image.gz', d)}"
+
+# The bootloader image that gets flashed consists of U-Boot and several fw binaries
+EXTRA_IMAGEDEPENDS += "imx-boot"
+BOOTLOADER_IMAGE_RECIPE = "imx-boot"
+BOOTABLE_FILENAME = "${UBOOT_PREFIX}-${MACHINE}.bin"
+SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}"
+BOOTLOADER_SEEK_USERDATA = "32"
+
+# Generate images for all SOC revisions (keep the override as otherwise the
+# one in "use-imx-security-controller-firmware.bbclass" takes precedence)
+SECO_FIRMWARE_NAME:ccimx9 = "mx93??-ahab-container.img"
+
+DDR_FIRMWARE_NAME = " \
+    lpddr4_dmem_1d_v202201.bin \
+    lpddr4_dmem_2d_v202201.bin \
+    lpddr4_imem_1d_v202201.bin \
+    lpddr4_imem_2d_v202201.bin \
+"
+
+MACHINE_FEATURES += "pci wifi bluetooth"
+MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse"
+
+STORAGE_MEDIA = "mmc"
+WLAN_P2P_INTERFACE = "wfd0"
+
+# Linux kernel configuration
+KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx9_defconfig"
+
+SPL_BINARY = "spl/u-boot-spl.bin"
+
+MACHINE_EXTRA_RDEPENDS += " \
+    e2fsprogs-mke2fs \
+    e2fsprogs-resize2fs \
+    parted \
+    xbee-init \
+"
+
+# TrustFence
+TRUSTFENCE_SIGN_MODE = "AHAB"
+
+IMX_BOOT_SEEK = "32"
+
+SERIAL_CONSOLES = "115200;ttyLP5"
+
+# Bluetooth tty
+BT_TTY ?= "ttyLP0"
+
+# Per-machine DISTRO_FEATURES customization
+MACHINE_DISTRO_FEATURES_REMOVE = "vulkan"
+
+# SWUpdate sw-description configuration
+BOOTFS_EXT ?= ".boot.vfat"
+ROOTFS_EXT ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", ".squashfs", ".ext4.gz", d)}'
+
+BOOT_DEV_NAME ?= "/dev/mmcblk0p1"
+ROOTFS_DEV_NAME ?= "/dev/mmcblk0p3"
+ROOTFS_ENC_DEV = "/dev/mapper/cryptrootfs"
+ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS') == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
+
+# Wireless external module
+WIRELESS_MODULE ?= ""
+WIRELESS_MODULE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'kernel-module-nxp-wlan', '', d)}"
+HAS_WIFI_VIRTWLANS = "true"
+
+# Machine firmware
+MACHINE_FIRMWARE:append = " ${@oe.utils.conditional('HAVE_WIFI', '1', 'firmware-nxp-wifi-nxpiw612 firmware-murata-nxp', '', d)}"
+
+MACHINE_EXTRA_RRECOMMENDS += "${WIRELESS_MODULE}"
+
+# XBee
+XBEE_RESET_N_GPIO ?= "gpio2@19"
+XBEE_SLEEP_RQ_GPIO ?= ""
+XBEE_TTY ?= "ttyLP3"
+
+# Image FS types
+IMAGE_FSTYPES ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", \
+				       "boot.vfat recovery.vfat squashfs tar.bz2", \
+				       "boot.vfat recovery.vfat ext4.gz tar.bz2 sdcard.gz", d)}'
+
+# Default overlayfs_etc mount point and type
+OVERLAYFS_ETC_MOUNT_POINT ?= "/mnt/data"
+OVERLAYFS_ETC_DEVICE ?= "/dev/mmcblk0p7"
+OVERLAYFS_ETC_FSTYPE ?= "ext4"
+
+PREFERRED_VERSION_gstreamer1.0:ccimx9              ?= "1.22.5.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-bad:ccimx9  ?= "1.22.5.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-base:ccimx9 ?= "1.22.5.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-good:ccimx9 ?= "1.22.5.imx"
+PREFERRED_VERSION_gstreamer1.0-plugins-ugly:ccimx9 ?= "1.22.6"
+
+PREFERRED_VERSION_libdrm:ccimx9            ?= "2.4.115.imx"
+PREFERRED_VERSION_nativesdk-wayland:ccimx9 ?= "1.22.0.imx"
+PREFERRED_VERSION_wayland:ccimx9           ?= "1.22.0.imx"
+PREFERRED_VERSION_wayland-native:ccimx9    ?= "1.22.0.imx"
+PREFERRED_VERSION_wayland-protocols:ccimx9 ?= "1.32.imx"
+PREFERRED_VERSION_weston:ccimx9            ?= "11.0.3.imx"
+PREFERRED_VERSION_xwayland:ccimx9          ?= "23.1.1.imx"
+
+PREFERRED_VERSION_nativesdk-trustfence-sign-tools:ccimx9 ?= "2023.04"
+PREFERRED_VERSION_trustfence-sign-tools-native:ccimx9    ?= "2023.04"
diff --git a/meta-digi-arm/conf/machine/include/ccimx93.inc b/meta-digi-arm/conf/machine/include/ccimx93.inc
deleted file mode 100644
index 278911589..000000000
--- a/meta-digi-arm/conf/machine/include/ccimx93.inc
+++ /dev/null
@@ -1,104 +0,0 @@
-#@TYPE: Machine
-#@NAME: ConnectCore 93 family of SOMs
-#@DESCRIPTION: Machine configuration for Digi's ConnectCore 93 family of SOMs
-
-DIGI_FAMILY = "ccimx93"
-
-require conf/machine/include/imx-digi-base.inc
-require conf/machine/include/arm/armv8-2a/tune-cortexa55.inc
-
-# Platform u-boot settings
-UBOOT_DTB_LOADADDRESS = "0x83000000"
-UBOOT_DTBO_LOADADDRESS = "0x83000000"
-UBOOT_ENTRYPOINT = "0x80400000"
-UBOOT_ENV = "boot"
-UBOOT_PREFIX = "imx-boot"
-UBOOT_SUFFIX = "bin"
-
-# Platform kernel settings (keep the override as otherwise KERNEL_IMAGETYPE
-# from imx-digi-base.inc takes precedence)
-KERNEL_CLASSES = "kernel-fitimage"
-KERNEL_IMAGETYPE:ccimx93 = "${@oe.utils.vartrue('TRUSTFENCE_SIGN_ARTIFACTS', 'fitImage', 'Image.gz', d)}"
-
-# The bootloader image that gets flashed consists of U-Boot and several fw binaries
-EXTRA_IMAGEDEPENDS += "imx-boot"
-BOOTLOADER_IMAGE_RECIPE = "imx-boot"
-BOOTABLE_FILENAME = "${UBOOT_PREFIX}-${MACHINE}.bin"
-SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}"
-
-# Generate images for all SOC revisions (keep the override as otherwise the
-# one in "use-imx-security-controller-firmware.bbclass" takes precedence)
-SECO_FIRMWARE_NAME:ccimx93 = "mx93??-ahab-container.img"
-
-DDR_FIRMWARE_NAME = " \
-    lpddr4_dmem_1d_v202201.bin \
-    lpddr4_dmem_2d_v202201.bin \
-    lpddr4_imem_1d_v202201.bin \
-    lpddr4_imem_2d_v202201.bin \
-"
-
-MACHINE_FEATURES += "pci wifi bluetooth"
-MACHINE_FEATURES:append:use-nxp-bsp = " optee jailhouse"
-
-STORAGE_MEDIA = "mmc"
-WLAN_P2P_INTERFACE = "wfd0"
-
-# Linux kernel configuration
-KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx93_defconfig"
-
-SPL_BINARY = "spl/u-boot-spl.bin"
-
-# Set ATF platform name
-ATF_PLATFORM = "imx93"
-
-MACHINE_EXTRA_RDEPENDS += " \
-    e2fsprogs-mke2fs \
-    e2fsprogs-resize2fs \
-    parted \
-    xbee-init \
-"
-
-# TrustFence
-TRUSTFENCE_SIGN_MODE = "AHAB"
-
-IMXBOOT_TARGETS = "flash_singleboot flash_singleboot_a0"
-
-IMX_BOOT_SOC_TARGET = "iMX9"
-IMX_BOOT_SEEK = "32"
-
-SERIAL_CONSOLES = "115200;ttyLP5"
-
-# Bluetooth tty
-BT_TTY ?= "ttyLP0"
-
-# Add additional firmware
-MACHINE_FIRMWARE:append = " ethos-u-firmware"
-
-# Per-machine DISTRO_FEATURES customization
-MACHINE_DISTRO_FEATURES_REMOVE = "vulkan"
-
-# SWUpdate sw-description configuration
-BOOTFS_EXT ?= ".boot.vfat"
-ROOTFS_EXT ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", ".squashfs", ".ext4.gz", d)}'
-
-BOOT_DEV_NAME ?= "/dev/mmcblk0p1"
-ROOTFS_DEV_NAME ?= "/dev/mmcblk0p3"
-ROOTFS_ENC_DEV = "/dev/mapper/cryptrootfs"
-ROOTFS_DEV_NAME_FINAL = "${@oe.utils.ifelse(d.getVar('TRUSTFENCE_ENCRYPT_ROOTFS') == '1', '${ROOTFS_ENC_DEV}', '${ROOTFS_DEV_NAME}')}"
-
-PREFERRED_VERSION_gstreamer1.0:ccimx93              ?= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-bad:ccimx93  ?= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-base:ccimx93 ?= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-good:ccimx93 ?= "1.22.5.imx"
-PREFERRED_VERSION_gstreamer1.0-plugins-ugly:ccimx93 ?= "1.22.6"
-
-PREFERRED_VERSION_libdrm:ccimx93            ?= "2.4.115.imx"
-PREFERRED_VERSION_nativesdk-wayland:ccimx93 ?= "1.22.0.imx"
-PREFERRED_VERSION_wayland:ccimx93           ?= "1.22.0.imx"
-PREFERRED_VERSION_wayland-native:ccimx93    ?= "1.22.0.imx"
-PREFERRED_VERSION_wayland-protocols:ccimx93 ?= "1.32.imx"
-PREFERRED_VERSION_weston:ccimx93            ?= "11.0.3.imx"
-PREFERRED_VERSION_xwayland:ccimx93          ?= "23.1.1.imx"
-
-PREFERRED_VERSION_nativesdk-trustfence-sign-tools:ccimx93 ?= "2023.04"
-PREFERRED_VERSION_trustfence-sign-tools-native:ccimx93    ?= "2023.04"
diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc
index 078ee176a..037ea02e4 100644
--- a/meta-digi-arm/conf/machine/include/digi-defaults.inc
+++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc
@@ -16,6 +16,7 @@ PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 # ccimx8x       5.15              2020.04 (packaged in imx-boot)
 # ccimx8mn      5.15              2020.04 (packaged in imx-boot)
 # ccimx8mm      5.15              2020.04 (packaged in imx-boot)
+# ccimx91       6.1               2023.04 (packaged in imx-boot)
 # ccimx93       6.1               2023.04 (packaged in imx-boot)
 # ccmp15        5.15              2021.10
 # ccmp13        5.15              2021.10
diff --git a/meta-digi-arm/conf/machine/include/imx-digi-base.inc b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
index d04222f3c..124211b09 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -41,6 +41,7 @@ DEFAULTTUNE:mx6-generic-bsp    ?= "cortexa9thf-neon"
 DEFAULTTUNE:mx6ul-generic-bsp  ?= "cortexa7thf-neon"
 DEFAULTTUNE:mx8m-generic-bsp   ?= "cortexa53-crypto"
 DEFAULTTUNE:mx8x-generic-bsp   ?= "cortexa35-crypto"
+DEFAULTTUNE:mx91-generic-bsp   ?= "cortexa55"
 DEFAULTTUNE:mx93-generic-bsp   ?= "cortexa55"
 
 INHERIT += "machine-overrides-extender"
@@ -56,6 +57,7 @@ MACHINEOVERRIDES_EXTENDER:mx8mn:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxd
 MACHINEOVERRIDES_EXTENDER:mx8mp:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxvpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8m-generic-bsp:mx8m-nxp-bsp:mx8mp-generic-bsp:mx8mp-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx8qxp:use-nxp-bsp = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8qxp-generic-bsp:mx8qxp-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx8dx:use-nxp-bsp  = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxdpu:imxgpu:imxgpu2d:imxgpu3d:imxvulkan:mx8-generic-bsp:mx8-nxp-bsp:mx8x-generic-bsp:mx8x-nxp-bsp:mx8dx-generic-bsp:mx8dx-nxp-bsp"
+MACHINEOVERRIDES_EXTENDER:mx91:use-nxp-bsp   = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx91-generic-bsp:mx91-nxp-bsp"
 MACHINEOVERRIDES_EXTENDER:mx93:use-nxp-bsp   = "imx-generic-bsp:imx-nxp-bsp:imxdrm:imxpxp:mx9-generic-bsp:mx9-nxp-bsp:mx93-generic-bsp:mx93-nxp-bsp"
 
 #######
@@ -69,6 +71,7 @@ MACHINEOVERRIDES_EXTENDER:mx8mn:use-mainline-bsp  = "imx-generic-bsp:imx-mainlin
 MACHINEOVERRIDES_EXTENDER:mx8mp:use-mainline-bsp  = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8m-generic-bsp:mx8m-mainline-bsp:mx8mp-generic-bsp:mx8mp-mainline-bsp"
 MACHINEOVERRIDES_EXTENDER:mx8qxp:use-mainline-bsp = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8x-generic-bsp:mx8x-mainline-bsp:mx8qxp-generic-bsp:mx8qxp-mainline-bsp"
 MACHINEOVERRIDES_EXTENDER:mx8dx:use-mainline-bsp  = "imx-generic-bsp:imx-mainline-bsp:mx8-generic-bsp:mx8-mainline-bsp:mx8x-generic-bsp:mx8x-mainline-bsp:mx8dx-generic-bsp:mx8dx-mainline-bsp"
+MACHINEOVERRIDES_EXTENDER:mx91:use-mainline-bsp  = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx91-generic-bsp:mx91-mainline-bsp"
 MACHINEOVERRIDES_EXTENDER:mx93:use-mainline-bsp  = "imx-generic-bsp:imx-mainline-bsp:mx9-generic-bsp:mx9-mainline-bsp:mx93-generic-bsp:mx93-mainline-bsp"
 
 MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \
@@ -98,6 +101,7 @@ MACHINEOVERRIDES_EXTENDER_FILTER_OUT = " \
     mx8qxp \
     mx8dx \
     mx8dxl \
+    mx91 \
     mx93 \
 "
 
@@ -113,6 +117,7 @@ MACHINE_SOCARCH_SUFFIX:mx8mn-nxp-bsp  = "-mx8mn"
 MACHINE_SOCARCH_SUFFIX:mx8mp-nxp-bsp  = "-mx8mp"
 MACHINE_SOCARCH_SUFFIX:mx8qxp-nxp-bsp = "-mx8"
 MACHINE_SOCARCH_SUFFIX:mx8dx-nxp-bsp  = "-mx8"
+MACHINE_SOCARCH_SUFFIX:mx91-nxp-bsp = "-mx91"
 MACHINE_SOCARCH_SUFFIX:mx93-nxp-bsp = "-mx93"
 
 # For Mainline we use a single SoC suffix as we don't have different build options
@@ -188,6 +193,7 @@ IMX_EXTRA_FIRMWARE                  ?= ""
 IMX_EXTRA_FIRMWARE:mx8-generic-bsp   = "firmware-imx-8 imx-sc-firmware imx-seco"
 IMX_EXTRA_FIRMWARE:mx8m-generic-bsp  = "firmware-imx-8m"
 IMX_EXTRA_FIRMWARE:mx8x-generic-bsp  = "imx-sc-firmware imx-seco"
+IMX_EXTRA_FIRMWARE:mx91-generic-bsp  = "imx-boot-firmware-files firmware-ele-imx"
 IMX_EXTRA_FIRMWARE:mx93-generic-bsp  = "imx-boot-firmware-files firmware-ele-imx"
 
 # Firmware
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-nxp-wifi_%.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-nxp-wifi_%.bbappend
index 415e35f41..0adb0642f 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-nxp-wifi_%.bbappend
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/firmware-imx/firmware-nxp-wifi_%.bbappend
@@ -1,17 +1,17 @@
-# Copyright (C) 2023, Digi International Inc.
+# Copyright (C) 2023,2024, Digi International Inc.
 
-LIC_FILES_CHKSUM:ccimx93 = "file://LICENSE.txt;md5=2827219e81f28aba7c6a569f7c437fa7"
+LIC_FILES_CHKSUM:ccimx9 = "file://LICENSE.txt;md5=2827219e81f28aba7c6a569f7c437fa7"
 
-SRCBRANCH:ccimx93 = "lf-6.1.55_2.2.0"
-SRCREV:ccimx93 = "7be5a936ce8677962dd7b41c6c9f41dd14350bec"
+SRCBRANCH:ccimx9 = "lf-6.1.55_2.2.0"
+SRCREV:ccimx9 = "7be5a936ce8677962dd7b41c6c9f41dd14350bec"
 
-do_install:append:ccimx93() {
+do_install:append:ccimx9() {
 	# Install NXP Connectivity IW612 firmware
 	install -m 0644 nxp/FwImage_IW612_SD/sd_w61x_v1.bin.se  ${D}${nonarch_base_libdir}/firmware/nxp
 	install -m 0644 nxp/FwImage_IW612_SD/uartspi_n61x_v1.bin.se ${D}${nonarch_base_libdir}/firmware/nxp
 }
 
-PACKAGES:prepend:ccimx93 = "${PN}-nxpiw612 "
+PACKAGES:prepend:ccimx9 = "${PN}-nxpiw612 "
 
 FILES:${PN}-nxpiw612 = " \
     ${nonarch_base_libdir}/firmware/nxp/sd_w61x_v1.bin.se \
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend
index 8301ce396..0da3fb164 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2022,2023, Digi International Inc.
+# Copyright (C) 2022-2024, Digi International Inc.
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
@@ -8,7 +8,7 @@ SRC_URI:append:ccimx8m = " \
     file://0003-imx8mn-Define-UART1-as-console-for-boot-stage.patch \
     file://0004-imx8mn-Disable-M7-debug-console.patch \
 "
-SRC_URI:append:ccimx93 = " \
+SRC_URI:append:ccimx9 = " \
     file://0001-ccimx93-use-UART6-for-the-default-console.patch \
     file://0002-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch \
 "
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb
index f8e706f42..d5c06c92d 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2023, Digi International Inc.
+# Copyright (C) 2023,2024, Digi International Inc.
 
 #
 # Reuse meta-freescale's imx-atf_2.6.bb
@@ -10,4 +10,4 @@ SRCBRANCH = "lf_v2.8"
 # Tag: lf-6.1.55-2.2.0
 SRCREV = "08e9d4eef2262c0dd072b4325e8919e06d349e02"
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
index 61032d929..206090d10 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-boot_1.0.bbappend
@@ -9,21 +9,27 @@ SRC_URI:append:ccimx8m = " \
     file://0004-LFU-573-2-imx8m-Reserve-new-IVT-CSF-for-FIT-FDT-sign.patch \
 "
 
-SRC_URI:append:ccimx93 = " \
+SRC_URI:append:ccimx9 = " \
     file://0001-imx9-soc.mak-capture-commands-output-into-a-log-file.patch \
+"
+SRC_URI:append:ccimx93 = " \
     file://0002-imx9-soc.mak-add-makefile-target-to-build-A0-revisio.patch \
 "
 
 # Use NXP's lf-6.1.55-2.2.0 release for ccimx93
-SRC_URI:ccimx93 = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH:ccimx93 = "lf-6.1.55_2.2.0"
-SRCREV:ccimx93 = "c4365450fb115d87f245df2864fee1604d97c06a"
+SRC_URI:ccimx9 = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH:ccimx9 = "lf-6.1.55_2.2.0"
+SRCREV:ccimx9 = "c4365450fb115d87f245df2864fee1604d97c06a"
 
 DEPENDS += "${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'trustfence-sign-tools-native', '', d)}"
 
 # Do not tag imx-boot
 UUU_BOOTLOADER = ""
 UUU_BOOTLOADER_TAGGED = ""
+BOOT_STAGING:mx9-generic-bsp = "${S}/iMX9"
+
+# Add SOC family
+SOC_FAMILY:mx91-generic-bsp = "mx93"
 
 REV_OPTION:ccimx93 = "REV=A1"
 
@@ -102,6 +108,13 @@ do_deploy:append:ccimx8m() {
 	install -m 0644 ${BOOT_STAGING}/mkimage-print_fit_hab.log ${DEPLOYDIR}/${BOOT_TOOLS}
 }
 
+do_deploy:append:ccimx91() {
+	generate_symlinks
+	for target in ${IMXBOOT_TARGETS}; do
+		install -m 0644 ${BOOT_STAGING}/mkimage-${target}.log ${DEPLOYDIR}/${BOOT_TOOLS}
+	done
+}
+
 do_deploy:append:ccimx93() {
 	generate_symlinks
 	for target in ${IMXBOOT_TARGETS}; do
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend
index 2a36cb50c..e9f50892d 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-mkimage/imx-mkimage_git.bbappend
@@ -6,10 +6,10 @@ SRC_URI:append:ccimx8m = " \
     file://0001-imx8m-soc.mak-preserve-dtbs-after-build.patch \
 "
 
-# Use NXP's lf-6.1.55-2.2.0 release for ccimx93
-SRC_URI:ccimx93 = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}"
-SRCBRANCH:ccimx93 = "lf-6.1.55_2.2.0"
-SRCREV:ccimx93 = "c4365450fb115d87f245df2864fee1604d97c06a"
+# Use NXP's lf-6.1.55-2.2.0 release for ccimx9
+SRC_URI:ccimx9 = "git://github.com/nxp-imx/imx-mkimage.git;protocol=https;branch=${SRCBRANCH}"
+SRCBRANCH:ccimx9 = "lf-6.1.55_2.2.0"
+SRCREV:ccimx9 = "c4365450fb115d87f245df2864fee1604d97c06a"
 
 # "fmacro-prefix-map" is not supported on old versions of GCC
 DEBUG_PREFIX_MAP:remove:class-nativesdk = "-fmacro-prefix-map=${WORKDIR}=/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}"
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
index eaebcf79a..57f6984c6 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-secure-enclave/imx-secure-enclave_git.bb
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 NXP
+# Copyright 2021-2024 NXP
 
 SUMMARY = "NXP i.MX SECURE ENCLAVE library"
 DESCRIPTION = "NXP IMX SECURE ENCLAVE library"
@@ -25,4 +25,4 @@ do_install () {
 	oe_runmake DESTDIR=${D} install_tests
 }
 
-COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx93-nxp-bsp)"
+COMPATIBLE_MACHINE = "(mx8ulp-nxp-bsp|mx91-nxp-bsp|mx93-nxp-bsp)"
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-graphics/drm/libdrm_2.4.115.imx.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-graphics/drm/libdrm_2.4.115.imx.bb
index 19e42613d..76b3bc580 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-graphics/drm/libdrm_2.4.115.imx.bb
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-graphics/drm/libdrm_2.4.115.imx.bb
@@ -19,7 +19,7 @@ SRCREV = "0f889a1f9640f6210132dd565141eb19005245fb"
 S = "${WORKDIR}/git"
 
 DEFAULT_PREFERENCE = "-1"
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
 
 inherit meson pkgconfig manpages
 
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx-headers_6.1.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx-headers_6.1.bb
index 99467a829..cedc55810 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx-headers_6.1.bb
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-kernel/linux/linux-imx-headers_6.1.bb
@@ -11,4 +11,4 @@ SRCREV = "770c5fe2c1d1529fae21b7043911cd50c6cf087e"
 
 IMX_UAPI_HEADERS:remove = "isl29023.h"
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_4.0.0.imx.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_4.0.0.imx.bb
index cf1521094..a584fae54 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_4.0.0.imx.bb
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-client_4.0.0.imx.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2023, Digi International Inc.
+# Copyright (C) 2023,2024, Digi International Inc.
 
 #
 # Reuse meta-freescale's optee-client_3.19.0.imx.bb
@@ -24,4 +24,4 @@ do_install() {
 	fi
 }
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.0.0.imx.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.0.0.imx.bb
index d23c9dd4d..430558bee 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.0.0.imx.bb
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.0.0.imx.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2023, Digi International Inc.
+# Copyright (C) 2023,2024, Digi International Inc.
 
 #
 # Reuse meta-freescale's optee-os_3.19.0.imx.bb
@@ -16,6 +16,7 @@ SRCBRANCH = "lf-6.1.55_2.2.0"
 # Tag: lf-6.1.55-2.2.0
 SRCREV = "a303fc80f7c4bd713315687a1fa1d6ed136e78ee"
 
+PLATFORM_FLAVOR:ccimx91 = "ccimx93dvk"
 PLATFORM_FLAVOR:ccimx93 = "ccimx93dvk"
 
 do_compile:append:ccimx93 () {
@@ -23,7 +24,7 @@ do_compile:append:ccimx93 () {
 }
 do_compile[cleandirs] += "${B}-A0"
 
-do_install:append:ccimx93 () {
+do_install:append:ccimx9 () {
 	mkdir -p ${D}/environment-setup.d
 	sed -e "s,#OPTEE_ARCH#,${OPTEE_ARCH},g" ${WORKDIR}/environment.d-optee-sdk.sh > ${D}/environment-setup.d/optee-sdk.sh
 }
@@ -34,4 +35,4 @@ do_deploy:append:ccimx93 () {
 
 FILES:${PN}-staticdev += "/environment-setup.d/"
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_4.0.0.imx.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_4.0.0.imx.bb
index ff3f411a0..66256de59 100644
--- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_4.0.0.imx.bb
+++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-test_4.0.0.imx.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2023, Digi International Inc.
+# Copyright (C) 2023,2024, Digi International Inc.
 
 #
 # Reuse meta-freescale's optee-test_3.19.0.imx.bb
@@ -10,4 +10,4 @@ DEPENDS += "openssl"
 SRCBRANCH = "lf-6.1.55_2.2.0"
 SRCREV = "38efacef3b14b32a6792ceaebe211b5718536fbb"
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
index bef359514..aeca11e98 100644
--- a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2023, Digi International Inc.
+# Copyright (C) 2013-2024, Digi International Inc.
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
@@ -13,7 +13,7 @@ SRC_URI:append:ccimx6 = " \
 SRC_URI:append:ccimx6ul = " file://asound.state"
 SRC_URI:append:ccimx8x = " file://asound.state"
 SRC_URI:append:ccimx8m = " file://asound.state"
-SRC_URI:append:ccimx93 = " file://asound.state"
+SRC_URI:append:ccimx9 = " file://asound.state"
 SRC_URI:append:ccmp1 = " file://asound.state"
 
 do_install:append:ccimx6() {
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx93/asound.conf b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx9/asound.conf
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx93/asound.conf
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx9/asound.conf
diff --git a/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx93/asound.state b/meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx9/asound.state
similarity index 100%
rename from meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx93/asound.state
rename to meta-digi-arm/recipes-bsp/alsa-state/alsa-state/ccimx9/asound.state
diff --git a/meta-digi-arm/recipes-bsp/firmware-murata-nxp/firmware-murata-nxp.bb b/meta-digi-arm/recipes-bsp/firmware-murata-nxp/firmware-murata-nxp.bb
index e938f4e48..253394e52 100644
--- a/meta-digi-arm/recipes-bsp/firmware-murata-nxp/firmware-murata-nxp.bb
+++ b/meta-digi-arm/recipes-bsp/firmware-murata-nxp/firmware-murata-nxp.bb
@@ -27,4 +27,4 @@ do_install () {
 FILES:${PN} = "${nonarch_base_libdir}/firmware"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "ccimx93"
+COMPATIBLE_MACHINE = "(ccimx9)"
diff --git a/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend
index 32c6540bd..554611f09 100644
--- a/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend
+++ b/meta-digi-arm/recipes-bsp/libubootenv/libubootenv_%.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2021-2023, Digi International Inc.
+# Copyright (C) 2021-2024, Digi International Inc.
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
@@ -18,7 +18,7 @@ FW_CONFIG_FILE:ccmp1 = "${@bb.utils.contains('IMAGE_FEATURES', 'read-only-rootfs
 DEPENDS += "${@oe.utils.conditional('OPTEE_PATCHES', '', '', 'optee-client', d)}"
 
 OPTEE_PATCHES = ""
-OPTEE_PATCHES:ccimx93 = "file://0004-Implement-support-for-environment-encryption-using-O.patch"
+OPTEE_PATCHES:ccimx9 = "file://0004-Implement-support-for-environment-encryption-using-O.patch"
 OPTEE_PATCHES:ccmp1 = "file://0004-Implement-support-for-environment-encryption-using-O.patch"
 
 SRC_URI += " \
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/boot.txt
similarity index 89%
rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt
rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/boot.txt
index 173b3b84d..8d662e3f1 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93-dvk/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/boot.txt
@@ -66,18 +66,20 @@ setexpr module_has_bt ${hwid_2} \& 40000
 setexpr module_has_bt ${module_has_bt} / 40000
 
 if test "${module_has_bt}" = "1" && test -z "${disable_bt}"; then
-	setenv overlays _ov_som_bt_ccimx93.dtbo,${overlays}
+	setenv overlays _ov_som_bt_ccimx9.dtbo,${overlays}
 fi
 
 if test "${module_has_wifi}" = "1" && test -z "${disable_wifi}"; then
-	setenv overlays _ov_som_wifi_ccimx93.dtbo,${overlays}
+	setenv overlays _ov_som_wifi_ccimx9.dtbo,${overlays}
 fi
 
-if test "${cpu_type}" = "imx9352" || \
-   test "${cpu_type}" = "imx9351" || \
-   test "${cpu_type}" = "imx9322" || \
-   test "${cpu_type}" = "imx9321"; then
-	module_has_npu="1"
+if test "${soc-type}" = "imx93"; then
+	if test "${cpu_type}" = "imx9352" || \
+	   test "${cpu_type}" = "imx9351" || \
+	   test "${cpu_type}" = "imx9322" || \
+	   test "${cpu_type}" = "imx9321"; then
+		module_has_npu="1"
+	fi
 fi
 
 if test "${module_has_npu}" = "1" && test -z "${disable_npu}"; then
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_sd.txt
similarity index 96%
rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt
rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_sd.txt
index b973c36b6..1ca68a2cd 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_sd.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_sd.txt
@@ -8,16 +8,18 @@ install_abort=0
 BASEFILENAME=0
 
 # Determine U-Boot file to program basing on SOM's SOC revision
-if test -z "${soc_rev}"; then
-	# Fallback to hardware version if soc_rev is empty
-	setexpr som_hv ${hwid_2} \& 78
-	setexpr som_hv ${som_hv} / 8
-	if test "${som_hv}" -lt "2"; then
-		SOCREV="-A0"
-	fi
-else
-	if test "${soc_rev}" = "0x10"; then
-		SOCREV="-A0"
+if test "${soc_type}" = "imx93"; then
+	if test -z "${soc_rev}"; then
+		# Fallback to hardware version if soc_rev is empty
+		setexpr som_hv ${hwid_2} \& 78
+		setexpr som_hv ${som_hv} / 8
+		if test "${som_hv}" -lt "2"; then
+			SOCREV="-A0"
+		fi
+	else
+		if test "${soc_rev}" = "0x10"; then
+			SOCREV="-A0"
+		fi
 	fi
 fi
 setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##${SOCREV}.bin
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_usb.txt
similarity index 96%
rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt
rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_usb.txt
index e20b94544..9fc05dd8c 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_usb.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_usb.txt
@@ -8,16 +8,18 @@ install_abort=0
 BASEFILENAME=0
 
 # Determine U-Boot file to program basing on SOM's SOC revision
-if test -z "${soc_rev}"; then
-	# Fallback to hardware version if soc_rev is empty
-	setexpr som_hv ${hwid_2} \& 78
-	setexpr som_hv ${som_hv} / 8
-	if test "${som_hv}" -lt "2"; then
-		SOCREV="-A0"
-	fi
-else
-	if test "${soc_rev}" = "0x10"; then
-		SOCREV="-A0"
+if test "${soc_type}" = "imx93"; then
+	if test -z "${soc_rev}"; then
+		# Fallback to hardware version if soc_rev is empty
+		setexpr som_hv ${hwid_2} \& 78
+		setexpr som_hv ${som_hv} / 8
+		if test "${som_hv}" -lt "2"; then
+			SOCREV="-A0"
+		fi
+	else
+		if test "${soc_rev}" = "0x10"; then
+			SOCREV="-A0"
+		fi
 	fi
 fi
 setenv INSTALL_UBOOT_FILENAME imx-boot-##MACHINE##${SOCREV}.bin
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_uuu.sh
similarity index 100%
rename from meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx93/install_linux_fw_uuu.sh
rename to meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx9/install_linux_fw_uuu.sh
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb
index f902ef0ff..d33cf612d 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey_2023.04.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2023, Digi International Inc.
+# Copyright (C) 2023,2024, Digi International Inc.
 
 require u-boot-dey.inc
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=2ca5f2c35c8cc335f0a19756634782f1"
@@ -8,4 +8,4 @@ DEPENDS += "flex-native bison-native"
 SRCBRANCH = "v2023.04/master"
 SRCREV = "${AUTOREV}"
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
diff --git a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact-nxp.sh b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact-nxp.sh
index 3413d0121..d8fba2925 100755
--- a/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact-nxp.sh
+++ b/meta-digi-arm/recipes-digi/trustfence/trustfence-sign-tools/trustfence-sign-artifact-nxp.sh
@@ -101,6 +101,7 @@ done<<-_EOF_
 	ccimx8mm    0x40480000  0x43800000  0x43000000  -           HAB   0x2000  "-h 4 -d sha256"
 	ccimx8mn    0x40480000  0x43800000  0x43000000  -           HAB   0x2000  "-h 4 -d sha256"
 	ccimx8x     0x80280000  0x82100000  0x82000000  -           AHAB  -       "-a -d sha512 -s sha512"
+	ccimx91     -           -           -           0x84000000  AHAB  -       "-a -d sha256 -s sha512"
 	ccimx93     -           -           -           0x84000000  AHAB  -       "-a -d sha256 -s sha512"
 _EOF_
 
@@ -127,6 +128,8 @@ eval "CONFIG_CSF_SIZE=\"\${${PLATFORM}_csf_size}\""
 # Rootfs is loaded to $initrd_addr, just like the ramdisk
 [ "${ARTIFACT_ROOTFS}" = "y" ] && CONFIG_RAM_START="${CONFIG_RAMDISK_LOADADDR}"
 
+# For ccimx91 do not require image type (assume FIT image)
+[ "${PLATFORM}" = "ccimx91" ] && CONFIG_RAM_START="${CONFIG_FIT_LOADADDR}"
 # For ccimx93 do not require image type (assume FIT image)
 [ "${PLATFORM}" = "ccimx93" ] && CONFIG_RAM_START="${CONFIG_FIT_LOADADDR}"
 
diff --git a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb
index 8351d50a3..e9b736632 100644
--- a/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb
+++ b/meta-digi-arm/recipes-kernel/linux/linux-dey_6.1.bb
@@ -29,4 +29,4 @@ SRCREV = "${AUTOREV}"
 KERNEL_MODULE_PROBECONF += "btnxpuart"
 module_conf_btnxpuart = "blacklist btnxpuart"
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
diff --git a/meta-digi-dey/classes/dey-image-installer.bbclass b/meta-digi-dey/classes/dey-image-installer.bbclass
index 523168e15..c78bfdaeb 100644
--- a/meta-digi-dey/classes/dey-image-installer.bbclass
+++ b/meta-digi-dey/classes/dey-image-installer.bbclass
@@ -1,7 +1,7 @@
 #
 # Generate DEY installer ZIP package
 #
-# Copyright 2017-2023, Digi International Inc.
+# Copyright 2017-2024, Digi International Inc.
 #
 DEPENDS += "zip-native"
 
@@ -27,7 +27,7 @@ FSTYPES_WHITELIST:ccmp1 = " \
 
 HAS_USB_DRIVER = "false"
 HAS_USB_DRIVER:ccimx8m = "true"
-HAS_USB_DRIVER:ccimx93 = "true"
+HAS_USB_DRIVER:ccimx9 = "true"
 HAS_USB_DRIVER:ccmp1 = "true"
 
 generate_installer_zip () {
diff --git a/meta-digi-dey/classes/trustfence.bbclass b/meta-digi-dey/classes/trustfence.bbclass
index dfdc0c227..5ba8f39ad 100644
--- a/meta-digi-dey/classes/trustfence.bbclass
+++ b/meta-digi-dey/classes/trustfence.bbclass
@@ -33,9 +33,9 @@ TRUSTFENCE_SIGN_FIT_STM:ccmp1 ?= "1"
 
 # Partition encryption configuration
 TRUSTFENCE_ENCRYPT_PARTITIONS ?= "1"
-TRUSTFENCE_ENCRYPT_PARTITIONS:ccimx93 ?= "0"
+TRUSTFENCE_ENCRYPT_PARTITIONS:ccimx9 ?= "0"
 TRUSTFENCE_ENCRYPT_ROOTFS ?= "${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", "0", "1", d)}"
-TRUSTFENCE_ENCRYPT_ROOTFS:ccimx93 ?= "0"
+TRUSTFENCE_ENCRYPT_ROOTFS:ccimx9 ?= "0"
 TRUSTFENCE_FILE_BASED_ENCRYPT ?= "${TF_FILE_BASED_ENCRYPT}"
 
 # Read-only rootfs
@@ -47,15 +47,15 @@ TRUSTFENCE_READ_ONLY_ROOTFS ?= "${@bb.utils.contains("IMAGE_FEATURES", "read-onl
 
 # Platform specific defaults
 TF_DEK_PATH = "default"
-TF_DEK_PATH:ccimx93 = "0"
+TF_DEK_PATH:ccimx9 = "0"
 TF_DEK_PATH:ccmp1 = "0"
 TF_FILE_BASED_ENCRYPT = "0"
-TF_FILE_BASED_ENCRYPT:ccimx93 = "1"
+TF_FILE_BASED_ENCRYPT:ccimx9 = "1"
 TF_FILE_BASED_ENCRYPT:ccmp1 = "1"
 
 # NXP-based sign a FIT-format boot artifact
 TRUSTFENCE_SIGN_FIT_NXP = "0"
-TRUSTFENCE_SIGN_FIT_NXP:ccimx93 = "${TRUSTFENCE_SIGN_ARTIFACTS}"
+TRUSTFENCE_SIGN_FIT_NXP:ccimx9 = "${TRUSTFENCE_SIGN_ARTIFACTS}"
 
 IMAGE_FEATURES += "dey-trustfence"
 
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/alsa/imx-alsa-plugins_git.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/alsa/imx-alsa-plugins_git.bbappend
index a631effc0..8c83673dc 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/alsa/imx-alsa-plugins_git.bbappend
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/alsa/imx-alsa-plugins_git.bbappend
@@ -1,4 +1,4 @@
 # Copyright (C) 2023,2024, Digi International Inc.
 
-SRCBRANCH:ccimx93 = "MM_04.08.02_2310_L6.1.y"
-SRCREV:ccimx93 = "b2ba082e70333f187972ee4e85f63f9d2f608331"
+SRCBRANCH:ccimx9 = "MM_04.08.02_2310_L6.1.y"
+SRCREV:ccimx9 = "b2ba082e70333f187972ee4e85f63f9d2f608331"
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bbappend
index 9776a5a28..4e4f8de5f 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bbappend
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-meta-base.bbappend
@@ -1,9 +1,9 @@
-# Copyright (C) 2023, Digi International Inc.
+# Copyright (C) 2023,2024, Digi International Inc.
 
-RDEPENDS:gstreamer1.0-meta-base:remove:ccimx93 = " \
+RDEPENDS:gstreamer1.0-meta-base:remove:ccimx9 = " \
     gstreamer1.0-plugins-base-videoscale \
     gstreamer1.0-plugins-base-videoconvert \
 "
-RDEPENDS:gstreamer1.0-meta-base:append:ccimx93 = " \
+RDEPENDS:gstreamer1.0-meta-base:append:ccimx9 = " \
     gstreamer1.0-plugins-base-videoconvertscale \
 "
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb
index d770502ad..d1c78ac9a 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.22.5.imx.bb
@@ -211,6 +211,6 @@ EXTRA_OEMESON += " \
     -Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}" \
 "
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
 
 ########### End of i.MX overrides #########
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb
index c4391f3c8..88f83ae68 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.22.5.imx.bb
@@ -145,6 +145,6 @@ EXTRA_OEMESON += "-Dc_args="${CFLAGS} -I${STAGING_INCDIR_IMX}""
 # gcompat will address it during runtime
 LDFLAGS:append:imxgpu:libc-musl = " -Wl,--allow-shlib-undefined"
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
 
 ########### End of i.MX overrides #########
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb
index 4fdf4408d..b51ab8433 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.22.5.imx.bb
@@ -114,6 +114,6 @@ SRCREV = "a4631334ad32abc513bde8f73491ef345f865a48"
 
 S = "${WORKDIR}/git"
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
 
 ########### End of i.MX overrides #########
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.6.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.6.bb
index b457a05f7..f8959cc93 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.6.bb
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.22.6.bb
@@ -9,4 +9,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343"
 
 SRC_URI[sha256sum] = "3e31454c98cb2f7f6d2d355eceb933a892fa0f1dc09bc36c9abc930d8e29ca48"
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb
index a4a0213e6..2fbf22457 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/gstreamer1.0_1.22.5.imx.bb
@@ -107,6 +107,6 @@ S = "${WORKDIR}/git"
 
 PACKAGECONFIG[tests] = "-Dtests=enabled,-Dtests=disabled"
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
 
 ########### End of i.MX overrides #########
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend
index 5eb71fae0..ea5aa33ce 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/gstreamer/imx-gst1.0-plugin_%.bbappend
@@ -7,7 +7,7 @@ SRC_URI:append:ccimx6ul = " \
     file://0002-imx-gst1.0-plugin-fix-build-using-MUSL-C-library.patch \
 "
 
-LIC_FILES_CHKSUM:ccimx93 = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24"
-PV:ccimx93 = "4.8.2+git${SRCPV}"
-SRCBRANCH:ccimx93 = "MM_04.08.02_2310_L6.1.y"
-SRCREV:ccimx93 = "a72df52acfec5f849ec93906e33cb50da01b0b2e"
+LIC_FILES_CHKSUM:ccimx9 = "file://LICENSE.txt;md5=fbc093901857fcd118f065f900982c24"
+PV:ccimx9 = "4.8.2+git${SRCPV}"
+SRCBRANCH:ccimx9 = "MM_04.08.02_2310_L6.1.y"
+SRCREV:ccimx9 = "a72df52acfec5f849ec93906e33cb50da01b0b2e"
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.8.2.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.8.2.bb
index 5f821d078..3a28e97bc 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.8.2.bb
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-codec/imx-codec_4.8.2.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
 SRC_URI[md5sum] = "1977bab8d89972f08d9eee0122a64603"
 SRC_URI[sha256sum] = "b0744a91c265202a79a019c72f17cae01fd5b63a3ba451592b6c8349d95719e0"
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
diff --git a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.8.2.bb b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.8.2.bb
index ae755bcb1..aaf825510 100644
--- a/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.8.2.bb
+++ b/meta-digi-dey/dynamic-layers/freescale-layer/recipes-multimedia/imx-parser/imx-parser_4.8.2.bb
@@ -10,4 +10,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2827219e81f28aba7c6a569f7c437fa7"
 SRC_URI[md5sum] = "2e862fce70bc82649057ed552473d982"
 SRC_URI[sha256sum] = "20f326821ced5d6855f81794b66ec1f0c334e9ec7a9be1368a9b4dc501b666c6"
 
-COMPATIBLE_MACHINE = "(ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx9)"
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb
index fc182f9e5..aa0773a43 100644
--- a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb
+++ b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2022,2023, Digi International Inc.
+# Copyright (C) 2022-2024, Digi International Inc.
 
 SUMMARY = "Bluetooth init scripts"
 LICENSE = "GPL-2.0-only"
@@ -59,7 +59,7 @@ SYSTEMD_SERVICE:${PN} = "bluetooth-init.service"
 RDEPENDS:${PN} = "initscripts-functions"
 
 # IW61x Bluetooth support requires the WiFi FW support
-RDEPENDS:${PN}:append:ccimx93 = " firmware-nxp-wifi-nxpiw612"
+RDEPENDS:${PN}:append:ccimx9 = " firmware-nxp-wifi-nxpiw612"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x|ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x|ccimx9)"
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx93/bluetooth-init b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx9/bluetooth-init
similarity index 100%
rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx93/bluetooth-init
rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx9/bluetooth-init
diff --git a/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx93/bluetooth-init.service b/meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx9/bluetooth-init.service
similarity index 100%
rename from meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx93/bluetooth-init.service
rename to meta-digi-dey/recipes-connectivity/bluez/bluez5-init/ccimx9/bluetooth-init.service
diff --git a/meta-digi-dey/recipes-connectivity/hostapd/hostapd_%.bbappend b/meta-digi-dey/recipes-connectivity/hostapd/hostapd_%.bbappend
index 4eedde531..30927010a 100644
--- a/meta-digi-dey/recipes-connectivity/hostapd/hostapd_%.bbappend
+++ b/meta-digi-dey/recipes-connectivity/hostapd/hostapd_%.bbappend
@@ -8,7 +8,7 @@ SRC_URI:append = " \
     ${@oe.utils.conditional('HAS_WIFI_VIRTWLANS', 'true', 'file://hostapd_wlan1.conf', '', d)} \
 "
 
-SRC_URI:append:ccimx93 = " \
+SRC_URI:append:ccimx9 = " \
     file://hostapd_uap0.conf \
 "
 
@@ -92,7 +92,7 @@ add_hostapd_files() {
 	fi
 }
 
-add_hostapd_files:ccimx93() {
+add_hostapd_files:ccimx9() {
 	install -m 0644 ${WORKDIR}/hostapd_uap0.conf ${D}${sysconfdir}
 }
 
diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx91/80-mm-net-device-blacklist.rules b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx91/80-mm-net-device-blacklist.rules
new file mode 100644
index 000000000..b5f43b430
--- /dev/null
+++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/ccimx91/80-mm-net-device-blacklist.rules
@@ -0,0 +1,18 @@
+ACTION!="add|change|move|bind", GOTO="mm_net_device_blacklist_end"
+
+# ModemManager documentation states that the best practice is to use the DEVPATH
+# this way rather than other rules such as KERNEL, so be careful when modifying
+
+# Remove Ethernet interfaces from ModemManager probing
+SUBSYSTEM=="net", DEVPATH=="/devices/platform/30be0000.ethernet*", ENV{ID_MM_CANDIDATE}="0", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+# Remove SPI-to-CAN interface from ModemManager probing
+SUBSYSTEM=="net", DEVPATH=="/devices/platform/30840000.ecspi*", ENV{ID_MM_CANDIDATE}="0", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+# Remove MMC interfaces from ModemManager probing
+SUBSYSTEM=="net", DEVPATH=="/devices/platform/30b40000.mmc*", ENV{ID_MM_CANDIDATE}="0", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+# Remove PCIe interfaces from ModemManager probing
+SUBSYSTEM=="net", DEVPATH=="/devices/platform/33800000.pcie*", ENV{ID_MM_CANDIDATE}="0", ENV{ID_MM_DEVICE_IGNORE}="1"
+
+LABEL="mm_net_device_blacklist_end"
diff --git a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend
index e13caeebb..0669aa8ad 100644
--- a/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend
+++ b/meta-digi-dey/recipes-connectivity/networkmanager/networkmanager_%.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2017-2023, Digi International Inc.
+# Copyright (C) 2017-2024, Digi International Inc.
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
@@ -42,7 +42,7 @@ ETH1_STATIC_CIDR = "${@ipaddr_to_cidr('eth1', d)}"
 WLAN0_STATIC_CIDR = "${@ipaddr_to_cidr('wlan0', d)}"
 
 UNMANAGED_DEVICES = "interface-name:p2p*;interface-name:wlan1"
-UNMANAGED_DEVICES:ccimx93 = "interface-name:p2p-wfd0-0;interface-name:wfd0;interface-name:uap0"
+UNMANAGED_DEVICES:ccimx9 = "interface-name:p2p-wfd0-0;interface-name:wfd0;interface-name:uap0"
 
 inherit update-rc.d
 
diff --git a/meta-digi-dey/recipes-connectivity/xbee/xbee.bb b/meta-digi-dey/recipes-connectivity/xbee/xbee.bb
index 6667c182b..34a762d1a 100644
--- a/meta-digi-dey/recipes-connectivity/xbee/xbee.bb
+++ b/meta-digi-dey/recipes-connectivity/xbee/xbee.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2023, Digi International Inc.
+# Copyright (C) 2019-2024, Digi International Inc.
 
 SUMMARY = "Digi XBee initialization"
 DESCRIPTION = "Initialization scripts for XBee hardware of Digi boards"
@@ -42,4 +42,4 @@ SYSTEMD_PACKAGES = "${PN}-init"
 SYSTEMD_SERVICE:${PN}-init = "xbee-init.service"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx8m|ccimx8x|ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx8m|ccimx8x|ccimx9)"
diff --git a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
index 64a038160..b36a7c6fc 100644
--- a/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
+++ b/meta-digi-dey/recipes-core/init-ifupdown/init-ifupdown_1.0.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2023, Digi International Inc.
+# Copyright (C) 2013-2024, Digi International Inc.
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BP}:"
 
@@ -84,7 +84,7 @@ install_virtwlans() {
 	ln -s ../if-pre-up.d/virtwlans ${D}${sysconfdir}/network/if-post-down.d/virtwlans
 }
 
-install_virtwlans:ccimx93() {
+install_virtwlans:ccimx9() {
 	# Skip
 	:
 }
@@ -92,8 +92,8 @@ install_virtwlans:ccimx93() {
 WLAN1_POST_UP_ACTION = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemctl start hostapd@wlan1.service', '/etc/init.d/hostapd start', d)}"
 WLAN1_PRE_DOWN_ACTION = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemctl stop hostapd@wlan1.service', '/etc/init.d/hostapd stop', d)}"
 
-WLAN1_POST_UP_ACTION:ccimx93 = "systemctl start hostapd@uap0.service"
-WLAN1_PRE_DOWN_ACTION:ccimx93 = "systemctl stop hostapd@uap0.service"
+WLAN1_POST_UP_ACTION:ccimx9 = "systemctl start hostapd@uap0.service"
+WLAN1_PRE_DOWN_ACTION:ccimx9 = "systemctl stop hostapd@uap0.service"
 
 install_wlan1() {
 	cat ${WORKDIR}/interfaces.wlan1.${WLAN1_MODE} >> ${D}${sysconfdir}/network/interfaces
diff --git a/meta-digi-dey/recipes-core/systemd/systemd-conf_%.bbappend b/meta-digi-dey/recipes-core/systemd/systemd-conf_%.bbappend
index 893316ccd..130aabd20 100644
--- a/meta-digi-dey/recipes-core/systemd/systemd-conf_%.bbappend
+++ b/meta-digi-dey/recipes-core/systemd/systemd-conf_%.bbappend
@@ -1,4 +1,4 @@
-#  Copyright (C) 2019-2023, Digi International Inc.
+#  Copyright (C) 2019-2024, Digi International Inc.
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
@@ -10,7 +10,7 @@ SRC_URI:append:ccmp1 = " \
     file://logind.conf-digi \
 "
 
-SRC_URI:append:ccimx93 = " \
+SRC_URI:append:ccimx9 = " \
     file://logind.conf-digi \
 "
 
@@ -22,6 +22,6 @@ do_install:append:ccmp1() {
 	install -D -m0644 ${WORKDIR}/logind.conf-digi ${D}${systemd_unitdir}/logind.conf.d/01-${PN}.conf
 }
 
-do_install:append:ccimx93() {
+do_install:append:ccimx9() {
 	install -D -m0644 ${WORKDIR}/logind.conf-digi ${D}${systemd_unitdir}/logind.conf.d/01-${PN}.conf
 }
diff --git a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
index d92412e64..18526acf7 100644
--- a/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
+++ b/meta-digi-dey/recipes-core/trustfence/trustfence-initramfs.bb
@@ -1,4 +1,4 @@
-# Copyright (C) 2016-2023, Digi International Inc.
+# Copyright (C) 2016-2024, Digi International Inc.
 
 SUMMARY = "Trustfence initramfs required files"
 LICENSE = "GPL-2.0-only"
@@ -26,4 +26,4 @@ RDEPENDS:${PN} = " \
 "
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
-COMPATIBLE_MACHINE = "(ccimx6|ccimx8m|ccimx8x|ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx6|ccimx8m|ccimx8x|ccimx9)"
diff --git a/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/bootcount.c b/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/bootcount.c
index c90aa0a18..8b2335212 100644
--- a/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/bootcount.c
+++ b/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/bootcount.c
@@ -56,6 +56,7 @@ struct platform_functions platforms_functions[] = {
 	[PLATFORM_CC8MM] = {read_bootcount_nvmem, write_bootcount_nvmem},
 	[PLATFORM_CC8MN] = {read_bootcount_nvmem, write_bootcount_nvmem},
 	[PLATFORM_CC8X] = {read_bootcount_nvmem, write_bootcount_nvmem},
+	[PLATFORM_CC91] = {read_bootcount_nvmem, write_bootcount_nvmem},
 	[PLATFORM_CC93] = {read_bootcount_nvmem, write_bootcount_nvmem},
 	[PLATFORM_CCMP13] = {read_bootcount_nvmem, write_bootcount_nvmem},
 	[PLATFORM_CCMP15] = {read_bootcount_nvmem, write_bootcount_nvmem},
diff --git a/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/bootcount_nvmem.c b/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/bootcount_nvmem.c
index fa462c426..d58ee8090 100644
--- a/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/bootcount_nvmem.c
+++ b/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/bootcount_nvmem.c
@@ -37,6 +37,7 @@ struct platform_nvmem platforms_nvmem[] = {
 	[PLATFORM_CC8MM] = {"/sys/bus/i2c/devices/0-0063/nvram", 0, 1},
 	[PLATFORM_CC8MN] = {"/sys/bus/i2c/devices/0-0063/nvram", 0, 1},
 	[PLATFORM_CC8X] = {"/sys/bus/i2c/devices/0-0063/nvram", 0, 1},
+	[PLATFORM_CC91] = {"/sys/bus/i2c/devices/2-0052/rv3028_nvram0/nvmem", 0, 1},
 	[PLATFORM_CC93] = {"/sys/bus/i2c/devices/2-0052/rv3028_nvram0/nvmem", 0, 1},
 	[PLATFORM_CCMP13] = {"/sys/bus/i2c/devices/2-0052/rv3028_nvram0/nvmem", 0, 1},
 	[PLATFORM_CCMP15] = {"/sys/bus/i2c/devices/6-0052/rv3028_nvram0/nvmem", 0, 1},
diff --git a/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/include/platform_utils.h b/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/include/platform_utils.h
index 7086c1a8c..d453630ce 100644
--- a/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/include/platform_utils.h
+++ b/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/include/platform_utils.h
@@ -27,6 +27,7 @@ typedef enum {
 	PLATFORM_CC8MM,
 	PLATFORM_CC8MN,
 	PLATFORM_CC8X,
+	PLATFORM_CC91,
 	PLATFORM_CC93,
 	PLATFORM_CCMP13,
 	PLATFORM_CCMP15,
diff --git a/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/platform_utils.c b/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/platform_utils.c
index 937ef7b57..3030f07ae 100644
--- a/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/platform_utils.c
+++ b/meta-digi-dey/recipes-digi/bootcount/bootcount/bootcount-bin/platform_utils.c
@@ -29,6 +29,7 @@ char* platform_names[] = {
 	[PLATFORM_CC8MM] = "ccimx8mm",
 	[PLATFORM_CC8MN] = "ccimx8mn",
 	[PLATFORM_CC8X] = "ccimx8x",
+	[PLATFORM_CC91] = "ccimx91",
 	[PLATFORM_CC93] = "ccimx93",
 	[PLATFORM_CCMP13] = "ccmp13",
 	[PLATFORM_CCMP15] = "ccmp15",
diff --git a/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx93-dvk/libdigiapix.conf b/meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx9/libdigiapix.conf
similarity index 100%
rename from meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx93-dvk/libdigiapix.conf
rename to meta-digi-dey/recipes-digi/libdigiapix/libdigiapix-git/ccimx9/libdigiapix.conf
diff --git a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
index b5a24018b..68fbf4236 100644
--- a/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
+++ b/meta-digi-dey/recipes-digi/packagegroups/packagegroup-dey-examples.bb
@@ -27,4 +27,4 @@ RDEPENDS:${PN}:append:ccimx6 = "\
 	dey-examples-v4l2 \
 "
 
-COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x|ccimx93)"
+COMPATIBLE_MACHINE = "(ccimx6$|ccimx6ul|ccimx8m|ccimx8x|ccimx9)"
diff --git a/meta-digi-dey/recipes-digi/swu-images/files/swupdate_uboot_mmc.sh b/meta-digi-dey/recipes-digi/swu-images/files/swupdate_uboot_mmc.sh
index fa76b176a..da772ae94 100755
--- a/meta-digi-dey/recipes-digi/swu-images/files/swupdate_uboot_mmc.sh
+++ b/meta-digi-dey/recipes-digi/swu-images/files/swupdate_uboot_mmc.sh
@@ -140,9 +140,9 @@ dump_dek_ccimx8m_ccimx6 ()
 	fi
 }
 
-dump_dek_ccimx93 ()
+dump_dek_ccimx9 ()
 {
-	exit_error "## ERROR: DEK support not implemented yet for CCIMX93."
+	exit_error "## ERROR: DEK support not implemented yet for CCIMX9."
 }
 
 dump_dek ()
@@ -157,8 +157,8 @@ dump_dek ()
 		ccimx6*)
 			dump_dek_ccimx8m_ccimx6 "${DEK_BLOB_HEADER_CCIMX6}"
 		;;
-		ccimx93*)
-			dump_dek_ccimx93
+		ccimx9*)
+			dump_dek_ccimx9
 		;;
 		*)
 			exit_error "## ERROR: Device not supported ${PLATFORM}."
@@ -207,9 +207,9 @@ append_dek_ccimx6 ()
 	fi
 }
 
-append_dek_ccimx93 ()
+append_dek_ccimx9 ()
 {
-	exit_error "## ERROR: DEK support not implemented yet for CCIMX93."
+	exit_error "## ERROR: DEK support not implemented yet for CCIMX9."
 }
 
 append_dek ()
@@ -225,8 +225,8 @@ append_dek ()
 		ccimx6*)
 			append_dek_ccimx6
 		;;
-		ccimx93*)
-			append_dek_ccimx93
+		ccimx9*)
+			append_dek_ccimx9
 		;;
 		*)
 			exit_error "## ERROR: Device not supported: ${PLATFORM}."
diff --git a/sdk/config/ccimx91-dvk/bblayers.conf.sample b/sdk/config/ccimx91-dvk/bblayers.conf.sample
new file mode 100644
index 000000000..1558e7315
--- /dev/null
+++ b/sdk/config/ccimx91-dvk/bblayers.conf.sample
@@ -0,0 +1,27 @@
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-poky \
+  ##OEROOT##/meta-yocto-bsp \
+  ##DIGIBASE##/meta-openembedded/meta-oe \
+  ##DIGIBASE##/meta-openembedded/meta-python \
+  ##DIGIBASE##/meta-openembedded/meta-multimedia \
+  ##DIGIBASE##/meta-openembedded/meta-networking \
+  ##DIGIBASE##/meta-openembedded/meta-webserver \
+  ##DIGIBASE##/meta-qt6 \
+  ##DIGIBASE##/meta-swupdate \
+  ##DIGIBASE##/meta-freescale \
+  ##DIGIBASE##/meta-fsl-demos \
+  ##DIGIBASE##/meta-webkit \
+  ##DIGIBASE##/meta-imx/meta-ml \
+  ##DIGIBASE##/meta-selinux \
+  ##DIGIBASE##/meta-timesys \
+  ##DIGIBASE##/meta-digi/meta-digi-arm \
+  ##DIGIBASE##/meta-digi/meta-digi-dey \
+  "
diff --git a/sdk/config/ccimx91-dvk/conf-notes.txt b/sdk/config/ccimx91-dvk/conf-notes.txt
new file mode 100644
index 000000000..16ae0f675
--- /dev/null
+++ b/sdk/config/ccimx91-dvk/conf-notes.txt
@@ -0,0 +1,7 @@
+Digi Embedded Yocto provides the following image recipes:
+
+  * core-image-base: a console-only image
+
+    Expansion of native core-image-base by including all the support for the
+    target device hardware like firmware files, rootfs customizations, etc.
+
diff --git a/sdk/config/ccimx91-dvk/local.conf.sample b/sdk/config/ccimx91-dvk/local.conf.sample
new file mode 100644
index 000000000..0dd62517f
--- /dev/null
+++ b/sdk/config/ccimx91-dvk/local.conf.sample
@@ -0,0 +1,293 @@
+#
+# This file is your local configuration file and is where all local user settings
+# are placed. The comments in this file give some guide to the options a new user
+# to the system might want to change but pretty much any configuration option can
+# be set in this file. More adventurous users can look at
+# local.conf.sample.extended which contains other examples of configuration which
+# can be placed in this file but new users likely won't need any of them
+# initially.
+#
+# Lines starting with the '#' character are commented out and in some cases the
+# default values are provided as comments to show people example syntax. Enabling
+# the option is a question of removing the # character and making any change to the
+# variable as required.
+
+#
+# Machine Selection
+#
+# You need to select a specific machine to target the build with. There are a selection
+# of emulated machines available which can boot and run in the QEMU emulator:
+#
+#MACHINE ?= "qemuarm"
+#MACHINE ?= "qemuarm64"
+#MACHINE ?= "qemumips"
+#MACHINE ?= "qemumips64"
+#MACHINE ?= "qemuppc"
+#MACHINE ?= "qemux86"
+#MACHINE ?= "qemux86-64"
+#
+# There are also the following hardware board target machines included for
+# demonstration purposes:
+#
+#MACHINE ?= "beaglebone-yocto"
+#MACHINE ?= "genericx86"
+#MACHINE ?= "genericx86-64"
+#MACHINE ?= "edgerouter"
+#
+# This sets the default machine to be qemux86-64 if no other machine is selected:
+#MACHINE ??= "qemux86-64"
+
+MACHINE = "ccimx91-dvk"
+
+#
+# Use Digi's internal git repositories
+#
+#DIGI_INTERNAL_GIT ?= "1"
+
+#
+# Where to place downloads
+#
+# During a first build the system will download many different source code tarballs
+# from various upstream projects. This can take a while, particularly if your network
+# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
+# can preserve this directory to speed up this part of subsequent builds. This directory
+# is safe to share between multiple builds on the same machine too.
+#
+# The default is a downloads directory under TOPDIR which is the build directory.
+#
+#DL_DIR ?= "${TOPDIR}/downloads"
+
+#
+# Where to place shared-state files
+#
+# BitBake has the capability to accelerate builds based on previously built output.
+# This is done using "shared state" files which can be thought of as cache objects
+# and this option determines where those files are placed.
+#
+# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
+# from these files if no changes were made to the configuration. If changes were made
+# to the configuration, only shared state files where the state was still valid would
+# be used (done using checksums).
+#
+# The default is a sstate-cache directory under TOPDIR.
+#
+#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
+
+#
+# Where to place the build output
+#
+# This option specifies where the bulk of the building work should be done and
+# where BitBake should place its temporary files and output. Keep in mind that
+# this includes the extraction and compilation of many applications and the toolchain
+# which can use Gigabytes of hard disk space.
+#
+# The default is a tmp directory under TOPDIR.
+#
+#TMPDIR = "${TOPDIR}/tmp"
+
+#
+# Default policy config
+#
+# The distribution setting controls which policy settings are used as defaults.
+# The default value is fine for general Yocto project use, at least initially.
+# Ultimately when creating custom policy, people will likely end up subclassing
+# these defaults.
+#
+DISTRO ?= "dey"
+# As an example of a subclass there is a "bleeding" edge policy configuration
+# where many versions are set to the absolute latest code from the upstream
+# source control systems. This is just mentioned here as an example, its not
+# useful to most new users.
+# DISTRO ?= "poky-bleeding"
+
+#
+# Package Management configuration
+#
+# This variable lists which packaging formats to enable. Multiple package backends
+# can be enabled at once and the first item listed in the variable will be used
+# to generate the root filesystems.
+# Options are:
+#  - 'package_deb' for debian style deb files
+#  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
+#  - 'package_rpm' for rpm style packages
+# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
+# We default to rpm:
+PACKAGE_CLASSES ?= "package_rpm"
+
+#
+# SDK target architecture
+#
+# This variable specifies the architecture to build SDK items for and means
+# you can build the SDK packages for architectures other than the machine you are
+# running the build on (i.e. building i686 packages on an x86_64 host).
+# Supported values are i686, x86_64, aarch64
+#SDKMACHINE ?= "i686"
+
+#
+# Extra image configuration defaults
+#
+# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated
+# images. Some of these options are added to certain image types automatically. The
+# variable can contain the following options:
+#  "dbg-pkgs"       - add -dbg packages for all installed packages
+#                     (adds symbol information for debugging/profiling)
+#  "src-pkgs"       - add -src packages for all installed packages
+#                     (adds source code for debugging)
+#  "dev-pkgs"       - add -dev packages for all installed packages
+#                     (useful if you want to develop against libs in the image)
+#  "ptest-pkgs"     - add -ptest packages for all ptest-enabled packages
+#                     (useful if you want to run the package test suites)
+#  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
+#  "tools-debug"    - add debugging tools (gdb, strace)
+#  "eclipse-debug"  - add Eclipse remote debugging support
+#  "tools-profile"  - add profiling tools (oprofile, lttng, valgrind)
+#  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
+#  "debug-tweaks"   - make an image suitable for development
+#                     e.g. ssh root access has a blank password
+# There are other application targets that can be used here too, see
+# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
+# We default to enabling the debugging tweaks.
+EXTRA_IMAGE_FEATURES ?= "debug-tweaks"
+
+#
+# Additional image features
+#
+# The following is a list of additional classes to use when building images which
+# enable extra features. Some available options which can be included in this variable
+# are:
+#   - 'buildstats' collect build statistics
+USER_CLASSES ?= "buildstats"
+
+#
+# Runtime testing of images
+#
+# The build system can test booting virtual machine images under qemu (an emulator)
+# after any root filesystems are created and run tests against those images. It can also
+# run tests against any SDK that are built. To enable this uncomment these lines.
+# See classes/test{image,sdk}.bbclass for further details.
+#IMAGE_CLASSES += "testimage testsdk"
+#TESTIMAGE_AUTO:qemuall = "1"
+
+#
+# Interactive shell configuration
+#
+# Under certain circumstances the system may need input from you and to do this it
+# can launch an interactive shell. It needs to do this since the build is
+# multithreaded and needs to be able to handle the case where more than one parallel
+# process may require the user's attention. The default is iterate over the available
+# terminal types to find one that works.
+#
+# Examples of the occasions this may happen are when resolving patches which cannot
+# be applied, to use the devshell or the kernel menuconfig
+#
+# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
+# Note: currently, Konsole support only works for KDE 3.x due to the way
+# newer Konsole versions behave
+#OE_TERMINAL = "auto"
+# By default disable interactive patch resolution (tasks will just fail instead):
+PATCHRESOLVE = "noop"
+
+#
+# Disk Space Monitoring during the build
+#
+# Monitor the disk space during the build. If there is less that 1GB of space or less
+# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
+# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard halt
+# of the build. The reason for this is that running completely out of space can corrupt
+# files and damages the build in ways which may not be easily recoverable.
+# It's necessary to monitor /tmp, if there is no space left the build will fail
+# with very exotic errors.
+BB_DISKMON_DIRS ??= "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    HALT,${TMPDIR},100M,1K \
+    HALT,${DL_DIR},100M,1K \
+    HALT,${SSTATE_DIR},100M,1K \
+    HALT,/tmp,10M,1K"
+
+#
+# Shared-state files from other locations
+#
+# As mentioned above, shared state files are prebuilt cache data objects which can be
+# used to accelerate build time. This variable can be used to configure the system
+# to search other mirror locations for these objects before it builds the data itself.
+#
+# This can be a filesystem directory, or a remote url such as https or ftp. These
+# would contain the sstate-cache results from previous builds (possibly from other
+# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the
+# cache locations to check for the shared objects.
+# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH
+# at the end as shown in the examples below. This will be substituted with the
+# correct path within the directory structure.
+#SSTATE_MIRRORS ?= "\
+#file://.* https://someserver.tld/share/sstate/PATH;downloadfilename=PATH \
+#file://.* file:///some/local/dir/sstate/PATH"
+
+#
+# Yocto Project SState Mirror
+#
+# The Yocto Project has prebuilt artefacts available for its releases, you can enable
+# use of these by uncommenting the following lines. This will mean the build uses
+# the network to check for artefacts at the start of builds, which does slow it down
+# equally, it will also speed up the builds by not having to build things if they are
+# present in the cache. It assumes you can download something faster than you can build it
+# which will depend on your network.
+# Note: For this to work you also need hash-equivalence passthrough to the matching server
+#
+#BB_HASHSERVE_UPSTREAM = "typhoon.yocto.io:8687"
+#SSTATE_MIRRORS ?= "file://.* http://sstate.yoctoproject.org/4.0/PATH;downloadfilename=PATH"
+
+#
+# Qemu configuration
+#
+# By default native qemu will build with a builtin VNC server where graphical output can be
+# seen. The line below enables the SDL UI frontend too.
+PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
+# By default libsdl2-native will be built, if you want to use your host's libSDL instead of
+# the minimal libsdl built by libsdl2-native then uncomment the ASSUME_PROVIDED line below.
+#ASSUME_PROVIDED += "libsdl2-native"
+
+# You can also enable the Gtk UI frontend, which takes somewhat longer to build, but adds
+# a handy set of menus for controlling the emulator.
+#PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"
+
+#
+# Hash Equivalence
+#
+# Enable support for automatically running a local hash equivalence server and
+# instruct bitbake to use a hash equivalence aware signature generator. Hash
+# equivalence improves reuse of sstate by detecting when a given sstate
+# artifact can be reused as equivalent, even if the current task hash doesn't
+# match the one that generated the artifact.
+#
+# A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format
+#
+#BB_HASHSERVE = "auto"
+#BB_SIGNATURE_HANDLER = "OEEquivHash"
+
+#
+# Memory Resident Bitbake
+#
+# Bitbake's server component can stay in memory after the UI for the current command
+# has completed. This means subsequent commands can run faster since there is no need
+# for bitbake to reload cache files and so on. Number is in seconds, after which the
+# server will shut down.
+#
+#BB_SERVER_TIMEOUT = "60"
+
+# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
+# track the version of this file when it was generated. This can safely be ignored if
+# this doesn't mean anything to you.
+CONF_VERSION = "2"
+
+#
+# Enable local PR server
+#
+PRSERV_HOST = "localhost:0"
+
+#
+# Some libraries and packages are covered by NXP EULA
+#
+#ACCEPT_FSL_EULA = "1"