From 70488c4a04e6614772d869805d1c347dfc859422 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Fri, 21 May 2021 08:56:47 -0500 Subject: [PATCH] imx8qxp-mek: Move ATF_PLATFORM and IMX_BOOT_SOC_TARGET The values of ATF_PLATFORM and IMX_BOOT_SOC_TARGET are not shared by imx8dx-mek, so move them out of imx8x-mek.inc and into the machine config file itself. Signed-off-by: Tom Hochstein --- conf/machine/imx8qxp-mek.conf | 4 ++++ conf/machine/include/imx8x-mek.inc | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf index fe0f6727..5b29138f 100644 --- a/conf/machine/imx8qxp-mek.conf +++ b/conf/machine/imx8qxp-mek.conf @@ -24,3 +24,7 @@ KERNEL_DEVICETREE_append_use-nxp-bsp = " \ " UBOOT_CONFIG_BASENAME = "imx8qxp_mek" + +ATF_PLATFORM = "imx8qx" + +IMX_BOOT_SOC_TARGET = "iMX8QX" diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc index 814a34c1..55a28c87 100644 --- a/conf/machine/include/imx8x-mek.inc +++ b/conf/machine/include/imx8x-mek.inc @@ -59,9 +59,6 @@ IMX_BOOT_SEEK = "32" IMX_DEFAULT_BOOTLOADER = "u-boot-imx" UBOOT_SUFFIX = "bin" -# Set ATF platform name -ATF_PLATFORM = "imx8qx" - IMXBOOT_TARGETS_SD = \ "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'flash_spl', \ 'flash', d)}" @@ -71,8 +68,6 @@ IMXBOOT_TARGETS_FSPI = \ IMXBOOT_TARGETS = \ "${@bb.utils.contains('UBOOT_CONFIG', 'sd', '${IMXBOOT_TARGETS_SD}', \ '${IMXBOOT_TARGETS_FSPI}', d)}" -IMX_BOOT_SOC_TARGET = "iMX8QX" - BOARD_TYPE = "mek" # Add additional firmware -- 2.40.1