From: Daniel Schultz <d.schultz@phytec.de>
To: <meta-ti@lists.yoctoproject.org>
Cc: Daniel Schultz <d.schultz@phytec.de>
Subject: [PATCH kirkstone+ 1/2] conf: machine: include: k3: Select correct WKS file
Date: Thu, 4 May 2023 05:37:35 -0700 [thread overview]
Message-ID: <20230504123736.1475746-1-d.schultz@phytec.de> (raw)
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 <d.schultz@phytec.de>
---
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"
--
2.25.1
next reply other threads:[~2023-05-04 12:37 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-04 12:37 Daniel Schultz [this message]
2023-05-04 12:37 ` [PATCH kirkstone+ 2/2] recipes-graphics: ti-img-rogue-umlibs: Make -vulkan optional Daniel Schultz
2023-05-07 16:08 ` [meta-ti] " Denys Dmytriyenko
2023-05-06 1:47 ` [meta-ti] [PATCH kirkstone+ 1/2] conf: machine: include: k3: Select correct WKS file Denys Dmytriyenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230504123736.1475746-1-d.schultz@phytec.de \
--to=d.schultz@phytec.de \
--cc=meta-ti@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.