From 2570ff2b266f34c1df2bf66e1403522528293125 Mon Sep 17 00:00:00 2001
From: Chris Dimich <chris.dimich@boundarydevices.com>
Date: Wed, 19 Oct 2022 13:57:34 -0700
Subject: [PATCH] nitrogen8mm: allow for all uboot defconfigs variants to be
 built

Signed-off-by: Chris Dimich <chris.dimich@boundarydevices.com>
---
 conf/machine/nitrogen8mm.conf | 32 +++++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/conf/machine/nitrogen8mm.conf b/conf/machine/nitrogen8mm.conf
index 7b338ef..82276a0 100644
--- a/conf/machine/nitrogen8mm.conf
+++ b/conf/machine/nitrogen8mm.conf
@@ -34,16 +34,17 @@ PREFERRED_PROVIDER_imx-atf ??= "imx-atf-boundary"
 SPL_BINARY = "spl/u-boot-spl.bin"
 UBOOT_SUFFIX = "bin"
 
-# Used to define the U-Boot defconfig for different board variants. The naming
-# is here as a safeguard mechanism so that a user doesn't build and flash the
-# wrong configuration.
-#
-# This method will be optimized in the future, but for now, use this variable to
-# define the defconfig to be built.
-BOUNDARY_DEVICES_UBOOT_DEFCONFIG ?= "nitrogen8mm_rev2_2g"
-
-UBOOT_CONFIG ??= "sd"
-UBOOT_CONFIG[sd] = "${BOUNDARY_DEVICES_UBOOT_DEFCONFIG}_defconfig,sdcard"
+UBOOT_CONFIG ??= "2g 2gr0 4g rev2_2g rev2_2gr0 rev2_4g som_1gr0 som_2g som_2gr0 som_4g"
+UBOOT_CONFIG[2g]       = "${MACHINE}_2g_defconfig,sdcard"
+UBOOT_CONFIG[2gr0]     = "${MACHINE}_2gr0_defconfig,sdcard"
+UBOOT_CONFIG[4g]       = "${MACHINE}_4g_defconfig,sdcard"
+UBOOT_CONFIG[rev2_2g]  = "${MACHINE}_rev2_2g_defconfig,sdcard"
+UBOOT_CONFIG[rev2_2gr0]  = "${MACHINE}_rev2_4g_defconfig,sdcard"
+UBOOT_CONFIG[rev2_4g]     = "${MACHINE}_2gr0_defconfig,sdcard"
+UBOOT_CONFIG[som_1gr0] = "${MACHINE}_som_1gr0_defconfig,sdcard"
+UBOOT_CONFIG[som_2g]   = "${MACHINE}_som_2g_defconfig,sdcard"
+UBOOT_CONFIG[som_2gr0]   = "${MACHINE}_som_2g_defconfig,sdcard"
+UBOOT_CONFIG[som_4g]   = "${MACHINE}_som_4g_defconfig,sdcard"
 
 ATF_PLATFORM = "imx8mm"
 
@@ -58,7 +59,16 @@ DDR_FIRMWARE_NAME = "\
 IMAGE_BOOT_FILES:append = " \
 	boot.scr-${MACHINE};boot.scr \
 	upgrade.scr-${MACHINE};upgrade.scr \
-	flash.bin-${MACHINE};u-boot.${BOUNDARY_DEVICES_UBOOT_DEFCONFIG} \
+	flash.bin-${MACHINE}-2g;u-boot.${MACHINE}_2g \
+	flash.bin-${MACHINE}-2gr0;u-boot.${MACHINE}_2gr0 \
+	flash.bin-${MACHINE}-4g;u-boot.${MACHINE}_4g \
+	flash.bin-${MACHINE}-rev2_2g;u-boot.${MACHINE}_rev2_2g \
+	flash.bin-${MACHINE}-rev2_2gr0;u-boot.${MACHINE}_rev2_2gr0 \
+	flash.bin-${MACHINE}-rev2_4g;u-boot.${MACHINE}_rev2_4g \
+	flash.bin-${MACHINE}-som_1gr0;u-boot.${MACHINE}_som_1gr0 \
+	flash.bin-${MACHINE}-som_2g;u-boot.${MACHINE}_som_2g \
+	flash.bin-${MACHINE}-som_2gr0;u-boot.${MACHINE}_som_2gr0 \
+	flash.bin-${MACHINE}-som_4g;u-boot.${MACHINE}_som_4g \
 "
 
 # wic support