From 191632825afa714e707999a80fe606d2364b04d5 Mon Sep 17 00:00:00 2001
From: Chris Dimich <Chris.Dimich@boundarydevices.com>
Date: Fri, 24 Apr 2020 12:28:38 -0700
Subject: [PATCH] nitrogen8m: update u-boot configuration

Use UBOOT_CONFIG instead of UBOOT_MACHINE, as per imx8mqevk.
Define IMAGE_BOOTLOADER and IMXBOOT_TARGETS as per imx8mqevk.
Define DDR_FIRMWARE_NAME as per imx8mqevk.

Signed-off-by: Chris Dimich <Chris.Dimich@boundarydevices.com>
---
 conf/machine/nitrogen8m.conf | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/conf/machine/nitrogen8m.conf b/conf/machine/nitrogen8m.conf
index 5b54ce2..dece7cb 100644
--- a/conf/machine/nitrogen8m.conf
+++ b/conf/machine/nitrogen8m.conf
@@ -26,9 +26,21 @@ PREFERRED_PROVIDER_u-boot ??= "u-boot-boundary"
 PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-boundary"
 SPL_BINARY = "spl/u-boot-spl.bin"
 UBOOT_DTB_NAME ?= "imx8mq-nitrogen8m.dtb"
-UBOOT_MACHINE ?= "nitrogen8m_defconfig"
 UBOOT_MAKE_TARGET = ""
 UBOOT_SUFFIX = "bin"
+UBOOT_CONFIG ??= "sd"
+UBOOT_CONFIG[sd] = "nitrogen8m_defconfig,sdcard"
+
+IMAGE_BOOTLOADER = "imx-boot"
+
+IMXBOOT_TARGETS = "flash_evk"
+
+DDR_FIRMWARE_NAME = "\
+    lpddr4_pmu_train_1d_imem.bin \
+    lpddr4_pmu_train_1d_dmem.bin \
+    lpddr4_pmu_train_2d_imem.bin \
+    lpddr4_pmu_train_2d_dmem.bin \
+"
 
 # wic support
 WKS_FILE = "sdimage-bootpart.wks"