21 files changed, 107 insertions, 46 deletions

diff --git a/conf/machine/imx8dx-mek.conf b/conf/machine/imx8dx-mek.conf
index 842ba1fa..d1aaa8ee 100644
--- a/conf/machine/imx8dx-mek.conf
+++ b/conf/machine/imx8dx-mek.conf
@@ -10,3 +10,7 @@ require include/imx8x-mek.inc
 KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
 
 UBOOT_CONFIG_BASENAME = "imx8dx_mek"
+
+ATF_PLATFORM = "imx8dx"
+
+IMX_BOOT_SOC_TARGET = "iMX8DX"
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf
index 6484da7c..cf926c08 100644
--- a/conf/machine/imx8mp-lpddr4-evk.conf
+++ b/conf/machine/imx8mp-lpddr4-evk.conf
@@ -14,9 +14,11 @@ KERNEL_DEVICETREE_BASENAME = "imx8mp-evk"
 KERNEL_DEVICETREE_append_use-nxp-bsp = " \
         freescale/imx8mp-ab2.dtb \
         freescale/imx8mp-evk-basler.dtb \
+        freescale/imx8mp-evk-basler-ov2775.dtb \
         freescale/imx8mp-evk-basler-ov5640.dtb \
         freescale/imx8mp-evk-dsp.dtb \
         freescale/imx8mp-evk-dsp-lpa.dtb \
+        freescale/imx8mp-evk-dual-basler.dtb \
         freescale/imx8mp-evk-dual-ov2775.dtb \
         freescale/imx8mp-evk-flexcan2.dtb \
         freescale/imx8mp-evk-inmate.dtb \
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf
index fe0f6727..5b29138f 100644
--- a/conf/machine/imx8qxp-mek.conf
+++ b/conf/machine/imx8qxp-mek.conf
@@ -24,3 +24,7 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \
 "
 
 UBOOT_CONFIG_BASENAME = "imx8qxp_mek"
+
+ATF_PLATFORM = "imx8qx"
+
+IMX_BOOT_SOC_TARGET = "iMX8QX"
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index a1ab6cc3..65b1e6e0 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -82,9 +82,9 @@ UBOOT_ENTRYPOINT_mx6    = "0x10008000"
 UBOOT_ENTRYPOINT_mx6sl  = "0x80008000"
 UBOOT_ENTRYPOINT_mx6sll = "0x80008000"
 UBOOT_ENTRYPOINT_mx6sx  = "0x80008000"
-UBOOT_ENTRYPOINT_mx6ul  = "0x10008000"
-UBOOT_ENTRYPOINT_mx6ull = "0x10008000"
-UBOOT_ENTRYPOINT_mx6ulz = "0x10008000"
+UBOOT_ENTRYPOINT_mx6ul  = "0x80008000"
+UBOOT_ENTRYPOINT_mx6ull = "0x80008000"
+UBOOT_ENTRYPOINT_mx6ulz = "0x80008000"
 UBOOT_ENTRYPOINT_mx7    = "0x80008000"
 UBOOT_ENTRYPOINT_mx7ulp = "0x60008000"
 UBOOT_ENTRYPOINT_mx8m   = "0x40480000"
@@ -383,7 +383,7 @@ PREFERRED_VERSION_optee-client_mx8 ?= "3.10.0.imx"
 PREFERRED_VERSION_optee-test_mx8   ?= "3.10.0.imx"
 
 #Use i.MX opencv Version for mx8
-PREFERRED_VERSION_opencv_mx8 ?= "4.4.0.imx"
+PREFERRED_VERSION_opencv_mx8 ?= "4.5.2.imx"
 
 # Handle default kernel
 IMX_DEFAULT_KERNEL = "linux-fslc-imx"
@@ -454,16 +454,15 @@ SOC_DEFAULT_WKS_FILE_mx8m ?= "imx-imx-boot-bootpart.wks.in"
 SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in"
 SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
 
-# Boot container built as a part of mainline U-Boot uses the same WKS
-# file as the entire mx8m series, as it renames flash.bin binary to
-# imx-boot before it is packed into the boot partition.
-# This operation is performed in imx-boot-container class as a part of
-# delopyment task.
-# flash.bin binary is produced by U-Boot build itself, and is serves as a
-# direct replacement of imx-boot from NXP.
-# Creation of the flash.bin is controlled by UBOOT_PROVIDES_BOOT_CONTAINER
-# variable defined above
-SOC_DEFAULT_WKS_FILE_imx-boot-container ?= "imx-imx-boot-bootpart.wks.in"
+# Boot container built as a part of mainline U-Boot uses different WKS
+# file as the entire mx8m series, as U-Boot versions later than 2021.04 are
+# providing two separate binaries, namely flash.bin and u-boot.itb. Those
+# files are packed into the boot partition.
+# Binaries produced by U-Boot build itself are serving as a direct
+# replacement of imx-boot from NXP.
+# Creation of those binary files is controlled by UBOOT_PROVIDES_BOOT_CONTAINER
+# variable defined above.
+SOC_DEFAULT_WKS_FILE_imx-boot-container ?= "imx-boot-container-bootpart.wks.in"
 
 WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
 
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index 9b590fe0..bcf838ab 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -45,6 +45,25 @@ IMX_BOOT_SOC_TARGET = "iMX8MM"
 
 SERIAL_CONSOLES = "115200;ttymxc1"
 
+# Add support for Syslinux to mainline BSP.
+# U-Boot has the Distro Boot mode enabled by default, which
+# require that either Syslinux to be enabled, or a boot script
+# to be used to define the boot process.
+# We opt-in for Syslinux, since it is designated as a preferred
+# distro boot mode according to the U-Boot documentation.
+UBOOT_EXTLINUX_use-mainline-bsp = "1"
+UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default"
+UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Mini EVK"
+
+UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Mini EVK"
+UBOOT_EXTLINUX_FDT_default_use-mainline-bsp     = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
+UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}"
+UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp    = "root=/dev/mmcblk1p2"
+
+# Add extlinux.conf to the lis of files, which are deployed onto the
+# boot partition
+IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
+
 LOADADDR = ""
 UBOOT_SUFFIX = "bin"
 UBOOT_MAKE_TARGET = "all"
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index 6a5b31f7..a0e39857 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -46,6 +46,25 @@ IMX_BOOT_SOC_TARGET = "iMX8MN"
 
 SERIAL_CONSOLES = "115200;ttymxc1"
 
+# Add support for Syslinux to mainline BSP.
+# U-Boot has the Distro Boot mode enabled by default, which
+# require that either Syslinux to be enabled, or a boot script
+# to be used to define the boot process.
+# We opt-in for Syslinux, since it is designated as a preferred
+# distro boot mode according to the U-Boot documentation.
+UBOOT_EXTLINUX_use-mainline-bsp = "1"
+UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default"
+UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Nano EVK"
+
+UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Nano EVK"
+UBOOT_EXTLINUX_FDT_default_use-mainline-bsp     = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
+UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}"
+UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp    = "root=/dev/mmcblk1p2"
+
+# Add extlinux.conf to the lis of files, which are deployed onto the
+# boot partition
+IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
+
 BOOT_SPACE = "65536"
 LOADADDR = ""
 UBOOT_SUFFIX = "bin"
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc
index 872d07a0..814638d0 100644
--- a/conf/machine/include/imx8mp-evk.inc
+++ b/conf/machine/include/imx8mp-evk.inc
@@ -43,6 +43,25 @@ IMX_BOOT_SOC_TARGET = "iMX8MP"
 
 SERIAL_CONSOLES = "115200;ttymxc1"
 
+# Add support for Syslinux to mainline BSP.
+# U-Boot has the Distro Boot mode enabled by default, which
+# require that either Syslinux to be enabled, or a boot script
+# to be used to define the boot process.
+# We opt-in for Syslinux, since it is designated as a preferred
+# distro boot mode according to the U-Boot documentation.
+UBOOT_EXTLINUX_use-mainline-bsp = "1"
+UBOOT_EXTLINUX_LABELS_use-mainline-bsp = "default"
+UBOOT_EXTLINUX_DEFAULT_LABEL_use-mainline-bsp = "i.MX8M Plus EVK"
+
+UBOOT_EXTLINUX_MENU_DESCRIPTION_default_use-mainline-bsp = "i.MX8M Plus EVK"
+UBOOT_EXTLINUX_FDT_default_use-mainline-bsp     = "../${KERNEL_DEVICETREE_BASENAME}.dtb"
+UBOOT_EXTLINUX_CONSOLE_default_use-mainline-bsp = "console=${console}"
+UBOOT_EXTLINUX_ROOT_default_use-mainline-bsp    = "root=/dev/mmcblk1p2"
+
+# Add extlinux.conf to the lis of files, which are deployed onto the
+# boot partition
+IMAGE_BOOT_FILES_append_use-mainline-bsp = " extlinux.conf;extlinux/extlinux.conf"
+
 LOADADDR = ""
 UBOOT_SUFFIX = "bin"
 UBOOT_MAKE_TARGET = "all"
diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc
index 814a34c1..55a28c87 100644
--- a/conf/machine/include/imx8x-mek.inc
+++ b/conf/machine/include/imx8x-mek.inc
@@ -59,9 +59,6 @@ IMX_BOOT_SEEK = "32"
 IMX_DEFAULT_BOOTLOADER = "u-boot-imx"
 UBOOT_SUFFIX = "bin"
 
-# Set ATF platform name
-ATF_PLATFORM = "imx8qx"
-
 IMXBOOT_TARGETS_SD = \
     "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl', \
                                                        'flash', d)}"
@@ -71,8 +68,6 @@ IMXBOOT_TARGETS_FSPI = \
 IMXBOOT_TARGETS = \
     "${@bb.utils.contains('UBOOT_CONFIG',        'sd', '${IMXBOOT_TARGETS_SD}', \
                                                        '${IMXBOOT_TARGETS_FSPI}', d)}"
-IMX_BOOT_SOC_TARGET = "iMX8QX"
-
 BOARD_TYPE = "mek"
 
 # Add additional firmware
diff --git a/conf/machine/ls1012afrwy.conf b/conf/machine/ls1012afrwy.conf
index 72605cc1..7de1e990 100644
--- a/conf/machine/ls1012afrwy.conf
+++ b/conf/machine/ls1012afrwy.conf
@@ -19,8 +19,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls1012afrwy_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1012afrwy_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls1012afrwy_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1012afrwy_tfa_SECURE_BOOT_defconfig"
 
 RCWQSPI ?= "N_SSNP_3305/rcw_1000"
 
diff --git a/conf/machine/ls1012ardb.conf b/conf/machine/ls1012ardb.conf
index b4bfc571..879e3f8f 100644
--- a/conf/machine/ls1012ardb.conf
+++ b/conf/machine/ls1012ardb.conf
@@ -19,8 +19,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls1012ardb_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1012ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls1012ardb_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1012ardb_tfa_SECURE_BOOT_defconfig"
 
 RCWQSPI ?= "R_SPNH_3508/rcw_1000"
 RCWQSPISEC ?= "R_SPNH_3508/rcw_1000"
diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf
index aa0f0943..e4bfb79c 100644
--- a/conf/machine/ls1021atwr.conf
+++ b/conf/machine/ls1021atwr.conf
@@ -15,12 +15,12 @@ MACHINE_FEATURES += "optee"
 DEFAULTTUNE = "cortexa7hf-neon"
 
 UBOOT_CONFIG ??= "sdcard-ifc-secure-boot sdcard-ifc sdcard-qspi lpuart qspi secure-boot nor"
-UBOOT_CONFIG[nor] = "ls1021atwr_nor_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[nor] = "ls1021atwr_nor_defconfig"
 UBOOT_CONFIG[sdcard-ifc] = "ls1021atwr_sdcard_ifc_defconfig,,u-boot-with-spl-pbl.bin"
 UBOOT_CONFIG[sdcard-qspi] = "ls1021atwr_sdcard_qspi_defconfig,,u-boot-with-spl-pbl.bin"
-UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[lpuart] = "ls1021atwr_nor_lpuart_defconfig"
+UBOOT_CONFIG[qspi] = "ls1021atwr_qspi_defconfig"
+UBOOT_CONFIG[secure-boot] = "ls1021atwr_nor_SECURE_BOOT_defconfig"
 UBOOT_CONFIG[sdcard-ifc-secure-boot] = "ls1021atwr_sdcard_ifc_SECURE_BOOT_defconfig,,u-boot-with-spl-pbl.bin"
 
 QE_UCODE="iram_Type_A_LS1021a_r1.0.bin"
diff --git a/conf/machine/ls1028ardb.conf b/conf/machine/ls1028ardb.conf
index 7647bf41..63f3802f 100644
--- a/conf/machine/ls1028ardb.conf
+++ b/conf/machine/ls1028ardb.conf
@@ -18,8 +18,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1028ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa] = "ls1028ardb_tfa_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1028ardb_tfa_SECURE_BOOT_defconfig"
+UBOOT_CONFIG[tfa] = "ls1028ardb_tfa_defconfig"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1028a-rdb.dtb freescale/fsl-ls1028a-qds.dtb"
 KERNEL_DEVICETREE_append_use-nxp-bsp = "\
diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf
index db66cad8..fa8ab615 100644
--- a/conf/machine/ls1043ardb.conf
+++ b/conf/machine/ls1043ardb.conf
@@ -19,8 +19,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls1043ardb_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1043ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls1043ardb_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1043ardb_tfa_SECURE_BOOT_defconfig"
 
 KERNEL_DEVICETREE ?= "\
     freescale/fsl-ls1043a-rdb.dtb \
diff --git a/conf/machine/ls1046afrwy.conf b/conf/machine/ls1046afrwy.conf
index c22b332d..e6eabc0f 100644
--- a/conf/machine/ls1046afrwy.conf
+++ b/conf/machine/ls1046afrwy.conf
@@ -18,8 +18,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls1046afrwy_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1046afrwy_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls1046afrwy_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1046afrwy_tfa_SECURE_BOOT_defconfig"
 
 KERNEL_DEVICETREE ?= "\
     freescale/fsl-ls1046a-frwy.dtb \
diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf
index c74f2578..97fb1e29 100644
--- a/conf/machine/ls1046ardb.conf
+++ b/conf/machine/ls1046ardb.conf
@@ -18,8 +18,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls1046ardb_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1046ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls1046ardb_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1046ardb_tfa_SECURE_BOOT_defconfig"
 
 KERNEL_DEVICETREE ?= "\
     freescale/fsl-ls1046a-rdb.dtb \
diff --git a/conf/machine/ls1088ardb-pb.conf b/conf/machine/ls1088ardb-pb.conf
index 1ae5693b..ecfe70ae 100644
--- a/conf/machine/ls1088ardb-pb.conf
+++ b/conf/machine/ls1088ardb-pb.conf
@@ -18,8 +18,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls1088ardb_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1088ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls1088ardb_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1088ardb_tfa_SECURE_BOOT_defconfig"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1088a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf
index 9922248f..e433b7fc 100644
--- a/conf/machine/ls1088ardb.conf
+++ b/conf/machine/ls1088ardb.conf
@@ -18,8 +18,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa-secure-boot] = "ls1088ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa] = "ls1088ardb_tfa_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa-secure-boot] = "ls1088ardb_tfa_SECURE_BOOT_defconfig"
+UBOOT_CONFIG[tfa] = "ls1088ardb_tfa_defconfig"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls1088a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/ls2080ardb.conf b/conf/machine/ls2080ardb.conf
index 859a41be..5bd4dae8 100644
--- a/conf/machine/ls2080ardb.conf
+++ b/conf/machine/ls2080ardb.conf
@@ -11,7 +11,7 @@ require conf/machine/include/qoriq-arm64.inc
 require conf/machine/include/arm/arch-arm64.inc
 
 UBOOT_CONFIG ??= "nor"
-UBOOT_CONFIG[nor] = "ls2080ardb_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[nor] = "ls2080ardb_defconfig"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-ls2080a-rdb.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/ls2088ardb.conf b/conf/machine/ls2088ardb.conf
index 92c99326..7f83e89d 100644
--- a/conf/machine/ls2088ardb.conf
+++ b/conf/machine/ls2088ardb.conf
@@ -18,8 +18,8 @@ UBOOT_DTB_LOADADDRESS = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "ls2088ardb_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "ls2088ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "ls2088ardb_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "ls2088ardb_tfa_SECURE_BOOT_defconfig"
 
 RCWNOR ?= "FFFFFFFF_PP_HH_0x2a_0x41/rcw_1800"
 RCWQSPI?= "FFFFFFFF_PP_HH_0x2a_0x41/rcw_2000_qspi"
diff --git a/conf/machine/lx2160ardb.conf b/conf/machine/lx2160ardb.conf
index 5e68a9fd..e1a24f84 100644
--- a/conf/machine/lx2160ardb.conf
+++ b/conf/machine/lx2160ardb.conf
@@ -18,8 +18,8 @@ DTB_LOAD = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "lx2160ardb_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "lx2160ardb_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "lx2160ardb_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "lx2160ardb_tfa_SECURE_BOOT_defconfig"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-lx2160a-rdb.dtb freescale/fsl-lx2160a-qds.dtb"
 KERNEL_DEFCONFIG ?= "defconfig"
diff --git a/conf/machine/lx2162aqds.conf b/conf/machine/lx2162aqds.conf
index c7ab95fb..80f91331 100644
--- a/conf/machine/lx2162aqds.conf
+++ b/conf/machine/lx2162aqds.conf
@@ -18,8 +18,8 @@ DTB_LOAD = "0x90000000"
 UBOOT_ENTRYPOINT = "0x80080000"
 
 UBOOT_CONFIG ??= "tfa-verified-boot tfa-secure-boot tfa"
-UBOOT_CONFIG[tfa] = "lx2162aqds_tfa_defconfig,,u-boot-dtb.bin"
-UBOOT_CONFIG[tfa-secure-boot] = "lx2162aqds_tfa_SECURE_BOOT_defconfig,,u-boot-dtb.bin"
+UBOOT_CONFIG[tfa] = "lx2162aqds_tfa_defconfig"
+UBOOT_CONFIG[tfa-secure-boot] = "lx2162aqds_tfa_SECURE_BOOT_defconfig"
 UBOOT_CONFIG[tfa-verified-boot] = "lx2162aqds_tfa_verified_boot_defconfig,,u-boot-nodtb.bin"
 
 KERNEL_DEVICETREE ?= "freescale/fsl-lx2162a-qds.dtb"