diff options
-rw-r--r-- | classes/imx-boot-container.bbclass | 3 | ||||
-rw-r--r-- | conf/machine/include/imx-base.inc | 16 |
2 files changed, 9 insertions, 10 deletions
diff --git a/classes/imx-boot-container.bbclass b/classes/imx-boot-container.bbclass index 711bbd9e..a420b4c4 100644 --- a/classes/imx-boot-container.bbclass +++ b/classes/imx-boot-container.bbclass | |||
@@ -20,6 +20,9 @@ | |||
20 | # by variable UBOOT_PROVIDES_BOOT_CONTAINER, which is defined in the | 20 | # by variable UBOOT_PROVIDES_BOOT_CONTAINER, which is defined in the |
21 | # base machine include file (imx-base.inc), and is set to "1" when the | 21 | # base machine include file (imx-base.inc), and is set to "1" when the |
22 | # 'imx-boot-container' is present in MACHINEOVERRIDES. | 22 | # 'imx-boot-container' is present in MACHINEOVERRIDES. |
23 | # | ||
24 | # NOTE: A backwards-compatible symlink is added for 'flash.bin', named | ||
25 | # 'imx-boot', during the deployment task. | ||
23 | 26 | ||
24 | # Define ATF binary file to be deployed to the U-Boot build folder | 27 | # Define ATF binary file to be deployed to the U-Boot build folder |
25 | ATF_MACHINE_NAME = "bl31-${ATF_PLATFORM}.bin" | 28 | ATF_MACHINE_NAME = "bl31-${ATF_PLATFORM}.bin" |
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index e24e14e1..43e78282 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -503,22 +503,18 @@ WKS_FILE_DEPENDS ?= " \ | |||
503 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ | 503 | ${@bb.utils.contains('MACHINE_FEATURES', 'optee', '${OPTEE_WKS_FILE_DEPENDS}', '', d)} \ |
504 | " | 504 | " |
505 | 505 | ||
506 | WKS_FILE_DEPENDS:append:mx8-nxp-bsp = " imx-boot" | ||
507 | WKS_FILE_DEPENDS:append:mx8m-nxp-bsp = " imx-boot" | ||
508 | |||
509 | # We need to restrict the append so we don't add this for other i.MX SoC's. | 506 | # We need to restrict the append so we don't add this for other i.MX SoC's. |
510 | # Derivatives that are not yet adopted the usage of boot container provided | 507 | # Derivatives that are not yet adopted the usage of boot container provided |
511 | # by U-Boot build are still targeted to use 'imx-boot' package provided by | 508 | # by U-Boot build are still targeted to use 'imx-boot' package provided by |
512 | # NXP. Moving those derivatives to mainline BSP would require to define an | 509 | # NXP. |
510 | # | ||
511 | # Moving those derivatives to mainline BSP would require to define an | ||
513 | # 'imx-boot-container' override, and test if the U-Boot built 'flash.bin' | 512 | # 'imx-boot-container' override, and test if the U-Boot built 'flash.bin' |
514 | # binary is used a replacement. | 513 | # binary is used a replacement. |
515 | # Note, that the results binary name of the boot container is set to 'imx-boot' | 514 | # |
515 | # NOTE: the results binary name of the boot container is set to 'imx-boot' | ||
516 | # for both NXP and Mainline BSP. | 516 | # for both NXP and Mainline BSP. |
517 | # For Mainline BSP: the 'flash.bin' boot container is renamed during the | 517 | WKS_FILE_DEPENDS:append:imx-generic-bsp:aarch64 = " \ |
518 | # deployment task extesion execution defined in imx-boot-container class. | ||
519 | # For NXP BSP: rename is done in 'imx-boot' recipe at the execution of compile | ||
520 | # task. | ||
521 | WKS_FILE_DEPENDS:append:imx-mainline-bsp:aarch64 = " \ | ||
522 | ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ | 518 | ${@oe.utils.ifelse(d.getVar('UBOOT_PROVIDES_BOOT_CONTAINER') == '0', 'imx-boot', '')} \ |
523 | " | 519 | " |
524 | 520 | ||