diff options
| author | Otavio Salvador <otavio@ossystems.com.br> | 2026-11-02 15:23:20 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-11-02 15:23:20 -0300 |
| commit | eccd1e074d07b7e6d68d43711a4f3da034db6b44 (patch) | |
| tree | ec6e04bbb0505ac030cdc6af0d05f921cd9e4572 | |
| parent | 448d332e071c4682def785e365f57ba657cb8da5 (diff) | |
| parent | b5b4e834a0600565e8fbc796f6add4f7e8de6a10 (diff) | |
| download | meta-freescale-eccd1e074d07b7e6d68d43711a4f3da034db6b44.tar.gz | |
Merge pull request #2918 from wardru/fix/imx93-boot-container-mainline
imx-base: Restrict the i.MX93 U-Boot boot container to mainline
| -rw-r--r-- | conf/machine/include/imx-base.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index cb3326eed..3f6e271e4 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
| @@ -106,9 +106,9 @@ UBOOT_PROVIDES_BOOT_CONTAINER = "0" | |||
| 106 | # The boot container should be used only if we're not using u-boot-imx as | 106 | # The boot container should be used only if we're not using u-boot-imx as |
| 107 | # IMX_DEFAULT_BOOTLOADER. | 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')}" | 108 | UBOOT_PROVIDES_BOOT_CONTAINER:mx8m-generic-bsp = "${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', '0', '1')}" |
| 109 | UBOOT_PROVIDES_BOOT_CONTAINER:mx93-generic-bsp = "${@oe.utils.ifelse(d.getVar('IMX_DEFAULT_BOOTLOADER') == 'u-boot-imx', '0', '1')}" | ||
| 110 | 109 | ||
| 111 | # i.MX95 mainline U-Boot uses binman to assemble the boot container. | 110 | # i.MX93 and i.MX95 mainline U-Boot use binman to assemble the boot container. |
| 111 | UBOOT_PROVIDES_BOOT_CONTAINER:mx93-mainline-bsp = "1" | ||
| 112 | UBOOT_PROVIDES_BOOT_CONTAINER:mx95-mainline-bsp = "1" | 112 | UBOOT_PROVIDES_BOOT_CONTAINER:mx95-mainline-bsp = "1" |
| 113 | 113 | ||
| 114 | # Trusted Firmware for Cortex-A (TF-A) can have different providers, either | 114 | # Trusted Firmware for Cortex-A (TF-A) can have different providers, either |