diff mbox series

[meta-ti,kirkstone] meta-ti-bsp: sdimage-2part-efi: rename to load variables

Message ID 20230516222904.1178426-1-rs@ti.com
State Accepted
Delegated to: Ryan Eatmon
Headers show
Series [meta-ti,kirkstone] meta-ti-bsp: sdimage-2part-efi: rename to load variables | expand

Commit Message

Randolph Sapp May 16, 2023, 10:29 p.m. UTC 
From: Randolph Sapp <rs@ti.com>

Rename the .wks to .wks.in so the EFI_PROVIDER variable is expanded
properly. We only ever set a soft recommendation for GRUB. If anyone
attempted to change that previously it was ignored (for more than just
the reason here, but that's out of my control).

Add a timeout for the bootloader menu. Currently setting it to 3
seconds.

Remove the read only flag on the rootfs. Not sure why that was there.

Signed-off-by: Randolph Sapp <rs@ti.com>
---
 meta-ti-bsp/conf/machine/include/k3.inc                       | 2 +-
 .../wic/{sdimage-2part-efi.wks => sdimage-2part-efi.wks.in}   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename meta-ti-bsp/wic/{sdimage-2part-efi.wks => sdimage-2part-efi.wks.in} (63%)
diff mbox series

Patch

diff --git a/meta-ti-bsp/conf/machine/include/k3.inc b/meta-ti-bsp/conf/machine/include/k3.inc
index fff15505..c6b55239 100644
--- a/meta-ti-bsp/conf/machine/include/k3.inc
+++ b/meta-ti-bsp/conf/machine/include/k3.inc
@@ -50,7 +50,7 @@  IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
 EFI_PROVIDER ?= "grub-efi"
 MACHINE_FEATURES += "efi"
 
-WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks", "sdimage-2part.wks", d)}"
+WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}"
 
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
 do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
diff --git a/meta-ti-bsp/wic/sdimage-2part-efi.wks b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in
similarity index 63%
rename from meta-ti-bsp/wic/sdimage-2part-efi.wks
rename to meta-ti-bsp/wic/sdimage-2part-efi.wks.in
index ffb8d24b..2213a348 100644
--- a/meta-ti-bsp/wic/sdimage-2part-efi.wks
+++ b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in
@@ -2,6 +2,6 @@ 
 # long-description: Creates a partitioned SD card image for TI platforms that
 # supports EFI.  Boot files are located in the first vfat partition with extra
 # reserved space.  We cannot use a GPT here.
-bootloader --append="rootfstype=ext4 ro"
-part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
+bootloader --timeout=3 --append="rootfstype=ext4"
+part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
 part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid