diff --git a/meta-bsp/conf/layer.conf b/meta-bsp/conf/layer.conf
index ec25214657..570913084d 100644
--- a/meta-bsp/conf/layer.conf
+++ b/meta-bsp/conf/layer.conf
@@ -461,6 +461,9 @@ IMAGE_BOOT_FILES:append:imx93-11x11-lpddr4x-evk = " \
 "
 
 # Overrides for imx93-14x14-lpddr4x-evk.conf
+KERNEL_DEVICETREE:append:imx93-14x14-lpddr4x-evk = " \
+    freescale/imx93-14x14-evk-flexspi-m2.dtb \
+"
 MACHINE_FEATURES:append:imx93-14x14-lpddr4x-evk = " dpdk nxpiw612-sdio"
 MACHINE_FIRMWARE:append:imx93-14x14-lpddr4x-evk = " ethos-u-firmware"
 WKS_FILE_DEPENDS:append:imx93-14x14-lpddr4x-evk = " imx-m33-demos"
diff --git a/meta-bsp/conf/machine/imx93-14x14-lpddr4x-evk.conf b/meta-bsp/conf/machine/imx93-14x14-lpddr4x-evk.conf
deleted file mode 100644
index cc09cb7a70..0000000000
--- a/meta-bsp/conf/machine/imx93-14x14-lpddr4x-evk.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-#@TYPE: Machine
-#@NAME: NXP i.MX 93 14x14 Evaluation Kit with LPDDR4X
-#@SOC: i.MX93
-#@DESCRIPTION: Machine configuration for NXP i.MX 93 14x14 EVK with LPDDR4X
-#@MAINTAINER: Jun Zhu <junzhu@nxp.com>
-
-MACHINEOVERRIDES =. "mx93:"
-
-require conf/machine/include/imx93-evk.inc
-
-KERNEL_DEVICETREE_BASENAME = "imx93-14x14-evk"
-
-KERNEL_DEVICETREE:append:use-nxp-bsp = " \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-aud-hat.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-flexspi-m2.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-tja1103.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-mqs.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-rm67199.dtb \
-"
-
-UBOOT_CONFIG_BASENAME = "imx93_14x14_evk"
-IMXBOOT_TARGETS_BASENAME = "flash_singleboot"
-
-DDR_FIRMWARE_NAME = " \
-    lpddr4_dmem_1d_v202201.bin \
-    lpddr4_dmem_2d_v202201.bin \
-    lpddr4_imem_1d_v202201.bin \
-    lpddr4_imem_2d_v202201.bin \
-"
-
-UBOOT_CONFIG[fspi]   = "${UBOOT_CONFIG_BASENAME}_defconfig"
-
-IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}"