diff options
author | Leah Rowe <leah@libreboot.org> | 2024-06-12 00:58:22 +0100 |
---|---|---|
committer | Leah Rowe <leah@libreboot.org> | 2024-06-12 00:58:22 +0100 |
commit | 0b37653ab908093a108cfe3cbcb4e8d378428d26 (patch) | |
tree | 4fd3b33c728b8c8aed5b6b3df7867c02b8887b71 /config/grub/default/config/payload | |
parent | 1952db55540606b2fb00ddd4be9e358dbc99ef8b (diff) |
grub: only enable nvme if needed on a board
remove nvme support from the "default" grub tree
now there are three trees:
* default: no xhci or nvme patches
* nvme: contains nvme support
* xhci: contains xhci and nvme support
this is in case a bug like lbmk issue #216 ever occurs
again, as referenced before during lbmk audit 5
there is no indication that the nvme patch causes any
issues, but after previous experience i want to be sure
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'config/grub/default/config/payload')
-rw-r--r-- | config/grub/default/config/payload | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/config/grub/default/config/payload b/config/grub/default/config/payload index f81d5930..a405ae25 100644 --- a/config/grub/default/config/payload +++ b/config/grub/default/config/payload @@ -54,7 +54,7 @@ if [ -f (cbfsdisk)/timeout.cfg ]; then else set timeout=5 fi -set grub_scan_disk="nvme ahci ata" +set grub_scan_disk="ahci ata" if [ -f (cbfsdisk)/scan.cfg ]; then source (cbfsdisk)/scan.cfg fi @@ -87,17 +87,11 @@ function search_grub { for part in 1 2 3 4 5 6 7 8 9 10 11 12; do if [ "${1}" != "nvme" ]; then try_user_config "(${1}${i},${part})" - else - # TODO: do we care about other namesapces - try_user_config "(nvme${i}n1,${part})" fi done if [ "${1}" != "nvme" ]; then # raw devices e.g. (ahci0) instead of (ahci0,1) try_user_config "(${1}${i})" - else - # TODO: do we care about other namesapces - try_user_config "(nvme${i}n1)" fi done echo # Insert newline @@ -123,17 +117,11 @@ function search_isolinux { for part in 1 2 3 4 5 6 7 8 9 10 11 12; do if [ "${1}" != "nvme" ]; then try_isolinux_config "(${1}${i},${part})" - else - # TODO: see above - try_isolinux_config "(nvme${i}n1,${part})" fi done if [ "${1}" != "nvme" ]; then # raw devices e.g. (usb0) instead of (usb0,1) try_isolinux_config "(${1}${i})" - else - # TODO: do we care about other namesapces - try_isolinux_config "(nvme${i}n1)" fi done echo # Insert newline @@ -175,9 +163,6 @@ menuentry 'Load Operating System (incl. fully encrypted disks) [o]' --hotkey='o bootdev="${bootdev} (ahci${i},${part})" elif [ "${grub_disk}" = "ata" ]; then bootdev="${bootdev} (ata${i},${part})" - elif [ "${grub_disk}" = "nvme" ]; then - # TODO: do we care about other namesapces - bootdev="${bootdev} (nvme${i}n1,${part})" fi done done @@ -214,9 +199,6 @@ menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on AHCI [a]' --hotkey='a' menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on ATA/IDE [d]' --hotkey='d' { search_bootcfg ata } -menuentry 'Search for GRUB/SYSLINUX/EXTLINUX/ISOLINUX on NVMe [e]' --hotkey='e' { - search_bootcfg nvme -} if [ -f (cbfsdisk)/grub.cfg ]; then menuentry 'Load configuration (grub.cfg) in CBFS [t]' --hotkey='t' { set root='(cbfsdisk)' |