diff options
Diffstat (limited to 'conf')
-rw-r--r-- | conf/machine/include/imx-base.inc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc index d9c16811..d108552d 100644 --- a/conf/machine/include/imx-base.inc +++ b/conf/machine/include/imx-base.inc | |||
@@ -505,16 +505,6 @@ SOC_DEFAULT_WKS_FILE:mx8m-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" | |||
505 | SOC_DEFAULT_WKS_FILE:mx8-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" | 505 | SOC_DEFAULT_WKS_FILE:mx8-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" |
506 | SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" | 506 | SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" |
507 | 507 | ||
508 | # Boot container built as a part of mainline U-Boot uses different WKS | ||
509 | # file as the entire mx8m series, as U-Boot versions later than 2021.04 are | ||
510 | # providing two separate binaries, namely flash.bin and u-boot.itb. Those | ||
511 | # files are packed into the boot partition. | ||
512 | # Binaries produced by U-Boot build itself are serving as a direct | ||
513 | # replacement of imx-boot from NXP. | ||
514 | # Creation of those binary files is controlled by UBOOT_PROVIDES_BOOT_CONTAINER | ||
515 | # variable defined above. | ||
516 | SOC_DEFAULT_WKS_FILE:imx-boot-container ?= "imx-boot-container-bootpart.wks.in" | ||
517 | |||
518 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" | 508 | WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" |
519 | 509 | ||
520 | SERIAL_CONSOLES = "115200;ttymxc0" | 510 | SERIAL_CONSOLES = "115200;ttymxc0" |