summaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorAndrey Zhizhikin <andrey.z@gmail.com>2021-05-03 09:47:38 +0000
committerOtavio Salvador <otavio@ossystems.com.br>2021-05-04 14:07:09 -0300
commite465b75e5cc6bce98d7fb2aacbd2eb1c98b21a22 (patch)
tree91986da836b73e40fc9d2978dccad5d56d32cf87 /conf
parent542ed8136611eeffda5cde475ec2abf32cda0c71 (diff)
downloadmeta-freescale-e465b75e5cc6bce98d7fb2aacbd2eb1c98b21a22.tar.gz
imx-base.inc: use new wks file for boot container
Boot container provided by mainline U-Boot build can be used directly in the result image file, as it requires two binary files to be populated onto raw partition, hence it uses separate image generation scheme from imx-boot provided by NXP. Use new WKS file for mainline BSP built for aarch64 which picks up and packs boot container binary files from U-Boot directly into result image. Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/include/imx-base.inc19
1 files changed, 9 insertions, 10 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 17c7bc17..65b1e6e0 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -454,16 +454,15 @@ SOC_DEFAULT_WKS_FILE_mx8m ?= "imx-imx-boot-bootpart.wks.in"
454SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in" 454SOC_DEFAULT_WKS_FILE_mx8 ?= "imx-imx-boot-bootpart.wks.in"
455SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in" 455SOC_DEFAULT_WKS_FILE_mxs ?= "imx-uboot-mxs-bootpart.wks.in"
456 456
457# Boot container built as a part of mainline U-Boot uses the same WKS 457# Boot container built as a part of mainline U-Boot uses different WKS
458# file as the entire mx8m series, as it renames flash.bin binary to 458# file as the entire mx8m series, as U-Boot versions later than 2021.04 are
459# imx-boot before it is packed into the boot partition. 459# providing two separate binaries, namely flash.bin and u-boot.itb. Those
460# This operation is performed in imx-boot-container class as a part of 460# files are packed into the boot partition.
461# delopyment task. 461# Binaries produced by U-Boot build itself are serving as a direct
462# flash.bin binary is produced by U-Boot build itself, and is serves as a 462# replacement of imx-boot from NXP.
463# direct replacement of imx-boot from NXP. 463# Creation of those binary files is controlled by UBOOT_PROVIDES_BOOT_CONTAINER
464# Creation of the flash.bin is controlled by UBOOT_PROVIDES_BOOT_CONTAINER 464# variable defined above.
465# variable defined above 465SOC_DEFAULT_WKS_FILE_imx-boot-container ?= "imx-boot-container-bootpart.wks.in"
466SOC_DEFAULT_WKS_FILE_imx-boot-container ?= "imx-imx-boot-bootpart.wks.in"
467 466
468WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" 467WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}"
469 468