diff --git a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
index b5b33f670..0879801ea 100644
--- a/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mm-dvk.conf
@@ -21,6 +21,7 @@ SPL_BINARY = "spl/u-boot-spl.bin"
 UBOOT_DTB_NAME = "ccimx8mm-dvk.dtb"
 
 ATF_PLATFORM = "imx8mm"
+IMX_BOOT_SOC_TARGET = "iMX8MM"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx8mm-dvk.dtb \
diff --git a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
index 21f16da00..5f884843e 100644
--- a/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
+++ b/meta-digi-arm/conf/machine/ccimx8mn-dvk.conf
@@ -21,6 +21,7 @@ SPL_BINARY = "spl/u-boot-spl.bin"
 UBOOT_DTB_NAME = "ccimx8mn-dvk.dtb"
 
 ATF_PLATFORM = "imx8mn"
+IMX_BOOT_SOC_TARGET = "iMX8MN"
 
 KERNEL_DEVICETREE ?= " \
     digi/ccimx8mn-dvk.dtb \
diff --git a/meta-digi-arm/conf/machine/include/ccimx8m.inc b/meta-digi-arm/conf/machine/include/ccimx8m.inc
index ef5ec1caf..0cfe9022b 100644
--- a/meta-digi-arm/conf/machine/include/ccimx8m.inc
+++ b/meta-digi-arm/conf/machine/include/ccimx8m.inc
@@ -15,8 +15,14 @@ BOOTLOADER_IMAGE_RECIPE = "imx-boot"
 BOOTABLE_FILENAME = "${UBOOT_PREFIX}-${MACHINE}.bin"
 SDIMG_BOOTLOADER = "${DEPLOY_DIR_IMAGE}/${BOOTABLE_FILENAME}"
 
-# Set LPDDR4 FIRMWARE
-DDR_FIRMWARE_NAME = "lpddr4_pmu_train_1d_imem.bin lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_2d_imem.bin lpddr4_pmu_train_2d_dmem.bin"
+# LPDDR4 firmware
+DDR_FIRMWARE_NAME = " \
+    lpddr4_pmu_train_1d_imem.bin \
+    lpddr4_pmu_train_1d_dmem.bin \
+    lpddr4_pmu_train_2d_imem.bin \
+    lpddr4_pmu_train_2d_dmem.bin \
+"
+IMXBOOT_TARGETS = "flash_evk"
 
 # Linux kernel configuration
 KERNEL_DEFCONFIG ?= "arch/arm64/configs/ccimx8_defconfig"
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 006826a10..948776ff9 100644
--- a/meta-digi-arm/conf/machine/include/imx-digi-base.inc
+++ b/meta-digi-arm/conf/machine/include/imx-digi-base.inc
@@ -13,6 +13,13 @@ include conf/machine/include/digi-defaults.inc
 IMX_DEFAULT_BSP ?= "nxp"
 MACHINEOVERRIDES =. "use-${IMX_DEFAULT_BSP}-bsp:"
 
+# Allow setting the UART used during the boot by ATF.
+# FIXME: We should return INVALID here but currently only i.MX8M has support to override the UART
+# base address in source code.
+SOC_ATF_BOOT_UART_BASE         = ""
+SOC_ATF_BOOT_UART_BASE:ccimx8m = "0x30860000"
+ATF_BOOT_UART_BASE            ?= "${SOC_ATF_BOOT_UART_BASE}"
+
 XSERVER_DRIVER = "xf86-video-fbdev"
 XSERVER_DRIVER:imxgpu2d = "xf86-video-imx-vivante"
 XSERVER_DRIVER:append:mx8-generic-bsp = " xf86-video-modesetting"