scripts: generate grub efi for arm except rpi

add all_video

(cherry picked from commit dd59175033665f48b2c9ba17d52edc870cd05940)

2 files changed, 5 insertions, 3 deletions

diff --git a/scripts/mkimg.arm.sh b/scripts/mkimg.arm.sh
index 8b42612878..154f2ce2bc 100755
--- a/scripts/mkimg.arm.sh
+++ b/scripts/mkimg.arm.sh
@@ -82,6 +82,7 @@ profile_rpi() {
         initfs_features="base bootchart squashfs ext4 f2fs kms mmc raid scsi usb"
         hostname="rpi"
         modloopfw="brcm/brcmfmac43455-sdio.clm_blob"
+        grub_mod=
 }
 
 build_uboot() {
diff --git a/scripts/mkimg.base.sh b/scripts/mkimg.base.sh
index 138c0fa5b4..0c04b01686 100755
--- a/scripts/mkimg.base.sh
+++ b/scripts/mkimg.base.sh
@@ -199,8 +199,6 @@ section_grubieee1275() {
 
 section_grub_efi() {
         [ -n "$grub_mod" ] || return 0
-        [ "$output_format" = "iso" ] || return 0
-
         local _format _efi
         case "$ARCH" in
         aarch64)_format="arm64-efi";  _efi="bootaa64.efi" ;;
@@ -295,7 +293,10 @@ profile_base() {
         initfs_cmdline="modules=loop,squashfs,sd-mod,usb-storage quiet"
         initfs_features="ata base bootchart cdrom squashfs ext4 mmc raid scsi usb virtio"
         modloop_sign=yes
-        grub_mod="disk part_gpt part_msdos linux multiboot2 normal configfile search search_label efi_uga efi_gop fat iso9660 cat echo ls test true help gzio"
+        grub_mod="all_video disk part_gpt part_msdos linux normal configfile search search_label efi_gop fat iso9660 cat echo ls test true help gzio"
+        case "$ARCH" in
+        x86*) grub_mod="$grub_mod multiboot2 efi_uga";;
+        esac
         apks="alpine-base alpine-mirrors busybox kbd-bkeymaps chrony e2fsprogs network-extras libressl openssh tzdata"
         apkovl=
         hostname="alpine"