diff options
| author | Randolph Sapp <rs@ti.com> | 2023-05-16 17:29:04 -0500 |
|---|---|---|
| committer | Ryan Eatmon <reatmon@ti.com> | 2023-05-17 11:52:59 -0500 |
| commit | 9002a4e3607503fe7e4ba8aab4b428159858e8f4 (patch) | |
| tree | 906a4584e26f48e847be90d6e3afa70a3395d32f | |
| parent | e25ace5430621933ba4a0a70ba4ca730886cfb7f (diff) | |
| download | meta-ti-9002a4e3607503fe7e4ba8aab4b428159858e8f4.tar.gz | |
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 <rs@ti.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
| -rw-r--r-- | meta-ti-bsp/conf/machine/include/k3.inc | 2 | ||||
| -rw-r--r-- | meta-ti-bsp/wic/sdimage-2part-efi.wks.in (renamed from meta-ti-bsp/wic/sdimage-2part-efi.wks) | 4 |
2 files changed, 3 insertions, 3 deletions
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}" | |||
| 50 | EFI_PROVIDER ?= "grub-efi" | 50 | EFI_PROVIDER ?= "grub-efi" |
| 51 | MACHINE_FEATURES += "efi" | 51 | MACHINE_FEATURES += "efi" |
| 52 | 52 | ||
| 53 | WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks", "sdimage-2part.wks", d)}" | 53 | WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.wks.in", "sdimage-2part.wks", d)}" |
| 54 | 54 | ||
| 55 | do_image_wic[depends] += "virtual/bootloader:do_deploy" | 55 | do_image_wic[depends] += "virtual/bootloader:do_deploy" |
| 56 | do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy" | 56 | 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 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 @@ | |||
| 2 | # long-description: Creates a partitioned SD card image for TI platforms that | 2 | # long-description: Creates a partitioned SD card image for TI platforms that |
| 3 | # supports EFI. Boot files are located in the first vfat partition with extra | 3 | # supports EFI. Boot files are located in the first vfat partition with extra |
| 4 | # reserved space. We cannot use a GPT here. | 4 | # reserved space. We cannot use a GPT here. |
| 5 | bootloader --append="rootfstype=ext4 ro" | 5 | bootloader --timeout=3 --append="rootfstype=ext4" |
| 6 | part /boot --source bootimg-efi --sourceparams="loader=grub-efi" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M | 6 | part /boot --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M |
| 7 | part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid | 7 | part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid |