From 59324fb456d71f03f8071117504d7402276c4733 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 26 Jul 2022 15:59:38 -0300 Subject: imx-base.inc: consolidate `IMX_EXTRA_FIRMWARE` definition We should have a single definition for `IMX_EXTRA_FIRMWARE` variable as this is SoC specific and not machine, or recipe, dependent. This removes multiple assignments from: - conf/machine/imx8mq-evk.conf - conf/machine/include/imx8mm-evk.inc - conf/machine/include/imx8mn-evk.inc - conf/machine/include/imx8mp-evk.inc - recipes-bsp/imx-mkimage/imx-boot_1.0.bb Signed-off-by: Otavio Salvador (cherry picked from commit 63d73925950aa35ec1378696c0f5dcfd2fef9e83) --- conf/machine/imx8mq-evk.conf | 3 --- conf/machine/include/imx-base.inc | 6 ++++++ conf/machine/include/imx8mm-evk.inc | 3 --- conf/machine/include/imx8mn-evk.inc | 3 --- conf/machine/include/imx8mp-evk.inc | 3 --- recipes-bsp/imx-mkimage/imx-boot_1.0.bb | 3 --- 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf index 1e8146a8..a2a81f4c 100644 --- a/conf/machine/imx8mq-evk.conf +++ b/conf/machine/imx8mq-evk.conf @@ -68,9 +68,6 @@ UBOOT_DTB_NAME = "imx8mq-evk.dtb" # Set ATF platform name ATF_PLATFORM = "imx8mq" -# Extra firmware package name, that is required to build boot container for fslc bsp -IMX_EXTRA_FIRMWARE = "firmware-imx-8m" - # Set imx-mkimage boot target IMXBOOT_TARGETS = "flash_evk flash_evk_no_hdmi flash_dp_evk" IMX_BOOT_SOC_TARGET = "iMX8M" diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 43e78282..297637af 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc @@ -343,6 +343,12 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS:append = " \ imx-test->virtual/imxvpu \ " +# Firmware used for boot. +IMX_EXTRA_FIRMWARE ?= "" +IMX_EXTRA_FIRMWARE:mx8-generic-bsp = "firmware-imx-8 imx-sc-firmware imx-seco" +IMX_EXTRA_FIRMWARE:mx8m-generic-bsp = "firmware-imx-8m" +IMX_EXTRA_FIRMWARE:mx8x-generic-bsp = "imx-sc-firmware imx-seco" + # Firmware MACHINE_FIRMWARE ?= "" MACHINE_FIRMWARE:append:mx27-generic-bsp = " firmware-imx-vpu-imx27" diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc index 41f7bad4..6d317f11 100644 --- a/conf/machine/include/imx8mm-evk.inc +++ b/conf/machine/include/imx8mm-evk.inc @@ -37,9 +37,6 @@ SPL_BINARY = "spl/u-boot-spl.bin" ATF_PLATFORM = "imx8mm" -# Extra firmware package name, that is required to build boot container for fslc bsp -IMX_EXTRA_FIRMWARE = "firmware-imx-8m" - IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}" IMX_BOOT_SOC_TARGET = "iMX8MM" diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index 5a5b447f..2f2c02f9 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc @@ -42,9 +42,6 @@ SPL_BINARY = "spl/u-boot-spl.bin" ATF_PLATFORM = "imx8mn" -# Extra firmware package name, that is required to build boot container for fslc bsp -IMX_EXTRA_FIRMWARE = "firmware-imx-8m" - IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}" IMX_BOOT_SOC_TARGET = "iMX8MN" diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc index 3e98d3c1..d93557d2 100644 --- a/conf/machine/include/imx8mp-evk.inc +++ b/conf/machine/include/imx8mp-evk.inc @@ -37,9 +37,6 @@ SPL_BINARY = "spl/u-boot-spl.bin" ATF_PLATFORM = "imx8mp" -# Extra firmware package name, that is required to build boot container for fslc bsp -IMX_EXTRA_FIRMWARE = "firmware-imx-8m" - IMXBOOT_TARGETS = \ "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', \ '${IMXBOOT_TARGETS_BASENAME}', d)}" diff --git a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb index f35561de..ae7e2638 100644 --- a/recipes-bsp/imx-mkimage/imx-boot_1.0.bb +++ b/recipes-bsp/imx-mkimage/imx-boot_1.0.bb @@ -9,9 +9,6 @@ SECTION = "BSP" inherit use-imx-security-controller-firmware uboot-sign -IMX_EXTRA_FIRMWARE = "firmware-imx-8 imx-sc-firmware imx-seco" -IMX_EXTRA_FIRMWARE:mx8m-generic-bsp = "firmware-imx-8m" -IMX_EXTRA_FIRMWARE:mx8x-generic-bsp = "imx-sc-firmware imx-seco" DEPENDS += " \ u-boot \ ${IMX_EXTRA_FIRMWARE} \ -- cgit v1.2.3-54-g00ecf