From 6fc0971cb236284cd2ac325da677a87ca31723d8 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin Date: Fri, 11 Dec 2020 17:34:00 +0000 Subject: imx-mkimage: allow to be used with mainline bsp for mx8m imx-boot provides a boot container, which is required for mx8m family of SOCs to execute a boot sequence. Allow the imx-boot to generate boot container for Mini, Nano and Plus SOCs by adding use-mainline-bsp to the list of compatible machines. In order to accommodate new boot container generation model, former SOC_TARGET variable has been renamed to IMX_BOOT_SOC_TARGET and should be explicitly defined in the target machine recipes. This is done to indicate that even if the mx8mm machine is finter out from MACHINEOVERRIDES by extender filter - this recipe picks up a proper target definition for boot container construction. Default ATF binary image is also now based on ATF_PLATFORM, which is explicitly defined in the machine configuration file. Current support includes only Mini, Nano and Plus SOCs from i.MX8M family, and additions of further machines would require the definition of ATF_PLATFORM and IMX_BOOT_SOC_TARGET to be moved out from imx-boot recipe to a machine configuration file. Signed-off-by: Andrey Zhizhikin --- conf/machine/imx8mmevk.conf | 1 + conf/machine/imx8mnevk.conf | 1 + conf/machine/imx8mpevk.conf | 1 + 3 files changed, 3 insertions(+) (limited to 'conf') diff --git a/conf/machine/imx8mmevk.conf b/conf/machine/imx8mmevk.conf index fcd78fb5a..44e3781d9 100644 --- a/conf/machine/imx8mmevk.conf +++ b/conf/machine/imx8mmevk.conf @@ -61,6 +61,7 @@ ATF_PLATFORM = "imx8mm" # Set imx-mkimage boot target IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}" +IMX_BOOT_SOC_TARGET = "iMX8MM" # Set Serial console SERIAL_CONSOLES = "115200;ttymxc1" diff --git a/conf/machine/imx8mnevk.conf b/conf/machine/imx8mnevk.conf index fa0cb7b42..5d8f3001e 100644 --- a/conf/machine/imx8mnevk.conf +++ b/conf/machine/imx8mnevk.conf @@ -49,6 +49,7 @@ ATF_PLATFORM = "imx8mn" # Set imx-mkimage boot target IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_ddr4_evk_flexspi', 'flash_ddr4_evk', d)}" +IMX_BOOT_SOC_TARGET = "iMX8MN" # Set Serial console SERIAL_CONSOLES = "115200;ttymxc1" diff --git a/conf/machine/imx8mpevk.conf b/conf/machine/imx8mpevk.conf index 9addae7d5..1fbf0eef2 100644 --- a/conf/machine/imx8mpevk.conf +++ b/conf/machine/imx8mpevk.conf @@ -56,6 +56,7 @@ ATF_PLATFORM = "imx8mp" # Set imx-mkimage boot target IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', 'flash_evk_flexspi', 'flash_evk', d)}" +IMX_BOOT_SOC_TARGET = "iMX8MP" # Set Serial console SERIAL_CONSOLES = "115200;ttymxc1" -- cgit v1.2.3-54-g00ecf