diff --git a/board/qualcomm/sm8250/genimage.cfg b/board/qualcomm/sm8250/genimage.cfg
index f4162313..f35387cc 100644
--- a/board/qualcomm/sm8250/genimage.cfg
+++ b/board/qualcomm/sm8250/genimage.cfg
@@ -1,6 +1,6 @@
 image boot.vfat {
         vfat {
-                extraargs = "-F 32 -n KNULLI"
+                extraargs = "-F 32 -s 32 -n KNULLI"
 		@files
         }
 
diff --git a/board/qualcomm/sm8250/patches/grub2/001-map-suspend-key-to-enter.patch b/board/qualcomm/sm8250/patches/grub2/001-map-suspend-key-to-enter.patch
new file mode 100644
index 00000000..a28b3740
--- /dev/null
+++ b/board/qualcomm/sm8250/patches/grub2/001-map-suspend-key-to-enter.patch
@@ -0,0 +1,34 @@
+--- a/grub-core/term/efi/console.c
++++ b/grub-core/term/efi/console.c
+@@ -204,6 +204,8 @@
+     GRUB_TERM_KEY_F10, GRUB_TERM_KEY_F11, GRUB_TERM_KEY_F12, GRUB_TERM_ESC
+   };
+ 
++#define GRUB_EFI_SCAN_SUSPEND 0x0102
++
+ static int
+ grub_efi_translate_key (grub_efi_input_key_t key)
+ {
+@@ -222,6 +224,9 @@
+   /* Some devices send enter with scan_code 0x0d (F3) and unicode_char 0x0d. */
+   else if (key.scan_code == '\r' && key.unicode_char == '\r')
+     return key.unicode_char;
++  /* Qualcomm firmware reports the power button as EFI_SCAN_SUSPEND. */
++  else if (key.scan_code == GRUB_EFI_SCAN_SUSPEND)
++    return '\r';
+   else if (key.scan_code < ARRAY_SIZE (efi_codes))
+     return efi_codes[key.scan_code];
+ 
+@@ -365,6 +370,12 @@
+   text_input = grub_efi_open_protocol(grub_efi_system_table->console_in_handler,
+ 				      &text_input_ex_guid,
+ 				      GRUB_EFI_OPEN_PROTOCOL_GET_PROTOCOL);
++
++  /* Discard keys queued by firmware before GRUB took over input.  This is
++     particularly important when the power button is also used as Enter. */
++  if (text_input)
++    text_input->reset (text_input, 0);
++
+   term->data = (void *)text_input;
+ 
+   return 0;
diff --git a/board/qualcomm/sm8250/rp5/genimage.cfg b/board/qualcomm/sm8250/rp5/genimage.cfg
index f4162313..f35387cc 100644
--- a/board/qualcomm/sm8250/rp5/genimage.cfg
+++ b/board/qualcomm/sm8250/rp5/genimage.cfg
@@ -1,6 +1,6 @@
 image boot.vfat {
         vfat {
-                extraargs = "-F 32 -n KNULLI"
+                extraargs = "-F 32 -s 32 -n KNULLI"
 		@files
         }
 
diff --git a/board/qualcomm/sm8250/rpflip2/genimage.cfg b/board/qualcomm/sm8250/rpflip2/genimage.cfg
index f4162313..f35387cc 100644
--- a/board/qualcomm/sm8250/rpflip2/genimage.cfg
+++ b/board/qualcomm/sm8250/rpflip2/genimage.cfg
@@ -1,6 +1,6 @@
 image boot.vfat {
         vfat {
-                extraargs = "-F 32 -n KNULLI"
+                extraargs = "-F 32 -s 32 -n KNULLI"
 		@files
         }
 
diff --git a/board/qualcomm/sm8250/rpmini/genimage.cfg b/board/qualcomm/sm8250/rpmini/genimage.cfg
index f4162313..f35387cc 100644
--- a/board/qualcomm/sm8250/rpmini/genimage.cfg
+++ b/board/qualcomm/sm8250/rpmini/genimage.cfg
@@ -1,6 +1,6 @@
 image boot.vfat {
         vfat {
-                extraargs = "-F 32 -n KNULLI"
+                extraargs = "-F 32 -s 32 -n KNULLI"
 		@files
         }
 
diff --git a/board/qualcomm/sm8250/rpminiv2/genimage.cfg b/board/qualcomm/sm8250/rpminiv2/genimage.cfg
index f4162313..f35387cc 100644
--- a/board/qualcomm/sm8250/rpminiv2/genimage.cfg
+++ b/board/qualcomm/sm8250/rpminiv2/genimage.cfg
@@ -1,6 +1,6 @@
 image boot.vfat {
         vfat {
-                extraargs = "-F 32 -n KNULLI"
+                extraargs = "-F 32 -s 32 -n KNULLI"
 		@files
         }