diff mbox series

[master,v4,3/4] meta-ti-bsp: wic: Add initramfs path to to grub config

Message ID 20251006115010.1530509-4-m-shah@ti.com
State Superseded
Delegated to: Ryan Eatmon
Headers show
Series Add recipes to build initramfs image | expand

Commit Message

Moteen Shah Oct. 6, 2025, 11:50 a.m. UTC
Add initrd path to grub.cfg config so that it picks up
the initramfs image from the boot partition and includes
it in the boot process.

Signed-off-by: Moteen Shah <m-shah@ti.com>
---
 meta-ti-bsp/wic/sdimage-2part-efi.wks.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ryan Eatmon Oct. 13, 2025, 10:09 p.m. UTC | #1
On 10/6/2025 6:50 AM, Moteen Shah wrote:
> Add initrd path to grub.cfg config so that it picks up
> the initramfs image from the boot partition and includes
> it in the boot process.
> 
> Signed-off-by: Moteen Shah <m-shah@ti.com>
> ---
>   meta-ti-bsp/wic/sdimage-2part-efi.wks.in | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in
> index ae38daa7..6a7046a4 100644
> --- a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in
> +++ b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in
> @@ -4,5 +4,5 @@
>   # reserved space.  We cannot use a GPT here.
>   
>   bootloader --timeout=3 --append="rootfstype=ext4 ${TI_WKS_BOOTLOADER_APPEND}"
> -part --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
> +part --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER},initrd=ti-core-initramfs.cpio.xz" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M

After some initial build testing we need to change one more thing, we 
cannot hard code the initrd in the above.  When building NOT on 
bsp-mainline, or bsp-next the builds were failing because this w.ks file 
is hard-coded to always need the initramfs file to exist.

Change it to:

--sourceparams="loader=${EFI_PROVIDER}${TI_WKS_INITRAMFS}"

That way we can set the TI_WKS_INITRAMFS variable to either "", or 
",initrd=ti-core-initramfs.cpio.xz" in the ti-soc.inc based on if we are 
needing it or not.


>   part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid
diff mbox series

Patch

diff --git a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in
index ae38daa7..6a7046a4 100644
--- a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in
+++ b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in
@@ -4,5 +4,5 @@ 
 # reserved space.  We cannot use a GPT here.
 
 bootloader --timeout=3 --append="rootfstype=ext4 ${TI_WKS_BOOTLOADER_APPEND}"
-part --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER}" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
+part --source bootimg-efi --sourceparams="loader=${EFI_PROVIDER},initrd=ti-core-initramfs.cpio.xz" --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
 part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid