From ab92e0322d7ae25677040cf6c83fc7aa0076753f Mon Sep 17 00:00:00 2001 From: Daniel Schultz Date: Thu, 4 May 2023 05:37:35 -0700 Subject: [PATCH] conf: machine: include: k3: Select correct WKS file Select the correct WKS file according to the MACHINE_FEATURE efi. Right now, the sdimage-2part-efi.wks is set by default. Switch to the sdimage-2part.wks file, if efi was removed from MACHINE_FEATURES to allow non-efi boot methods. Signed-off-by: Daniel Schultz Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/include/k3.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc index 31da2ca9..fff15505 100644 --- a/meta-ti-bsp/conf/machine/include/k3.inc +++ b/meta-ti-bsp/conf/machine/include/k3.inc @@ -50,7 +50,8 @@ IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}" EFI_PROVIDER ?= "grub-efi" MACHINE_FEATURES += "efi" -WKS_FILE ?= "sdimage-2part-efi.wks" +WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks", "sdimage-2part.wks", d)}" + do_image_wic[depends] += "virtual/bootloader:do_deploy" do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"