Merge pull request #1072 from Freescale/backport-1071-to-kirkstone

[Backport kirkstone] Add uboot configs

6 files changed, 11 insertions, 6 deletions

diff --git a/conf/machine/imx8dx-mek.conf b/conf/machine/imx8dx-mek.conf
index 8e8bdee0..fbb35f13 100644
--- a/conf/machine/imx8dx-mek.conf
+++ b/conf/machine/imx8dx-mek.conf
@@ -1,6 +1,6 @@
 #@TYPE: Machine
-#@NAME: i.MX 8DXP MEK
-#@DESCRIPTION: i.MX 8DualXPlus Multisensory Enablement Kit board
+#@NAME: i.MX 8DX MEK
+#@DESCRIPTION: i.MX 8DualX Multisensory Enablement Kit board
 #@MAINTAINER: Lauren Post <lauren.post@nxp.com>
 
 MACHINEOVERRIDES =. "mx8dx:"
diff --git a/conf/machine/imx8dxl-lpddr4-evk.conf b/conf/machine/imx8dxl-lpddr4-evk.conf
index d44a4732..2ca9b986 100644
--- a/conf/machine/imx8dxl-lpddr4-evk.conf
+++ b/conf/machine/imx8dxl-lpddr4-evk.conf
@@ -15,4 +15,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
 "
 UBOOT_CONFIG_BASENAME = "imx8dxl_evk"
-UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
+
+UBOOT_CONFIG[lcd] = "${UBOOT_CONFIG_BASENAME}_lcd_defconfig"
+
+BOARD_TYPE = "evk"
diff --git a/conf/machine/imx8mn-ddr4-evk.conf b/conf/machine/imx8mn-ddr4-evk.conf
index 1a03cdca..7a796d38 100644
--- a/conf/machine/imx8mn-ddr4-evk.conf
+++ b/conf/machine/imx8mn-ddr4-evk.conf
@@ -12,6 +12,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 "
 UBOOT_CONFIG_BASENAME = "imx8mn_ddr4_evk"
 
+UBOOT_CONFIG[nom] = "${UBOOT_CONFIG_BASENAME}_nom_defconfig"
+
 DDR_FIRMWARE_VERSION = "201810"
 DDR_FIRMWARE_NAME = " \
     ddr4_imem_1d_${DDR_FIRMWARE_VERSION}.bin \
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf
index 0b7c6801..2c08790c 100644
--- a/conf/machine/imx8mp-lpddr4-evk.conf
+++ b/conf/machine/imx8mp-lpddr4-evk.conf
@@ -41,6 +41,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 
 UBOOT_CONFIG_BASENAME = "imx8mp_evk"
 UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG[ndm]  = "${UBOOT_CONFIG_BASENAME}_ndm_defconfig"
 
 # Set DDR FIRMWARE
 DDR_FIRMWARE_VERSION = "202006"
diff --git a/conf/machine/include/imx8dxl-evk.inc b/conf/machine/include/imx8dxl-evk.inc
index e12dfb00..491ebffe 100644
--- a/conf/machine/include/imx8dxl-evk.inc
+++ b/conf/machine/include/imx8dxl-evk.inc
@@ -40,6 +40,7 @@ UBOOT_SUFFIX = "bin"
 
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
+UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_fspi_defconfig"
 
 IMX_BOOT_SEEK = "32"
 
@@ -57,6 +58,3 @@ IMXBOOT_TARGETS = \
         bb.utils.contains('UBOOT_CONFIG',      'fspi', '${IMXBOOT_TARGETS_FSPI}', \
         bb.utils.contains('UBOOT_CONFIG',      'nand', '${IMXBOOT_TARGETS_NAND}', \
                                                                        'INVALID', d), d), d)}"
-
-
-BOARD_TYPE = "evk"
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc
index 1404abd2..5a5b447f 100644
--- a/conf/machine/include/imx8mn-evk.inc
+++ b/conf/machine/include/imx8mn-evk.inc
@@ -35,6 +35,7 @@ UBOOT_SUFFIX = "bin"
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd]      = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
 UBOOT_CONFIG[fspi]    = "${UBOOT_CONFIG_BASENAME}_defconfig"
+UBOOT_CONFIG[ld]      = "${UBOOT_CONFIG_BASENAME}_ld_defconfig"
 UBOOT_CONFIG[mfgtool] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 
 SPL_BINARY = "spl/u-boot-spl.bin"