Re: [meta-ti] [PATCHv2] conf/machine: k3: Enable grub-efi by default in wic images

["Denys Dmytriyenko" <denis@denix.org>]

On Mon, Jun 28, 2021 at 02:06:17PM -0400, Tom Rini wrote:
> All of our platforms here support running EFI binaries.  We can have wic
> generate a simple grub.cfg file for us that will find the root partition
> via PARTUUID and utilize the device tree that is already discoverable
> via the EFI configuration tables.  Assuming the EFI loader is U-Boot,
> this device tree can be replaced at run-time by the normal mechanism of
> loading in to memory and passing that address as an argument to bootefi.
> 
> Signed-off-by: Tom Rini <trini@konsulko.com>

Reviewed-by: Denys Dmytriyenko <denys@konsulko.com>


> ---
> Changes in v2:
> - Add missing IMAGE_EFI_BOOT_FILES which is how we populate in the
>   various firmware portions.
> - Use --fixed-size 128M to ensure we have some spare room on the boot
>   partition.
> ---
>  conf/machine/include/k3.inc | 6 +++++-
>  wic/sdimage-2part-efi.wks   | 7 +++++++
>  2 files changed, 12 insertions(+), 1 deletion(-)
>  create mode 100644 wic/sdimage-2part-efi.wks
> 
> diff --git a/conf/machine/include/k3.inc b/conf/machine/include/k3.inc
> index e0970698b33d..166c09239069 100644
> --- a/conf/machine/include/k3.inc
> +++ b/conf/machine/include/k3.inc
> @@ -44,8 +44,12 @@ IMAGE_BOOT_FILES_LEGACY = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin sysf
>  IMAGE_BOOT_FILES_MULTI_CERT = "${SPL_BINARY} u-boot.${UBOOT_SUFFIX} tiboot3.bin"
>  
>  IMAGE_BOOT_FILES ?= "${IMAGE_BOOT_FILES_LEGACY}"
> +IMAGE_EFI_BOOT_FILES ?= "${IMAGE_BOOT_FILES}"
>  
> -WKS_FILE ?= "sdimage-2part.wks"
> +EFI_PROVIDER ?= "grub-efi"
> +MACHINE_FEATURES += "efi"
> +
> +WKS_FILE ?= "sdimage-2part-efi.wks"
>  do_image_wic[depends] += "virtual/bootloader:do_deploy"
>  do_image_wic[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
>  do_image_tar[mcdepends] += "mc::k3r5:virtual/bootloader:do_deploy mc::k3r5:ti-sci-fw:do_deploy"
> diff --git a/wic/sdimage-2part-efi.wks b/wic/sdimage-2part-efi.wks
> new file mode 100644
> index 000000000000..ffb8d24bacd1
> --- /dev/null
> +++ b/wic/sdimage-2part-efi.wks
> @@ -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 --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
> -- 
> 2.17.1
> 

> 
> 
> 


-- 
Regards,
Denys Dmytriyenko <denis@denix.org>
PGP: 0x420902729A92C964 - https://denix.org/0x420902729A92C964
Fingerprint: 25FC E4A5 8A72 2F69 1186  6D76 4209 0272 9A92 C964