diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2022-07-26 15:59:38 -0300 |
---|---|---|
committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-07-29 21:20:34 +0000 |
commit | 59324fb456d71f03f8071117504d7402276c4733 (patch) | |
tree | 23b15717a42cd5990e2174bdbb79d7e1dbcf0100 /conf/machine/include | |
parent | 7b8a74393ab6cfe69d3da065fee60697b0daebad (diff) | |
download | meta-freescale-59324fb456d71f03f8071117504d7402276c4733.tar.gz |
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 <otavio@ossystems.com.br>
(cherry picked from commit 63d73925950aa35ec1378696c0f5dcfd2fef9e83)
Diffstat (limited to 'conf/machine/include')
-rw-r--r-- | conf/machine/include/imx-base.inc | 6 | ||||
-rw-r--r-- | conf/machine/include/imx8mm-evk.inc | 3 | ||||
-rw-r--r-- | conf/machine/include/imx8mn-evk.inc | 3 | ||||
-rw-r--r-- | conf/machine/include/imx8mp-evk.inc | 3 |
4 files changed, 6 insertions, 9 deletions
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 = " \ | |||
343 | imx-test->virtual/imxvpu \ | 343 | imx-test->virtual/imxvpu \ |
344 | " | 344 | " |
345 | 345 | ||
346 | # Firmware used for boot. | ||
347 | IMX_EXTRA_FIRMWARE ?= "" | ||
348 | IMX_EXTRA_FIRMWARE:mx8-generic-bsp = "firmware-imx-8 imx-sc-firmware imx-seco" | ||
349 | IMX_EXTRA_FIRMWARE:mx8m-generic-bsp = "firmware-imx-8m" | ||
350 | IMX_EXTRA_FIRMWARE:mx8x-generic-bsp = "imx-sc-firmware imx-seco" | ||
351 | |||
346 | # Firmware | 352 | # Firmware |
347 | MACHINE_FIRMWARE ?= "" | 353 | MACHINE_FIRMWARE ?= "" |
348 | MACHINE_FIRMWARE:append:mx27-generic-bsp = " firmware-imx-vpu-imx27" | 354 | 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" | |||
37 | 37 | ||
38 | ATF_PLATFORM = "imx8mm" | 38 | ATF_PLATFORM = "imx8mm" |
39 | 39 | ||
40 | # Extra firmware package name, that is required to build boot container for fslc bsp | ||
41 | IMX_EXTRA_FIRMWARE = "firmware-imx-8m" | ||
42 | |||
43 | IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}" | 40 | IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}" |
44 | 41 | ||
45 | IMX_BOOT_SOC_TARGET = "iMX8MM" | 42 | 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" | |||
42 | 42 | ||
43 | ATF_PLATFORM = "imx8mn" | 43 | ATF_PLATFORM = "imx8mn" |
44 | 44 | ||
45 | # Extra firmware package name, that is required to build boot container for fslc bsp | ||
46 | IMX_EXTRA_FIRMWARE = "firmware-imx-8m" | ||
47 | |||
48 | IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}" | 45 | IMXBOOT_TARGETS = "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', '${IMXBOOT_TARGETS_BASENAME}', d)}" |
49 | 46 | ||
50 | IMX_BOOT_SOC_TARGET = "iMX8MN" | 47 | 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" | |||
37 | 37 | ||
38 | ATF_PLATFORM = "imx8mp" | 38 | ATF_PLATFORM = "imx8mp" |
39 | 39 | ||
40 | # Extra firmware package name, that is required to build boot container for fslc bsp | ||
41 | IMX_EXTRA_FIRMWARE = "firmware-imx-8m" | ||
42 | |||
43 | IMXBOOT_TARGETS = \ | 40 | IMXBOOT_TARGETS = \ |
44 | "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', \ | 41 | "${@bb.utils.contains('UBOOT_CONFIG', 'fspi', '${IMXBOOT_TARGETS_BASENAME}_flexspi', \ |
45 | '${IMXBOOT_TARGETS_BASENAME}', d)}" | 42 | '${IMXBOOT_TARGETS_BASENAME}', d)}" |