Re: [PATCH] wic: bootimg-efi-isar: Add support for arm64

["Maxim Yu. Osipov" <mosipov@ilbers.de>]

On 9/23/18 2:57 PM, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This requires to set grub_target and grub_image accordingly, but we also
> need to make multiboot, efi_uga, iorw and ata architecture-dependent
> because they are only available on x86.

Applied to the 'next',

Thanks,
Maxim.

> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
> Tested on HiKey board which comes with a UEFI firmware.
> 
>   .../scripts/lib/wic/plugins/source/bootimg-efi-isar.py     | 14 ++++++++++----
>   1 file changed, 10 insertions(+), 4 deletions(-)
> 
> diff --git a/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> index fccf96c..9ce694d 100644
> --- a/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> +++ b/meta-isar/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
> @@ -224,9 +224,15 @@ class BootimgEFIPlugin(SourcePlugin):
>                   if distro_arch == "amd64":
>                       grub_target = 'x86_64-efi'
>                       grub_image = "bootx64.efi"
> +                    grub_modules = "multiboot efi_uga iorw ata "
>                   elif distro_arch == "i386":
>                       grub_target = 'i386-efi'
>                       grub_image = "bootia32.efi"
> +                    grub_modules = "multiboot efi_uga iorw ata "
> +                elif distro_arch == "arm64":
> +                    grub_target = 'arm64-efi'
> +                    grub_image = "bootaa64.efi"
> +                    grub_modules = ""
>                   else:
>                       raise WicError("grub-efi is incompatible with target %s" %
>                                      distro_arch)
> @@ -241,12 +247,12 @@ class BootimgEFIPlugin(SourcePlugin):
>                       grub_cmd += "-O %s -o %s/EFI/BOOT/%s " \
>                                   % (grub_target, bootimg_dir, grub_image)
>                       grub_cmd += "part_gpt part_msdos ntfs ntfscomp fat ext2 "
> -                    grub_cmd += "normal chain boot configfile linux multiboot "
> -                    grub_cmd += "search efi_gop efi_uga font gfxterm gfxmenu "
> -                    grub_cmd += "terminal minicmd test iorw loadenv echo help "
> +                    grub_cmd += "normal chain boot configfile linux "
> +                    grub_cmd += "search efi_gop font gfxterm gfxmenu "
> +                    grub_cmd += "terminal minicmd test loadenv echo help "
>                       grub_cmd += "reboot serial terminfo iso9660 loopback tar "
>                       grub_cmd += "memdisk ls search_fs_uuid udf btrfs xfs lvm "
> -                    grub_cmd += "reiserfs ata "
> +                    grub_cmd += "reiserfs " + grub_modules
>                       exec_cmd(grub_cmd)
>               elif source_params['loader'] == 'systemd-boot':
>                   for mod in [x for x in os.listdir(kernel_dir) if x.startswith("systemd-")]:
> 


-- 
Maxim Osipov
ilbers GmbH
Maria-Merian-Str. 8
85521 Ottobrunn
Germany
+49 (151) 6517 6917
mosipov@ilbers.de
http://ilbers.de/
Commercial register Munich, HRB 214197
General Manager: Baurzhan Ismagulov