diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2023-04-12 14:39:52 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-12 14:39:52 -0300 |
| commit | 8594181fed0bc89394c351ffbc2aed621073d75e (patch) | |
| tree | 2bfac219952181654370bce772e03c7dd4da9075 | |
| parent | 61e08e884308994cea6296eba875668684ceb56f (diff) | |
| parent | 4beaafe643f414da6aff91dd2659bc9c1eefe87f (diff) | |
| download | meta-freescale-8594181fed0bc89394c351ffbc2aed621073d75e.tar.gz | |
Merge pull request #1492 from Freescale/fix-boot-container
Add boot container dynamic selection to imx-base.inc
| -rw-r--r-- | conf/machine/include/imx-base.inc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index 4efaaa972..37e67deaa 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -102,7 +102,10 @@ UBOOT_ENTRYPOINT:vf-generic-bsp ?= "0x80008000" | |||
| 102 | # below variable sets that those SoC do use this rather than | 102 | # below variable sets that those SoC do use this rather than |
| 103 | # assembling it in the imx-boot recipe. | 103 | # assembling it in the imx-boot recipe. |
| 104 | UBOOT_PROVIDES_BOOT_CONTAINER = "0" | 104 | UBOOT_PROVIDES_BOOT_CONTAINER = "0" |
| 105 | UBOOT_PROVIDES_BOOT_CONTAINER:mx8m-generic-bsp = "1" | 105 | |
| 106 | # The boot container should be used only if we're not using u-boot-imx as | ||
| 107 | # IMX_DEFAULT_BOOTLOADER. | ||
| 108 | UBOOT_PROVIDES_BOOT_CONTAINER:mx8m-generic-bsp = "${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', '0', '1')}" | ||
| 106 | 109 | ||
| 107 | # Trusted Firmware for Cortex-A (TF-A) can have different providers, either | 110 | # Trusted Firmware for Cortex-A (TF-A) can have different providers, either |
| 108 | # from upstream or from NXP downstream fork. Below variable defines which TF-A | 111 | # from upstream or from NXP downstream fork. Below variable defines which TF-A |
| @@ -586,7 +589,7 @@ WKS_FILE_DEPENDS ?= " \ | |||
| 586 | # | 589 | # |
| 587 | # Moving those derivatives to mainline BSP would require to set | 590 | # Moving those derivatives to mainline BSP would require to set |
| 588 | # UBOOT_PROVIDES_BOOT_CONTAINER to "1" and test if the U-Boot built 'flash.bin' | 591 | # UBOOT_PROVIDES_BOOT_CONTAINER to "1" and test if the U-Boot built 'flash.bin' |
| 589 | # binary is a workingreplacement. | 592 | # binary is a working replacement. |
| 590 | # | 593 | # |
| 591 | # NOTE: the results binary name of the boot container is set to 'imx-boot' | 594 | # NOTE: the results binary name of the boot container is set to 'imx-boot' |
| 592 | # for both NXP and Mainline BSP. | 595 | # for both NXP and Mainline BSP. |