From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Sun, 22 Aug 2021 00:48:39 +0000 (-0500)
Subject: imx6qdlsabre*: Add uboot config options for u-boot-imx
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=4ebabc1936fd0d375541adc47be01878d00b5904;p=meta-freescale.git

imx6qdlsabre*: Add uboot config options for u-boot-imx

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---

diff --git a/conf/machine/imx6qdlsabreauto.conf b/conf/machine/imx6qdlsabreauto.conf
index 8069fb3f..af8a9885 100644
--- a/conf/machine/imx6qdlsabreauto.conf
+++ b/conf/machine/imx6qdlsabreauto.conf
@@ -33,20 +33,29 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \
 "
 
 ### u-boot-fslc settings ###
-
 SPL_BINARY:pn-u-boot-fslc = "SPL"
-UBOOT_MACHINE:pn-u-boot-fslc ?= "mx6sabreauto_defconfig"
+UBOOT_CONFIG:pn-u-boot-fslc ??= "sd-fslc"
 UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 
 ### u-boot-imx settings ###
-
-# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
-# variants. Change the defconfig to the targeted SoC variant.
 SPL_BINARY:pn-u-boot-imx = ""
-UBOOT_MACHINE:pn-u-boot-imx = "mx6qsabreauto_defconfig"
+UBOOT_CONFIG:pn-u-boot-imx ??= " \
+    sd-imx \
+"
 UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
 UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 
+# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
+# variants. Change the defconfig to the targeted SoC variant.
+UBOOT_CONFIG[sd-fslc]      = "mx6sabreauto_defconfig,sdcard"
+UBOOT_CONFIG[sd-imx]       = "mx6qpsabreauto_defconfig,sdcard"
+UBOOT_CONFIG[sd-optee-imx] = "mx6qpsabreauto_optee_defconfig,sdcard"
+UBOOT_CONFIG[eimnor-imx]   = "mx6qpsabreauto_eimnor_defconfig"
+UBOOT_CONFIG[nand-imx]     = "mx6qpsabreauto_nand_defconfig,ubifs"
+UBOOT_CONFIG[spinor-imx]   = "mx6qpsabreauto_spinor_defconfig"
+UBOOT_CONFIG[sata-imx]     = "mx6qpsabreauto_sata_defconfig"
+UBOOT_CONFIG[mfgtool-imx]  = "mx6qpsabreauto_defconfig"
+
 WKS_FILE = " \
     ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
                          'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \
diff --git a/conf/machine/imx6qdlsabresd.conf b/conf/machine/imx6qdlsabresd.conf
index 215e0183..1011b877 100644
--- a/conf/machine/imx6qdlsabresd.conf
+++ b/conf/machine/imx6qdlsabresd.conf
@@ -42,20 +42,26 @@ KERNEL_DEVICETREE:use-mainline-bsp = " \
 "
 
 ### u-boot-fslc settings ###
-
 SPL_BINARY:pn-u-boot-fslc = "SPL"
-UBOOT_MACHINE:pn-u-boot-fslc ?= "mx6sabresd_defconfig"
+UBOOT_CONFIG:pn-u-boot-fslc ??= "sd-fslc"
 UBOOT_SUFFIX:pn-u-boot-fslc = "img"
 
 ### u-boot-imx settings ###
-
-# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
-# variants. Change the defconfig to the targeted SoC variant.
 SPL_BINARY:pn-u-boot-imx = ""
-UBOOT_MACHINE:pn-u-boot-imx ?= "mx6qsabresd_defconfig"
+UBOOT_CONFIG:pn-u-boot-imx ??= " \
+    sd-imx \
+"
 UBOOT_MAKE_TARGET:pn-u-boot-imx = "u-boot.imx"
 UBOOT_SUFFIX:pn-u-boot-imx = "imx"
 
+# The u-boot-imx does not provide unified functionality for DL/Q/QP SoC
+# variants. Change the defconfig to the targeted SoC variant.
+UBOOT_CONFIG[sd-fslc]      = "mx6sabresd_defconfig,sdcard"
+UBOOT_CONFIG[sd-imx]       = "mx6qsabresd_defconfig,sdcard"
+UBOOT_CONFIG[sd-optee-imx] = "mx6qsabresd_optee_defconfig,sdcard"
+UBOOT_CONFIG[sata-imx]     = "mx6qsabresd_sata_defconfig"
+UBOOT_CONFIG[mfgtool-imx]  = "mx6qsabresd_defconfig"
+
 WKS_FILE = " \
     ${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', \
                          'u-boot-fslc', 'imx-uboot-spl-bootpart.wks.in', \