3 files changed, 26 insertions, 167 deletions
diff --git a/config/data/grub/module/default b/config/data/grub/module/default
index 39030e2a..78ee52fe 100755..100644
--- a/config/data/grub/module/default
+++ b/config/data/grub/module/default
@@ -33,8 +33,8 @@ configfile \
 cpio \
 cpio_be \
 crc64 \
-crypto_cipher_mode_test \
 crypto \
+crypto_cipher_mode_test \
 cryptodisk \
 diskfilter \
 echo \
@@ -42,6 +42,7 @@ ehci \
 eval \
 exfat \
 elf \
+extcmd \
 ext2 \
 fat \
 functional_test \
@@ -60,6 +61,7 @@ gcry_kdf \
 gcry_keccak \
 gcry_md4 \
 gcry_md5 \
+gcry_pubkey_dilithium \
 gcry_rfc2268 \
 gcry_rijndael \
 gcry_rmd160 \
@@ -83,6 +85,7 @@ iorw \
 iso9660 \
 jpeg \
 json \
+key_protector \
 keylayouts \
 keystatus \
 linux \
@@ -102,23 +105,31 @@ mdraid09 \
 mdraid09_be \
 mdraid1x \
 memdisk \
+memmove_bench \
 memrw \
+mfa \
 minicmd \
 mmap \
+mpi \
+mldsa_test \
 multiboot \
 multiboot2 \
 nativedisk \
+net \
 normal \
 ntfs \
+nvme \
 ohci \
 part_bsd \
 part_dfly \
 part_gpt \
 part_msdos \
 password \
+password_argon2 \
 password_pbkdf2 \
 pata \
 pbkdf2 \
+pci \
 pcidump \
 pgp \
 play \
@@ -154,6 +165,7 @@ ufs2 \
 usb \
 usb_keyboard \
 usbms \
+virtionet \
 xfs \
 xzio \
 zfs \
diff --git a/config/data/grub/module/nvme b/config/data/grub/module/nvme
deleted file mode 100755
index 4b832983..00000000
--- a/config/data/grub/module/nvme
+++ /dev/null
@@ -1,164 +0,0 @@
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-# Install modules (installed, but not automatically loaded)
-grub_install_modules=" \
-hexdump \
-newc \
-odc \
-usbserial_common \
-usbserial_ftdi \
-usbserial_pl2303 \
-usbserial_usbdebug \
-video_colors \
-"
-# Modules (and always loaded)
-grub_modules=" \
-acpi \
-ahci \
-at_keyboard \
-all_video \
-ata \
-bitmap \
-bitmap_scale \
-boot \
-bsd \
-btrfs \
-cat \
-cbfs \
-cbls \
-cbmemc \
-cbtime \
-chain \
-configfile \
-cpio \
-cpio_be \
-crc64 \
-crypto_cipher_mode_test \
-crypto \
-cryptodisk \
-diskfilter \
-echo \
-ehci \
-eval \
-exfat \
-elf \
-ext2 \
-fat \
-functional_test \
-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 \
-gcry_rijndael \
-gcry_rmd160 \
-gcry_rsa \
-gcry_seed \
-gcry_serpent \
-gcry_sha1 \
-gcry_sha256 \
-gcry_sha512 \
-gcry_tiger \
-gcry_twofish \
-gcry_whirlpool \
-geli \
-gfxmenu \
-gfxterm_background \
-gzio \
-hashsum \
-halt \
-help \
-iorw \
-iso9660 \
-jpeg \
-json \
-keylayouts \
-keystatus \
-linux \
-linux16 \
-loadenv \
-loopback \
-ls \
-lsacpi \
-lsmmap \
-lspci \
-luks \
-luks2 \
-argon2 \
-lvm \
-lzopio \
-mdraid09 \
-mdraid09_be \
-mdraid1x \
-memdisk \
-memrw \
-minicmd \
-mmap \
-multiboot \
-multiboot2 \
-nativedisk \
-normal \
-ntfs \
-nvme \
-ohci \
-part_bsd \
-part_dfly \
-part_gpt \
-part_msdos \
-password \
-password_pbkdf2 \
-pata \
-pbkdf2 \
-pcidump \
-pgp \
-play \
-png \
-procfs \
-pubkey \
-raid5rec \
-raid6rec \
-read \
-reboot \
-regexp \
-romfs \
-scsi \
-search \
-search_fs_file \
-search_fs_uuid \
-search_label \
-serial \
-syslinuxcfg \
-setjmp \
-setpci \
-spkmodem \
-squash4 \
-sleep \
-tar \
-test \
-true \
-uhci \
-udf \
-ufs1 \
-ufs1_be \
-ufs2 \
-usb \
-usb_keyboard \
-usbms \
-xfs \
-xzio \
-zfs \
-zfscrypt \
-zfsinfo \
-zstd \
-"
diff --git a/config/data/grub/module/xhci_nvme b/config/data/grub/module/xhci
index 616fca40..ef0991aa 100755
--- a/config/data/grub/module/xhci_nvme
+++ b/config/data/grub/module/xhci
@@ -34,8 +34,8 @@ configfile \
 cpio \
 cpio_be \
 crc64 \
-crypto_cipher_mode_test \
 crypto \
+crypto_cipher_mode_test \
 cryptodisk \
 diskfilter \
 echo \
@@ -43,6 +43,7 @@ ehci \
 eval \
 exfat \
 elf \
+extcmd \
 ext2 \
 fat \
 functional_test \
@@ -61,6 +62,7 @@ gcry_kdf \
 gcry_keccak \
 gcry_md4 \
 gcry_md5 \
+gcry_pubkey_dilithium \
 gcry_rfc2268 \
 gcry_rijndael \
 gcry_rmd160 \
@@ -84,6 +86,7 @@ iorw \
 iso9660 \
 jpeg \
 json \
+key_protector \
 keylayouts \
 keystatus \
 linux \
@@ -103,12 +106,17 @@ mdraid09 \
 mdraid09_be \
 mdraid1x \
 memdisk \
+memmove_bench \
 memrw \
+mfa \
 minicmd \
 mmap \
+mpi \
+mldsa_test \
 multiboot \
 multiboot2 \
 nativedisk \
+net \
 normal \
 ntfs \
 nvme \
@@ -118,15 +126,17 @@ part_dfly \
 part_gpt \
 part_msdos \
 password \
+password_argon2 \
 password_pbkdf2 \
 pata \
 pbkdf2 \
+pci \
 pcidump \
 pgp \
 play \
 png \
-pubkey \
 procfs \
+pubkey \
 raid5rec \
 raid6rec \
 read \
@@ -156,6 +166,7 @@ ufs2 \
 usb \
 usb_keyboard \
 usbms \
+virtionet \
 xfs \
 xzio \
 zfs \