6 files changed, 9 insertions, 4 deletions

diff --git a/meta-intel-extras/classes/image_dd_efi.bbclass b/meta-intel-extras/classes/image_dd_efi.bbclass
index 1f5fd9f..4454051 100644
--- a/meta-intel-extras/classes/image_dd_efi.bbclass
+++ b/meta-intel-extras/classes/image_dd_efi.bbclass
@@ -35,10 +35,15 @@ inherit image_dd
 EXTRA_IMAGECMD_ext3 += "-L rootfs"
 
 do_populate_boot() {
+    GRUB_IMAGE="grub-efi-bootia32.efi"
+    DEST_IMAGE="bootia32.efi"
+    if [ "${TARGET_ARCH}" = "x86_64" ]; then
+        GRUB_IMAGE="grub-efi-bootx64.efi"
+        DEST_IMAGE="bootx64.efi"
+    fi
 
     mkdir -p ${WORKDIR}/EFI/BOOT/
     # Path where EFI firmware searches for EFI executable
-    cp ${DEPLOY_DIR_IMAGE}/bootx64.efi ${WORKDIR}/EFI/BOOT/
+    cp ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${WORKDIR}/EFI/BOOT/${DEST_IMAGE}
     mcopy -s -i ${WORKDIR}/boot.img ${WORKDIR}/EFI ::/EFI
 }
-
diff --git a/meta-intel-extras/recipes/grub/grub-efi/grub.cfg b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
index ca53537..287cf7c 100644
--- a/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
+++ b/meta-intel-extras/recipes/grub/grub-efi/grub.cfg
@@ -1,7 +1,7 @@
 # Created by meta-b2qt
 serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
 default=boot
-timeout=10
+timeout=0
 
 menuentry 'boot' {
     linux /boot/bzImage root=LABEL=rootfs
diff --git a/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
index 0104aab..f3a95f2 100644
--- a/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
+++ b/meta-intel-extras/recipes/grub/grub-efi_2.00.bbappend
@@ -32,7 +32,7 @@ SRC_URI += "file://grub.cfg"
 
 do_install[depends] += " \
     virtual/kernel:do_deploy \
-    ${INITRAMFS_IMAGE}:do_rootfs \
+    ${INITRAMFS_IMAGE}:do_image_complete \
     ${@bb.utils.contains('MACHINE_FEATURES', 'intel-ucode', 'intel-microcode:do_deploy', '', d)} \
 "
 
diff --git a/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg b/meta-intel-extras/recipes/linux/linux-intel/b2qt.cfg
index 7902798..7902798 100644
--- a/meta-intel-extras/recipes/linux/linux-yocto/b2qt.cfg
+++ b/meta-intel-extras/recipes/linux/linux-intel/b2qt.cfg
diff --git a/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg b/meta-intel-extras/recipes/linux/linux-intel/wlan-realtek.cfg
index 65ac248..65ac248 100644
--- a/meta-intel-extras/recipes/linux/linux-yocto/wlan-realtek.cfg
+++ b/meta-intel-extras/recipes/linux/linux-intel/wlan-realtek.cfg
diff --git a/meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend b/meta-intel-extras/recipes/linux/linux-intel_%.bbappend
index a61cf4d..a61cf4d 100644
--- a/meta-intel-extras/recipes/linux/linux-yocto_4.%.bbappend
+++ b/meta-intel-extras/recipes/linux/linux-intel_%.bbappend