Reviewed-by: Jonathan Cormier <jcormier@criticallink.com>

On Wed, Apr 24, 2024, 12:36 PM Denys Dmytriyenko via lists.yoctoproject.org <denis=denix.org@lists.yoctoproject.org> wrote:
From: Denys Dmytriyenko <denys@konsulko.com>

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>
---
v2 changes:
* remove <mountpoint> from boot partition to avoid undocumented behavior
* add explicit size specifier to --fixed-size 128M

 meta-ti-bsp/wic/sdimage-2part-efi.wks.in | 3 ++-
 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 @@
 # 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 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
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 @@
 # long-description: Creates a partitioned SD card image for TI platforms.
 # Boot files are located in the first vfat partition with extra reserved space.

-part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 1024 --fixed-size 128 --use-uuid
-part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 1024 --use-uuid
+part --source bootimg-partition --fstype=vfat --label boot --active --align 1024 --use-uuid --fixed-size 128M
+part / --source rootfs --fstype=ext4 --label root --align 1024 --use-uuid
--
2.25.1


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#17598): https://lists.yoctoproject.org/g/meta-ti/message/17598
Mute This Topic: https://lists.yoctoproject.org/mt/105720331/7902621
Group Owner: meta-ti+owner@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [jcormier@criticallink.com]
-=-=-=-=-=-=-=-=-=-=-=-