From a556e14310ef4c900808d52d823a5e654b6e6d89 Mon Sep 17 00:00:00 2001 From: Randolph Sapp Date: Tue, 16 May 2023 17:29:04 -0500 Subject: meta-ti-bsp: sdimage-2part-efi: rename to load variables 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 Signed-off-by: Ryan Eatmon --- meta-ti-bsp/conf/machine/include/k3.inc | 2 +- meta-ti-bsp/wic/sdimage-2part-efi.wks | 7 ------- meta-ti-bsp/wic/sdimage-2part-efi.wks.in | 7 +++++++ 3 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 meta-ti-bsp/wic/sdimage-2part-efi.wks create mode 100644 meta-ti-bsp/wic/sdimage-2part-efi.wks.in 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 deleted file mode 100644 index ffb8d24b..00000000 --- a/meta-ti-bsp/wic/sdimage-2part-efi.wks +++ /dev/null @@ -1,7 +0,0 @@ -# short-description: Create SD card image with 2 partitions and EFI support -# 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 -part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid diff --git a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in new file mode 100644 index 00000000..2213a348 --- /dev/null +++ b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in @@ -0,0 +1,7 @@ +# short-description: Create SD card image with 2 partitions and EFI support +# 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 --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 -- cgit v1.2.3-54-g00ecf