diff options
| author | Denys Dmytriyenko <denys@konsulko.com> | 2024-04-24 18:36:24 -0400 |
|---|---|---|
| committer | Ryan Eatmon <reatmon@ti.com> | 2024-04-26 16:18:54 -0500 |
| commit | 84388671bab53628c1a4269f89a7fcf8689c13de (patch) | |
| tree | cfa60796093d81335e6b3840a92d2d46e3720ea6 | |
| parent | 5edd110f54fa79216a041c909c51fadc63321b5d (diff) | |
| download | meta-ti-84388671bab53628c1a4269f89a7fcf8689c13de.tar.gz | |
wic: prevent boot FAT partition mounting under /boot
Separate FAT boot partition holds SPL, SYSFW and U-boot images, while
rootfs places kernel images and DTBs into /boot directory. So it is not
desirable to mount boot FAT partition into /boot directory of the rootfs
and shadow its original content - adjust corresponding entry in wic
templates.
While at it, remove unused ondisk parameter when using use-uuid, which
takes precedence and is more flexible.
Note: boot FAT partition will be automounted at /run/media/boot-mmcblk0p1/
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
Reviewed-by: Jonathan Cormier <jcormier@criticallink.com>
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
| -rw-r--r-- | meta-ti-bsp/wic/sdimage-2part-efi.wks.in | 3 | ||||
| -rw-r--r-- | meta-ti-bsp/wic/sdimage-2part.wks | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in index 2213a348..ca042be1 100644 --- a/meta-ti-bsp/wic/sdimage-2part-efi.wks.in +++ b/meta-ti-bsp/wic/sdimage-2part-efi.wks.in | |||
| @@ -2,6 +2,7 @@ | |||
| 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 | |||
| 5 | bootloader --timeout=3 --append="rootfstype=ext4" | 6 | bootloader --timeout=3 --append="rootfstype=ext4" |
| 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 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 | 8 | part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid |
diff --git a/meta-ti-bsp/wic/sdimage-2part.wks b/meta-ti-bsp/wic/sdimage-2part.wks index 3eab9407..5073176e 100644 --- a/meta-ti-bsp/wic/sdimage-2part.wks +++ b/meta-ti-bsp/wic/sdimage-2part.wks | |||
| @@ -2,5 +2,5 @@ | |||
| 2 | # long-description: Creates a partitioned SD card image for TI platforms. | 2 | # long-description: Creates a partitioned SD card image for TI platforms. |
| 3 | # Boot files are located in the first vfat partition with extra reserved space. | 3 | # Boot files are located in the first vfat partition with extra reserved space. |
| 4 | 4 | ||
| 5 | part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 1024 --fixed-size 128 --use-uuid | 5 | part --source bootimg-partition --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M |
| 6 | part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 1024 --use-uuid | 6 | part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid |