diff options
author | Max Krummenacher <max.krummenacher@toradex.com> | 2022-04-26 12:15:40 +0200 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2022-04-26 12:15:40 +0200 |
commit | 2065d8697a99d52f528a61af180ce3747a397d87 (patch) | |
tree | 7c47c96e6941c8c164d9d2d23cd29eb2242b05e7 | |
parent | 1f938bda8b6a7d1db6468901297d07c72f764c22 (diff) | |
download | meta-freescale-2065d8697a99d52f528a61af180ce3747a397d87.tar.gz |
imx-boot-container-bootpart: drop wks file
Now that we have a symlink with constant name 'imx-boot' independent
on the use of the MACHINEOVERRIDE 'imx-boot-container', drop the
additonal imx-boot-container-bootpart file as imx-imx-boot-bootpart
does the same thing.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r-- | conf/machine/include/imx-base.inc | 10 | ||||
-rw-r--r-- | wic/imx-boot-container-bootpart.wks.in | 26 |
2 files changed, 0 insertions, 36 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" |
diff --git a/wic/imx-boot-container-bootpart.wks.in b/wic/imx-boot-container-bootpart.wks.in deleted file mode 100644 index 321ee46b..00000000 --- a/wic/imx-boot-container-bootpart.wks.in +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | # short-description: Create SD card image with a boot partition for i.MX8M | ||
2 | # long-description: | ||
3 | # Create an image that can be written onto a SD card using dd for use | ||
4 | # with i.MX8M SoC family | ||
5 | # It uses binary boot container called flash.bin provided directly by | ||
6 | # the U-Boot recipe, and U-Boot ITB files which is created by binman utility | ||
7 | # of U-Boot. | ||
8 | # Those files are added it into the boot partition, which is populated as a | ||
9 | # raw copy into the image. | ||
10 | # Boot container prepared by U-Boot already container SPL, U-Boot itself, | ||
11 | # U-Boot DTB file, ATF, and optional OP-TEE components. | ||
12 | # | ||
13 | # The disk layout used is: | ||
14 | # - ----------- -------------- ------------- | ||
15 | # | | flash.bin | boot | rootfs | | ||
16 | # - ----------- -------------- ------------- | ||
17 | # ^ ^ ^ ^ ^ | ||
18 | # | | | | | | ||
19 | # 0 | 8MiB 72MiB 72MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) | ||
20 | # ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual | ||
21 | # | ||
22 | part u-boot --source rawcopy --sourceparams="file=flash.bin" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK} | ||
23 | part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 8192 --size 64 | ||
24 | part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192 | ||
25 | |||
26 | bootloader --ptable msdos | ||