imx93-evk.inc: Rework

- Consolidate UBOOT_CONFIG and IMXBOOT_TARGETS setting in .inc
- Drop UBOOT_CONFIG 'ld' which is not supported
- Facilitate easy override of IMXBOOT_TARGETS types

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

2 files changed, 9 insertions, 7 deletions

diff --git a/conf/machine/imx93-14x14-lpddr4x-evk.conf b/conf/machine/imx93-14x14-lpddr4x-evk.conf
index 57387a705..dff843a79 100644
--- a/conf/machine/imx93-14x14-lpddr4x-evk.conf
+++ b/conf/machine/imx93-14x14-lpddr4x-evk.conf
@@ -21,7 +21,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
 "
 
 UBOOT_CONFIG_BASENAME = "imx93_14x14_evk"
-IMXBOOT_TARGETS_BASENAME = "flash_singleboot"
 
 DDR_FIRMWARE_NAME = " \
     lpddr4_dmem_1d_v202201.bin \
@@ -30,10 +29,6 @@ DDR_FIRMWARE_NAME = " \
     lpddr4_imem_2d_v202201.bin \
 "
 
-UBOOT_CONFIG[fspi]   = "${UBOOT_CONFIG_BASENAME}_defconfig"
-
-IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}"
-
 WKS_FILE_DEPENDS:append:imx-nxp-bsp = " imx-m33-demos"
 IMAGE_BOOT_FILES:append:imx-nxp-bsp = " \
     mcore-demos/imx93-14x14-evk_m33_TCM_power_mode_switch.bin \
diff --git a/conf/machine/include/imx93-evk.inc b/conf/machine/include/imx93-evk.inc
index 8f5bb97f2..d0851695e 100644
--- a/conf/machine/include/imx93-evk.inc
+++ b/conf/machine/include/imx93-evk.inc
@@ -25,12 +25,19 @@ SPL_BINARY = "spl/u-boot-spl.bin"
 UBOOT_CONFIG ??= "sd"
 UBOOT_CONFIG[sd]   = "${UBOOT_CONFIG_BASENAME}_defconfig,sdcard"
 UBOOT_CONFIG[ecc]  = "${UBOOT_CONFIG_BASENAME}_inline_ecc_defconfig"
-UBOOT_CONFIG[ld]   = "${UBOOT_CONFIG_BASENAME}_ld_defconfig"
+UBOOT_CONFIG[fspi] = "${UBOOT_CONFIG_BASENAME}_defconfig"
 
 # Set ATF platform name
 ATF_PLATFORM = "imx93"
 
-IMXBOOT_TARGETS = "flash_singleboot"
+IMXBOOT_TARGETS = \
+    "${@bb.utils.contains('UBOOT_CONFIG',   'sd', '${IMXBOOT_TARGETS_SD}', \
+        bb.utils.contains('UBOOT_CONFIG',  'ecc', '${IMXBOOT_TARGETS_ECC}', \
+        bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_FSPI}', \
+                                                  'INVALID', d), d), d)}"
+IMXBOOT_TARGETS_SD   = "flash_singleboot"
+IMXBOOT_TARGETS_ECC  = "flash_singleboot"
+IMXBOOT_TARGETS_FSPI = "flash_singleboot_flexspi"
 
 IMX_BOOT_SOC_TARGET = "iMX9"
 IMX_BOOT_SEEK = "32"