imx8mm-evk: lift imx8mm-lpddr4-evk and imx8mm-ddr4-evk restrictions

The Linux mainline kernel has support for both variations but U-Boot
mainline only supports the LPDDR4 version. For now, we restrict the
imx8mm-ddr4-evk version to use u-boot-imx.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit 43534097a557810b36b4c30495d51d1d129c34b2)

3 files changed, 2 insertions, 12 deletions

diff --git a/conf/machine/imx8mm-ddr4-evk.conf b/conf/machine/imx8mm-ddr4-evk.conf
index 431485e7..bbfef2c2 100644
--- a/conf/machine/imx8mm-ddr4-evk.conf
+++ b/conf/machine/imx8mm-ddr4-evk.conf
@@ -24,7 +24,5 @@ DDR_FIRMWARE_NAME = " \
 
 IMXBOOT_TARGETS_BASENAME = "flash_ddr4_evk"
 
-# Mainline BSP doesn't support DDR4 so it must be set to nxp.
-# Also this machine isn't supported by u-boot-fslc but imx8mm-evk.inc already
-# set the bootloader to u-boot-imx instead when NXP BSP is used.
-IMX_DEFAULT_BSP = "nxp"
+# Mainline U-Boot doesn't support DDR4 so it must be set to u-boot-imx.
+IMX_DEFAULT_BOOTLOADER = "u-boot-imx"
diff --git a/conf/machine/imx8mm-lpddr4-evk.conf b/conf/machine/imx8mm-lpddr4-evk.conf
index 0c886cb1..0a85ed20 100644
--- a/conf/machine/imx8mm-lpddr4-evk.conf
+++ b/conf/machine/imx8mm-lpddr4-evk.conf
@@ -34,8 +34,3 @@ DDR_FIRMWARE_NAME = " \
 "
 
 IMXBOOT_TARGETS_BASENAME = "flash_evk"
-
-# Mainline BSP doesn't support LPDDR4 so it must be set to nxp.
-# Also this machine isn't supported by u-boot-fslc but imx8mn-evk.inc already
-# set the bootloader to u-boot-imx instead when NXP BSP is used.
-IMX_DEFAULT_BSP = "nxp"
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc
index eba4ac9f..41f7bad4 100644
--- a/conf/machine/include/imx8mm-evk.inc
+++ b/conf/machine/include/imx8mm-evk.inc
@@ -27,9 +27,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 "
 UBOOT_DTB_NAME = "${KERNEL_DEVICETREE_BASENAME}.dtb"
 
-IMX_DEFAULT_BOOTLOADER:use-nxp-bsp = "u-boot-imx"
-IMX_DEFAULT_BOOTLOADER:use-mainline-bsp = "u-boot-fslc"
-
 UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"