diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
index 3da6b55df..c67c00d87 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-express/boot.txt
@@ -2,11 +2,16 @@
 # U-Boot bootscript for EMMC/SD images created by Yocto.
 #
 
+# Set SOC type to "8qxp" if not already defined by U-Boot
+if test ! -n "${soc_type}"; then
+	setenv soc_type "8qxp"
+fi
+
 #
 # Set device tree filename depending on the board ID (if defined)
 #
 if test -n "${board_id}"; then
-	setenv fdt_file ccimx8x-sbc-express-id${board_id}.dtb
+	setenv fdt_file ccimx${soc_type}-sbc-express-id${board_id}.dtb
 else
 	#
 	# Set device tree filename depending on the hardware capabilities
@@ -18,9 +23,9 @@ else
 
 		if test "${module_has_wifi}" = "1" &&
 		   test "${module_has_bt}" = "1"; then
-			setenv fdt_file ccimx8x-sbc-express-wb.dtb
+			setenv fdt_file ccimx${soc_type}-sbc-express-wb.dtb
 		else
-			setenv fdt_file ccimx8x-sbc-express.dtb
+			setenv fdt_file ccimx${soc_type}-sbc-express.dtb
 		fi
 	else
 		#
@@ -29,12 +34,12 @@ else
 		if test "${module_variant}" = "0x01" ||
 		   test "${module_variant}" = "0x02" ||
 		   test "${module_variant}" = "0x04"; then
-			setenv fdt_file ccimx8x-sbc-express-wb.dtb
+			setenv fdt_file ccimx${soc_type}-sbc-express-wb.dtb
 		elif test "${module_variant}" = "0x03" ||
 		     test "${module_variant}" = "0x05"; then
-			setenv fdt_file ccimx8x-sbc-express.dtb
+			setenv fdt_file ccimx${soc_type}-sbc-express.dtb
 		else
-			setenv fdt_file ccimx8x-sbc-express-wb.dtb
+			setenv fdt_file ccimx${soc_type}-sbc-express-wb.dtb
 		fi
 	fi
 fi
diff --git a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
index a8d37c69d..2d069bc79 100644
--- a/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
+++ b/meta-digi-arm/recipes-bsp/u-boot/u-boot-dey/ccimx8x-sbc-pro/boot.txt
@@ -2,11 +2,16 @@
 # U-Boot bootscript for EMMC/SD images created by Yocto.
 #
 
+# Set SOC type to "8qxp" if not already defined by U-Boot
+if test ! -n "${soc_type}"; then
+	setenv soc_type "8qxp"
+fi
+
 #
 # Set device tree filename depending on the board ID (if defined)
 #
 if test -n "${board_id}"; then
-	setenv fdt_file ccimx8x-sbc-pro-id${board_id}.dtb
+	setenv fdt_file ccimx${soc_type}-sbc-pro-id${board_id}.dtb
 else
 	#
 	# Set device tree filename depending on the hardware capabilities
@@ -18,9 +23,9 @@ else
 
 		if test "${module_has_wifi}" = "1" &&
 		   test "${module_has_bt}" = "1"; then
-			setenv fdt_file ccimx8x-sbc-pro-wb.dtb
+			setenv fdt_file ccimx${soc_type}-sbc-pro-wb.dtb
 		else
-			setenv fdt_file ccimx8x-sbc-pro.dtb
+			setenv fdt_file ccimx${soc_type}-sbc-pro.dtb
 		fi
 	else
 		#
@@ -29,12 +34,12 @@ else
 		if test "${module_variant}" = "0x01" ||
 		   test "${module_variant}" = "0x02" ||
 		   test "${module_variant}" = "0x04"; then
-			setenv fdt_file ccimx8x-sbc-pro-wb.dtb
+			setenv fdt_file ccimx${soc_type}-sbc-pro-wb.dtb
 		elif test "${module_variant}" = "0x03" ||
 		     test "${module_variant}" = "0x05"; then
-			setenv fdt_file ccimx8x-sbc-pro.dtb
+			setenv fdt_file ccimx${soc_type}-sbc-pro.dtb
 		else
-			setenv fdt_file ccimx8x-sbc-pro-wb.dtb
+			setenv fdt_file ccimx${soc_type}-sbc-pro-wb.dtb
 		fi
 	fi
 fi