From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6604387793572462592 X-Received: by 2002:a1c:eb10:: with SMTP id j16-v6mr548369wmh.22.1537703860838; Sun, 23 Sep 2018 04:57:40 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c056:: with SMTP id u22-v6ls1275921wmc.2.gmail; Sun, 23 Sep 2018 04:57:40 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZgBOeUCoee2pLdoJmcNKyOPHiGX7L9N3utwfi9glC10UMlntARr8D5E/dWMb5wH1jnozgC X-Received: by 2002:a7b:c159:: with SMTP id z25-v6mr592590wmi.13.1537703860326; Sun, 23 Sep 2018 04:57:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537703860; cv=none; d=google.com; s=arc-20160816; b=LbQigHyS/xD3QYhmKjT16HBRNRFUzz1bcSBgTVz1B2534aP+oXKhxDK6oO5zwwtVTY xAguCg3p8XmQIz6LZ9XPl30d6mt3eW56xezt8kX/m/mUNszkkhPB/6tnmAfUVO7ajEor CslJYMZbtunRQDNiWYts5j4IWerzfWaudjKxmrgHQHb91jH7xDp+NgAMfZ0syHZUU8pM mPFAkx5qLXrA9+lwHbWQ2Qd4HyTuusxvxSZK4J4B3bP5sMCgAnpppXvzXN0g8eZQDWBZ 4mhfjxogNCb0pbO0e8GfPtVnWU6cyd7CgVYnto/AlF2J9hESvknv6GJfRLXTMiDeVxTu wc7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:content-language:mime-version:user-agent :date:message-id:subject:from:cc:to; bh=V0vgcG1Rqg1S6KRw6U0/i9RUpD7Jb1LdZubu8AtS1AU=; b=DLW3kBspkA3CeKk9wQtfSNJm9ECdQ597DydiMvL1e1gIciryUzuMbP41nkHCLefQQj 78d54I7RKfgNRsWPHshz4AV3uy5LF4WVeY8M4YQgTOzTmlojwZ9+5fXdrjqEWTFp6yji exCWzsDGCy/fAfBZE3f5nK9Y7S3rI+J1MR/VvPGvjuLhRp6r/ViQz4Vf3ObRKpnfC4xv f6aIFs5PRRNiwObIS812WKcHTA6W3W6Y6jdx1NxEXX7B/yaA8mw4AS/QLmuv6z94KnLw UWcfAZjQ9tC/KfGBxsw+JQKeeWFZfms7hBRRi56Xt38Oh8jWpLBZugsrv6fshGCxHMr1 lnXA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.14 as permitted sender) smtp.mailfrom=jan.kiszka@web.de Return-Path: Received: from mout.web.de (mout.web.de. [212.227.15.14]) by gmr-mx.google.com with ESMTPS id l13-v6si8933wrp.2.2018.09.23.04.57.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 23 Sep 2018 04:57:40 -0700 (PDT) Received-SPF: pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.14 as permitted sender) client-ip=212.227.15.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@web.de designates 212.227.15.14 as permitted sender) smtp.mailfrom=jan.kiszka@web.de Received: from [192.168.1.10] ([95.157.57.47]) by smtp.web.de (mrweb001 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LxNyU-1fjhlp3fMQ-0170Mr; Sun, 23 Sep 2018 13:57:39 +0200 To: isar-users Cc: Henning Schild From: Jan Kiszka Subject: [PATCH] wic: bootimg-efi-isar: Add support for arm64 Message-ID: Date: Sun, 23 Sep 2018 13:57:37 +0200 User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); de; rv:1.8.1.12) Gecko/20080226 SUSE/2.0.0.12-1.1 Thunderbird/2.0.0.12 Mnenhy/0.7.5.666 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K1:HLEYAJL2L+dSMfkVLGoD8hprRzIK4bcUYk4202fNC+ArrgRjVDQ 4JcM5forIBKu4S0An4gMj+/vKj+lTRMkcPOA79uuGRZNSEgKN3Qc3QBXfg7mxM0flqS3nVZ s9oncGE0DcpJ/YB9/2rcM6jS/0O54EQ7cq9AmQZOvMAvBHsD/rEpO6Pwb6so8AUpkVmkhz+ 4arIsjbcrcWBnuQXxJYnA== X-UI-Out-Filterresults: notjunk:1;V01:K0:nK3HU60zP10=:7Wfjq4sTgV/N6hUQ9Gz7fx oKMu8Dy/U3SA24fr4XSJs+4IRoykEs0Yp3rFV6Y/XzJ3lvM0dHJzSE0wGjlDL67jQ+/SHBFEF hhym15Ye/7ZoUbzfKXz9lEN9St+rPddgBGKxvy5e1p2V3c9r3jhorjTTMyTn2uXT4O4fXxXO5 dssydThtLbX3KF7n7H5lgepkKgTqZYv6OGaurDBFCSgt0xRWrP/WMQbwvurFEOBIDi3cO8v5g dhiYjyqN6yPdWoTcuoBE2K3lkfdgPKjlFCC2XGQvUJMZtRCClpm0VaHO5Tz9KsWqVphpJQwXa /Jhgl2KlakCgbgtZHI8V/QiwyWVoEiu4mCDIX+anPfasyqzLKHk3nKCEkd8iysAB4o/kVBOMc Y7Eq+2K9/Dk7wPbVXt4zb3prv/sINDK4fG2i04F8rqfoqMyxbeW1BuqyORIizGxOw6zX1BY1Y YgZ7Ec+QcFEhgY6x5w573rROEdiH4Vg6pZYFGQNFaKJWW0nMjEkHV3VwKz8Y3HdZk6nujIIW8 RIbQniR7stgeaLTwdm4rxfKDfeHB322b2T7Ka1t6yDwQVR7UJzFKP9M3GV23Zyi3xI4NS4vG9 AuteO49KM6Uy/+84SWvLAf5HUwaUGuxUIFJ9AXqbdToIsWJZ9WnQnrvB7IlLlLUtAyWA5jHda OoCA72q0f3ydg31+lJNXP10+gmi9PJBMXbmnUm9cudF+a4tsAXt3Sq8S07w+SO219QamGW3nM ULCk4aYgmc/QZqTBH4wB/RaeDkYpP5zJudwyaDOdzASpeU5qkNNZkp1OM5IioK/oNg7QNoeCn iGwycRFgRZuOL898ofnqSG5X0J+Zf4rrxPAZQAXThlO045poNA= X-TUID: LHlmu6rY7nfN From: Jan Kiszka 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 --- 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