imx-mkimage: allow to be used with mainline bsp for all mx8 machines

Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com>

4 files changed, 3 insertions, 12 deletions

diff --git a/conf/machine/imx8mqevk.conf b/conf/machine/imx8mqevk.conf
index 3ff21bd4..327ee0ac 100644
--- a/conf/machine/imx8mqevk.conf
+++ b/conf/machine/imx8mqevk.conf
@@ -48,6 +48,7 @@ ATF_PLATFORM = "imx8mq"
 
 # Set imx-mkimage boot target
 IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk"
+IMX_BOOT_SOC_TARGET = "iMX8M"
 
 # Set Serial console
 SERIAL_CONSOLES = "115200;ttymxc0"
diff --git a/conf/machine/imx8qmmek.conf b/conf/machine/imx8qmmek.conf
index 2b2606a6..41a6bbe0 100644
--- a/conf/machine/imx8qmmek.conf
+++ b/conf/machine/imx8qmmek.conf
@@ -59,6 +59,7 @@ ATF_PLATFORM = "imx8qm"
 IMXBOOT_TARGETS = \
     "${@bb.utils.contains('UBOOT_CONFIG',         'sd', 'flash', \
                                                         'flash_flexspi', d)}"
+IMX_BOOT_SOC_TARGET = "iMX8QM"
 
 BOARD_TYPE = "mek"
 
diff --git a/conf/machine/imx8qxpmek.conf b/conf/machine/imx8qxpmek.conf
index e3f5ca45..122c40ce 100644
--- a/conf/machine/imx8qxpmek.conf
+++ b/conf/machine/imx8qxpmek.conf
@@ -59,6 +59,7 @@ IMXBOOT_TARGETS = \
     "${@bb.utils.contains('UBOOT_CONFIG',   'sd', 'flash', \
         bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_flexspi', \
                                                   'UNKNOWN', d), d)}"
+IMX_BOOT_SOC_TARGET = "iMX8QX"
 
 BOARD_TYPE = "mek"
 
diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
index e73d3074..a5ec9d60 100644
--- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
+++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb
@@ -39,12 +39,6 @@ do_compile[depends] += " \
 SC_FIRMWARE_NAME ?= "scfw_tcm.bin"
 
 ATF_MACHINE_NAME ?= "bl31-${ATF_PLATFORM}.bin"
-ATF_MACHINE_NAME_mx8qm = "bl31-imx8qm.bin"
-ATF_MACHINE_NAME_mx8x  = "bl31-imx8qx.bin"
-ATF_MACHINE_NAME_mx8mq = "bl31-imx8mq.bin"
-ATF_MACHINE_NAME_mx8phantomdxl = "bl31-imx8qx.bin"
-ATF_MACHINE_NAME_mx8dxl = "bl31-imx8dxl.bin"
-ATF_MACHINE_NAME_mx8dx = "bl31-imx8dx.bin"
 ATF_MACHINE_NAME_append = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', '-optee', '', d)}"
 
 UBOOT_NAME = "u-boot-${MACHINE}.bin-${UBOOT_CONFIG}"
@@ -53,12 +47,6 @@ BOOT_CONFIG_MACHINE = "${BOOT_NAME}-${MACHINE}-${UBOOT_CONFIG}.bin"
 TOOLS_NAME ?= "mkimage_imx8"
 
 IMX_BOOT_SOC_TARGET       ?= "INVALID"
-IMX_BOOT_SOC_TARGET_mx8qm  = "iMX8QM"
-IMX_BOOT_SOC_TARGET_mx8x   = "iMX8QX"
-IMX_BOOT_SOC_TARGET_mx8mq  = "iMX8M"
-IMX_BOOT_SOC_TARGET_mx8dxl = "iMX8DXL"
-IMX_BOOT_SOC_TARGET_mx8phantomdxl = "iMX8QX"
-IMX_BOOT_SOC_TARGET_mx8dx  = "iMX8DX"
 
 DEPLOY_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"