* [PATCH] wic: bootimg-efi-isar: Add support for arm64
@ 2018-09-23 11:57 Jan Kiszka
2018-09-26 5:21 ` Maxim Yu. Osipov
0 siblings, 1 reply; 2+ messages in thread
From: Jan Kiszka @ 2018-09-23 11:57 UTC (permalink / raw)
To: isar-users; +Cc: Henning Schild
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.
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-")]:
--
2.16.4
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] wic: bootimg-efi-isar: Add support for arm64
2018-09-23 11:57 [PATCH] wic: bootimg-efi-isar: Add support for arm64 Jan Kiszka
@ 2018-09-26 5:21 ` Maxim Yu. Osipov
0 siblings, 0 replies; 2+ messages in thread
From: Maxim Yu. Osipov @ 2018-09-26 5:21 UTC (permalink / raw)
To: Jan Kiszka, isar-users; +Cc: Henning Schild
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-09-26 5:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-23 11:57 [PATCH] wic: bootimg-efi-isar: Add support for arm64 Jan Kiszka
2018-09-26 5:21 ` Maxim Yu. Osipov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox