7 files changed, 48 insertions, 13 deletions

diff --git a/conf/machine/imx8dxl-a1-ddr3l-evk.conf b/conf/machine/imx8dxl-a1-ddr3l-evk.conf
new file mode 100644
index 00000000..e2be4277
--- /dev/null
+++ b/conf/machine/imx8dxl-a1-ddr3l-evk.conf
@@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: i.MX 8DXL A1 EVK with DDR3L
+#@SOC: i.MX8DXL A1
+#@DESCRIPTION: Machine configuration for NXP i.MX 8DualXLite A1 Evaluation Kit with DDR3L
+#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
+
+require conf/machine/include/imx8dxl-ddr3l-evk.inc
+
+IMX_SOC_REV = "A1"
diff --git a/conf/machine/imx8dxl-a1-lpddr4-evk.conf b/conf/machine/imx8dxl-a1-lpddr4-evk.conf
new file mode 100644
index 00000000..24942cf4
--- /dev/null
+++ b/conf/machine/imx8dxl-a1-lpddr4-evk.conf
@@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: i.MX 8DXL A1 EVK with LPDDR4
+#@SOC: i.MX8DXL A1
+#@DESCRIPTION: Machine configuration for NXP i.MX 8DualXLite A1 Evaluation Kit with LPDDR4
+#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
+
+require conf/machine/include/imx8dxl-lpddr4-evk.inc
+
+IMX_SOC_REV = "A1"
diff --git a/conf/machine/imx8dxl-b0-ddr3l-evk.conf b/conf/machine/imx8dxl-b0-ddr3l-evk.conf
new file mode 100644
index 00000000..0ffc176d
--- /dev/null
+++ b/conf/machine/imx8dxl-b0-ddr3l-evk.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: i.MX 8DXL B0 EVK with DDR3L
+#@SOC: i.MX8DXL B0
+#@DESCRIPTION: Machine configuration for NXP i.MX 8DualXLite B0 Evaluation Kit with DDR3L
+#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
+
+require conf/machine/include/imx8dxl-ddr3l-evk.inc
+
+IMX_SOC_REV = "B0"
+
+MACHINE_FEATURES:append:use-nxp-bsp = " optee"
diff --git a/conf/machine/imx8dxl-b0-lpddr4-evk.conf b/conf/machine/imx8dxl-b0-lpddr4-evk.conf
new file mode 100644
index 00000000..2d4d1e0d
--- /dev/null
+++ b/conf/machine/imx8dxl-b0-lpddr4-evk.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME: i.MX 8DXL B0 EVK with LPDDR4
+#@SOC: i.MX8DXL B0
+#@DESCRIPTION: Machine configuration for NXP i.MX 8DualXLite B0 Evaluation Kit with LPDDR4
+#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
+
+require conf/machine/include/imx8dxl-lpddr4-evk.inc
+
+IMX_SOC_REV = "B0"
+
+MACHINE_FEATURES:append:use-nxp-bsp = " optee"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 49c90c1e..2c4b8dbd 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -175,7 +175,8 @@ IMX_SOC_REV:mx8qxp-generic-bsp ??= \
     "${@bb.utils.contains('MACHINE_FEATURES', 'soc-revb0', 'B0', \
                                                            'C0', d)}"
 IMX_SOC_REV:mx8dx-generic-bsp  ??= "C0"
-IMX_SOC_REV:mx8dxl-generic-bsp ??= "A1"
+# WARNING: Don't set a default for 8DXL since an image built with A1 can brick a B0 board
+#IMX_SOC_REV:mx8dxl-generic-bsp ??= ""
 IMX_SOC_REV:mx8ulp-generic-bsp ??= \
     "${@bb.utils.contains('MACHINE_FEATURES', 'soc-reva0', 'A0', \
                                                            'A1', d)}"
diff --git a/conf/machine/imx8dxl-ddr3l-evk.conf b/conf/machine/include/imx8dxl-ddr3l-evk.inc
index 7d46e2b4..9c21aa35 100644
--- a/conf/machine/imx8dxl-ddr3l-evk.conf
+++ b/conf/machine/include/imx8dxl-ddr3l-evk.inc
@@ -1,12 +1,9 @@
-#@TYPE: Machine
-#@NAME: i.MX 8DXL EVK with DDR3
-#@SOC: i.MX8DXL
-#@DESCRIPTION: NXP i.MX 8DXLite Evaluation Kit with DDR3
-#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
-
 require conf/machine/include/imx8dxl-evk.inc
+
 KERNEL_DEVICETREE_BASENAME = "imx8dxl-ddr3l-evk"
+
 UBOOT_CONFIG_BASENAME = "imx8dxl_ddr3l_evk"
+
 UBOOT_CONFIG[nand] = "${UBOOT_CONFIG_BASENAME}_nand_defconfig"
 
 BOARD_TYPE = "ddr3-evk"
diff --git a/conf/machine/imx8dxl-lpddr4-evk.conf b/conf/machine/include/imx8dxl-lpddr4-evk.inc
index 915c3fa9..b3b906ec 100644
--- a/conf/machine/imx8dxl-lpddr4-evk.conf
+++ b/conf/machine/include/imx8dxl-lpddr4-evk.inc
@@ -1,11 +1,7 @@
-#@TYPE: Machine
-#@NAME: i.MX 8DXL EVK with LPDDR4
-#@SOC: i.MX8DXL
-#@DESCRIPTION: i.MX 8DXLite Evaluation Kit with LPDDR4
-#@MAINTAINER: Lauren Post <lauren.post@nxp.com>
-
 require conf/machine/include/imx8dxl-evk.inc
+
 KERNEL_DEVICETREE_BASENAME = "imx8dxl-evk"
+
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-enet0.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-enet0-tja1100.dtb \
@@ -13,6 +9,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
 "
+
 UBOOT_CONFIG_BASENAME = "imx8dxl_evk"
 
 UBOOT_CONFIG[lcd] = "${UBOOT_CONFIG_BASENAME}_lcd_defconfig"