From 2065d8697a99d52f528a61af180ce3747a397d87 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Tue, 26 Apr 2022 12:15:40 +0200 Subject: 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 --- conf/machine/include/imx-base.inc | 10 ---------- wic/imx-boot-container-bootpart.wks.in | 26 -------------------------- 2 files changed, 36 deletions(-) delete mode 100644 wic/imx-boot-container-bootpart.wks.in 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" SOC_DEFAULT_WKS_FILE:mx8-nxp-bsp ?= "imx-imx-boot-bootpart.wks.in" SOC_DEFAULT_WKS_FILE:mxs-generic-bsp ?= "imx-uboot-mxs-bootpart.wks.in" -# Boot container built as a part of mainline U-Boot uses different WKS -# file as the entire mx8m series, as U-Boot versions later than 2021.04 are -# providing two separate binaries, namely flash.bin and u-boot.itb. Those -# files are packed into the boot partition. -# Binaries produced by U-Boot build itself are serving as a direct -# replacement of imx-boot from NXP. -# Creation of those binary files is controlled by UBOOT_PROVIDES_BOOT_CONTAINER -# variable defined above. -SOC_DEFAULT_WKS_FILE:imx-boot-container ?= "imx-boot-container-bootpart.wks.in" - WKS_FILE ?= "${SOC_DEFAULT_WKS_FILE}" 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 @@ -# short-description: Create SD card image with a boot partition for i.MX8M -# long-description: -# Create an image that can be written onto a SD card using dd for use -# with i.MX8M SoC family -# It uses binary boot container called flash.bin provided directly by -# the U-Boot recipe, and U-Boot ITB files which is created by binman utility -# of U-Boot. -# Those files are added it into the boot partition, which is populated as a -# raw copy into the image. -# Boot container prepared by U-Boot already container SPL, U-Boot itself, -# U-Boot DTB file, ATF, and optional OP-TEE components. -# -# The disk layout used is: -# - ----------- -------------- ------------- -# | | flash.bin | boot | rootfs | -# - ----------- -------------- ------------- -# ^ ^ ^ ^ ^ -# | | | | | -# 0 | 8MiB 72MiB 72MiB + rootfs + IMAGE_EXTRA_SPACE (default 10MiB) -# ${IMX_BOOT_SEEK} 32 or 33kiB, see reference manual -# -part u-boot --source rawcopy --sourceparams="file=flash.bin" --ondisk mmcblk --no-table --align ${IMX_BOOT_SEEK} -part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 8192 --size 64 -part / --source rootfs --ondisk mmcblk --fstype=ext4 --label root --align 8192 - -bootloader --ptable msdos -- cgit v1.2.3-54-g00ecf