From f528512899e1f6a061db22b1c605414bc6087835 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Thu, 1 Apr 2021 05:57:29 +0000 Subject: [PATCH] conf/machine: k3: Add multi-certificate boot image support Lets keep things consistent by providing two possibilities for platforms to pick from - legacy boot and multi-certificate boot. In legacy boot, the base bootloader and system firmware are maintained as separate binaries (tiboot3.bin and sysfw.itb). In multi-certificate boot that newer K3 devices support, ROM is smarter and can handle multiple x509 certificate based images: so we can strip out the sysfw.itb and integrate it as part of tiboot3.bin itself. This improves authentication and overall system boot times since we are now able to boot both the system controller and the boot processor in parallel. We do have a scheme currently to identify the images necessary for boot etc, but things are handled on a platform conf file basis. We can improve that by introducing the pattern at the top level include and use the relevant pattern in platforms as needed. Signed-off-by: Nishanth Menon Reviewed-by: Denys Dmytriyenko --- conf/machine/include/k3.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc index c727d724..56ad40c3 100644 --- a/conf/machine/include/k3.inc +++ b/conf/machine/include/k3.inc @@ -40,7 +40,11 @@ MACHINE_FEATURES = "kernel26 apm usbgadget usbhost vfat ext2 alsa ethernet pci" IMAGE_FSTYPES += "tar.xz wic.xz" -IMAGE_BOOT_FILES ?= "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" +IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysfw.itb" +IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin" + +IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}" + WKS_FILE ?= "sdimage-2part.wks" do_image_wic[depends] += "virtual/bootloader:do_deploy" do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"