5 files changed, 16 insertions, 4 deletions
diff --git a/config/data/grub/keymap/noqwerty.gkb b/config/data/grub/keymap/noqwerty.gkb
new file mode 100644
index 00000000..7ad9b7e4
--- /dev/null
+++ b/config/data/grub/keymap/noqwerty.gkb
diff --git a/config/data/grub/mkhelper.cfg b/config/data/grub/mkhelper.cfg
index 8c250f6b..e445900d 100644
--- a/config/data/grub/mkhelper.cfg
+++ b/config/data/grub/mkhelper.cfg
@@ -3,5 +3,5 @@
 bootstrapargs="--gnulib-srcdir=gnulib/ --no-git"
 autoconfargs="--with-platform=coreboot --disable-werror"
 makeargs="FS_PAYLOAD_MODULES=\"\""
-btype="autohell"
+buildtype="autohell"
 mkhelper="mkpayload_grub"
diff --git a/config/data/grub/module/default b/config/data/grub/module/default
index 1ee5327f..f17baae4 100755
--- a/config/data/grub/module/default
+++ b/config/data/grub/module/default
@@ -45,13 +45,17 @@ ext2 \
 fat \
 f2fs \
 gcry_arcfour \
+gcry_blake2 \
 gcry_blowfish \
 gcry_camellia \
 gcry_cast5 \
 gcry_crc \
 gcry_des \
 gcry_dsa \
+gcry_hwfeatures \
 gcry_idea \
+gcry_kdf \
+gcry_keccak \
 gcry_md4 \
 gcry_md5 \
 gcry_rfc2268 \
@@ -69,7 +73,6 @@ gcry_whirlpool \
 geli \
 gfxmenu \
 gfxterm_background \
-gfxterm_menu \
 gzio \
 hashsum \
 halt \
@@ -119,6 +122,7 @@ pgp \
 play \
 png \
 procfs \
+pubkey \
 raid5rec \
 raid6rec \
 read \
diff --git a/config/data/grub/module/nvme b/config/data/grub/module/nvme
index a3a2847c..fecc699b 100755
--- a/config/data/grub/module/nvme
+++ b/config/data/grub/module/nvme
@@ -45,13 +45,17 @@ ext2 \
 fat \
 f2fs \
 gcry_arcfour \
+gcry_blake2 \
 gcry_blowfish \
 gcry_camellia \
 gcry_cast5 \
 gcry_crc \
 gcry_des \
 gcry_dsa \
+gcry_hwfeatures \
 gcry_idea \
+gcry_kdf \
+gcry_keccak \
 gcry_md4 \
 gcry_md5 \
 gcry_rfc2268 \
@@ -69,7 +73,6 @@ gcry_whirlpool \
 geli \
 gfxmenu \
 gfxterm_background \
-gfxterm_menu \
 gzio \
 hashsum \
 halt \
@@ -120,6 +123,7 @@ pgp \
 play \
 png \
 procfs \
+pubkey \
 raid5rec \
 raid6rec \
 read \
diff --git a/config/data/grub/module/xhci b/config/data/grub/module/xhci_nvme
index ee4d10f7..9c84c61f 100755
--- a/config/data/grub/module/xhci
+++ b/config/data/grub/module/xhci_nvme
@@ -46,13 +46,17 @@ ext2 \
 fat \
 f2fs \
 gcry_arcfour \
+gcry_blake2 \
 gcry_blowfish \
 gcry_camellia \
 gcry_cast5 \
 gcry_crc \
 gcry_des \
 gcry_dsa \
+gcry_hwfeatures \
 gcry_idea \
+gcry_kdf \
+gcry_keccak \
 gcry_md4 \
 gcry_md5 \
 gcry_rfc2268 \
@@ -70,7 +74,6 @@ gcry_whirlpool \
 geli \
 gfxmenu \
 gfxterm_background \
-gfxterm_menu \
 gzio \
 hashsum \
 halt \
@@ -120,6 +123,7 @@ pcidump \
 pgp \
 play \
 png \
+pubkey \
 procfs \
 raid5rec \
 raid6rec \