diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2022-08-01 14:44:05 -0300 |
---|---|---|
committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2022-08-01 19:20:58 +0000 |
commit | 35d3f3f518a64904dae946cf4b9879b1e507555d (patch) | |
tree | daa90847a4f50827060913538a550a604232987f | |
parent | bab27634391a52f442d4d1874507db6e741a5a5e (diff) | |
download | meta-freescale-35d3f3f518a64904dae946cf4b9879b1e507555d.tar.gz |
imx8m*-evk: allow switch between `u-boot-imx` and `u-boot-fslc`
We ought to add `imx-boot-container` `MACHINEOVERRIDES` only if not
building for `u-boot-imx`. This can be removed once it uses `binman` as
`u-boot-imx` and u-boot-fslc would use same mechanism to build the
container.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
(cherry picked from commit 1650359bc3eba454522f0db51846497549275caa)
-rw-r--r-- | conf/machine/include/imx8mm-evk.inc | 6 | ||||
-rw-r--r-- | conf/machine/include/imx8mn-evk.inc | 6 | ||||
-rw-r--r-- | conf/machine/include/imx8mp-evk.inc | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/conf/machine/include/imx8mm-evk.inc b/conf/machine/include/imx8mm-evk.inc index 6d317f11..f124b8f6 100644 --- a/conf/machine/include/imx8mm-evk.inc +++ b/conf/machine/include/imx8mm-evk.inc | |||
@@ -1,4 +1,8 @@ | |||
1 | MACHINEOVERRIDES =. "imx-boot-container:mx8mm:" | 1 | MACHINEOVERRIDES =. "mx8mm:" |
2 | |||
3 | # FIXME: u-boot-imx should be converted to `binman` and then we can | ||
4 | # avoid this specific overrides and handle it in a generic way. | ||
5 | MACHINEOVERRIDES =. "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx', '', 'imx-boot-container:', d)}" | ||
2 | 6 | ||
3 | require conf/machine/include/imx-base.inc | 7 | require conf/machine/include/imx-base.inc |
4 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc | 8 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc |
diff --git a/conf/machine/include/imx8mn-evk.inc b/conf/machine/include/imx8mn-evk.inc index 2f2c02f9..261c9b53 100644 --- a/conf/machine/include/imx8mn-evk.inc +++ b/conf/machine/include/imx8mn-evk.inc | |||
@@ -1,4 +1,8 @@ | |||
1 | MACHINEOVERRIDES =. "imx-boot-container:mx8mn:" | 1 | MACHINEOVERRIDES =. "mx8mn:" |
2 | |||
3 | # FIXME: u-boot-imx should be converted to `binman` and then we can | ||
4 | # avoid this specific overrides and handle it in a generic way. | ||
5 | MACHINEOVERRIDES =. "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx', '', 'imx-boot-container:', d)}" | ||
2 | 6 | ||
3 | require conf/machine/include/imx-base.inc | 7 | require conf/machine/include/imx-base.inc |
4 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc | 8 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc |
diff --git a/conf/machine/include/imx8mp-evk.inc b/conf/machine/include/imx8mp-evk.inc index d93557d2..1b83e677 100644 --- a/conf/machine/include/imx8mp-evk.inc +++ b/conf/machine/include/imx8mp-evk.inc | |||
@@ -1,4 +1,8 @@ | |||
1 | MACHINEOVERRIDES =. "imx-boot-container:mx8mp:" | 1 | MACHINEOVERRIDES =. "mx8mp:" |
2 | |||
3 | # FIXME: u-boot-imx should be converted to `binman` and then we can | ||
4 | # avoid this specific overrides and handle it in a generic way. | ||
5 | MACHINEOVERRIDES =. "${@bb.utils.contains('IMX_DEFAULT_BOOTLOADER', 'u-boot-imx', '', 'imx-boot-container:', d)}" | ||
2 | 6 | ||
3 | require conf/machine/include/imx-base.inc | 7 | require conf/machine/include/imx-base.inc |
4 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc | 8 | require conf/machine/include/arm/armv8a/tune-cortexa53.inc |