From: Jan Kiszka <jan.kiszka@web.de>
To: isar-users <isar-users@googlegroups.com>
Cc: Henning Schild <henning.schild@siemens.com>
Subject: [PATCH] wic: bootimg-efi-isar: Add support for arm64
Date: Sun, 23 Sep 2018 13:57:37 +0200 [thread overview]
Message-ID: <a50675e9-5c9b-e942-a708-93cbbdaac33d@web.de> (raw)
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
next reply other threads:[~2018-09-23 11:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-23 11:57 Jan Kiszka [this message]
2018-09-26 5:21 ` Maxim Yu. Osipov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a50675e9-5c9b-e942-a708-93cbbdaac33d@web.de \
--to=jan.kiszka@web.de \
--cc=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox