fri2: Add grub-efi workaround for USB keyboard initialization

The Fastboot firmware will sometimes fail to init the USB keyboard when
connected directly in 1.0 mode (works fine through a 2.0 hub). By adding
the USB modules to the grub-efi build, we can ensure the keyboard will
be available in the grub menu at the expense of about a second in boot
time.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Acked-by: Tom Zanussi <tom.zanussi@intel.com>

1 files changed, 11 insertions, 0 deletions

diff --git a/meta-fri2/recipes-bsp/grub/grub-efi-native_2.00.bbappend b/meta-fri2/recipes-bsp/grub/grub-efi-native_2.00.bbappend
new file mode 100644
index 00000000..c6904ef0
--- /dev/null
+++ b/meta-fri2/recipes-bsp/grub/grub-efi-native_2.00.bbappend
@@ -0,0 +1,11 @@
+# The Intel provided Fast Boot Firmware may not initialize the USB keyboard
+# before launching the grub.efi payload. Ensure GRUB has keyboard control by
+# building in the usb, usb_keyboard, and ohci modules.
+
+do_mkimage() {
+        ./grub-mkimage -p /EFI/BOOT -d ./grub-core/ \
+                       -O ${GRUB_TARGET}-efi -o ./${GRUB_IMAGE} \
+                       boot linux ext2 fat serial part_msdos part_gpt normal efi_gop \
+                       usb usb_keyboard ohci
+}
+