From 0b37653ab908093a108cfe3cbcb4e8d378428d26 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 12 Jun 2024 00:58:22 +0100 Subject: 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 --- config/coreboot/g43t_am3/target.cfg | 1 + config/coreboot/g43t_am3_16mb/target.cfg | 1 + config/coreboot/ga_g41m_es2l/target.cfg | 1 + config/coreboot/hp8200sff_4mb/target.cfg | 1 + config/coreboot/hp8200sff_8mb/target.cfg | 1 + config/coreboot/hp8300cmt_16mb/target.cfg | 1 + config/coreboot/kcma_d8-udimm_16mb/target.cfg | 1 + config/coreboot/kcma_d8_rdimm_16mb/target.cfg | 1 + config/coreboot/kcma_d8_rdimm_2mb/target.cfg | 1 + config/coreboot/kcma_d8_udimm_2mb/target.cfg | 1 + config/coreboot/kgpe_d16_rdimm_16mb/target.cfg | 1 + config/coreboot/kgpe_d16_rdimm_2mb/target.cfg | 1 + config/coreboot/kgpe_d16_udimm_16mb/target.cfg | 1 + config/coreboot/kgpe_d16_udimm_2mb/target.cfg | 1 + config/coreboot/t1650_12mb/target.cfg | 1 + 15 files changed, 15 insertions(+) (limited to 'config/coreboot') diff --git a/config/coreboot/g43t_am3/target.cfg b/config/coreboot/g43t_am3/target.cfg index 13f2a260..f0e838fb 100644 --- a/config/coreboot/g43t_am3/target.cfg +++ b/config/coreboot/g43t_am3/target.cfg @@ -3,3 +3,4 @@ xarch="i386-elf" payload_seabios="y" payload_memtest="y" grub_timeout=10 +grubtree="nvme" diff --git a/config/coreboot/g43t_am3_16mb/target.cfg b/config/coreboot/g43t_am3_16mb/target.cfg index bbe8a9fb..533d8b5a 100644 --- a/config/coreboot/g43t_am3_16mb/target.cfg +++ b/config/coreboot/g43t_am3_16mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_memtest="y" grub_timeout=10 release="n" +grubtree="nvme" diff --git a/config/coreboot/ga_g41m_es2l/target.cfg b/config/coreboot/ga_g41m_es2l/target.cfg index 13f2a260..f0e838fb 100644 --- a/config/coreboot/ga_g41m_es2l/target.cfg +++ b/config/coreboot/ga_g41m_es2l/target.cfg @@ -3,3 +3,4 @@ xarch="i386-elf" payload_seabios="y" payload_memtest="y" grub_timeout=10 +grubtree="nvme" diff --git a/config/coreboot/hp8200sff_4mb/target.cfg b/config/coreboot/hp8200sff_4mb/target.cfg index 950a1223..82169ae7 100644 --- a/config/coreboot/hp8200sff_4mb/target.cfg +++ b/config/coreboot/hp8200sff_4mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_timeout=10 grub_scan_disk="nvme ahci" +grubtree="nvme" diff --git a/config/coreboot/hp8200sff_8mb/target.cfg b/config/coreboot/hp8200sff_8mb/target.cfg index 950a1223..82169ae7 100644 --- a/config/coreboot/hp8200sff_8mb/target.cfg +++ b/config/coreboot/hp8200sff_8mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_timeout=10 grub_scan_disk="nvme ahci" +grubtree="nvme" diff --git a/config/coreboot/hp8300cmt_16mb/target.cfg b/config/coreboot/hp8300cmt_16mb/target.cfg index 950a1223..82169ae7 100644 --- a/config/coreboot/hp8300cmt_16mb/target.cfg +++ b/config/coreboot/hp8300cmt_16mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" grub_timeout=10 grub_scan_disk="nvme ahci" +grubtree="nvme" diff --git a/config/coreboot/kcma_d8-udimm_16mb/target.cfg b/config/coreboot/kcma_d8-udimm_16mb/target.cfg index 1dc344a6..749c4e46 100644 --- a/config/coreboot/kcma_d8-udimm_16mb/target.cfg +++ b/config/coreboot/kcma_d8-udimm_16mb/target.cfg @@ -7,3 +7,4 @@ payload_memtest="y" xlang="c" grub_timout=10 grub_scan_disk="nvme ahci" +grubtree="nvme" diff --git a/config/coreboot/kcma_d8_rdimm_16mb/target.cfg b/config/coreboot/kcma_d8_rdimm_16mb/target.cfg index b5ebb46e..80d2018e 100644 --- a/config/coreboot/kcma_d8_rdimm_16mb/target.cfg +++ b/config/coreboot/kcma_d8_rdimm_16mb/target.cfg @@ -6,3 +6,4 @@ payload_memtest="y" xlang="c" grub_timeout=10 grub_scan_disk="nvme ahci" +grubtree="nvme" diff --git a/config/coreboot/kcma_d8_rdimm_2mb/target.cfg b/config/coreboot/kcma_d8_rdimm_2mb/target.cfg index eaee5b1a..744b6e10 100644 --- a/config/coreboot/kcma_d8_rdimm_2mb/target.cfg +++ b/config/coreboot/kcma_d8_rdimm_2mb/target.cfg @@ -5,3 +5,4 @@ payload_seabios_withgrub="y" payload_memtest="y" xlang="c" grub_scan_disk="nvme ahci" +grubtree="nvme" diff --git a/config/coreboot/kcma_d8_udimm_2mb/target.cfg b/config/coreboot/kcma_d8_udimm_2mb/target.cfg index 852b9e63..d4079eb4 100644 --- a/config/coreboot/kcma_d8_udimm_2mb/target.cfg +++ b/config/coreboot/kcma_d8_udimm_2mb/target.cfg @@ -7,3 +7,4 @@ payload_memtest="y" xlang="c" grub_timeout=10 grub_scan_disk="nvme ahci" +grubtree="nvme" diff --git a/config/coreboot/kgpe_d16_rdimm_16mb/target.cfg b/config/coreboot/kgpe_d16_rdimm_16mb/target.cfg index b5ebb46e..80d2018e 100644 --- a/config/coreboot/kgpe_d16_rdimm_16mb/target.cfg +++ b/config/coreboot/kgpe_d16_rdimm_16mb/target.cfg @@ -6,3 +6,4 @@ payload_memtest="y" xlang="c" grub_timeout=10 grub_scan_disk="nvme ahci" +grubtree="nvme" diff --git a/config/coreboot/kgpe_d16_rdimm_2mb/target.cfg b/config/coreboot/kgpe_d16_rdimm_2mb/target.cfg index b5ebb46e..80d2018e 100644 --- a/config/coreboot/kgpe_d16_rdimm_2mb/target.cfg +++ b/config/coreboot/kgpe_d16_rdimm_2mb/target.cfg @@ -6,3 +6,4 @@ payload_memtest="y" xlang="c" grub_timeout=10 grub_scan_disk="nvme ahci" +grubtree="nvme" diff --git a/config/coreboot/kgpe_d16_udimm_16mb/target.cfg b/config/coreboot/kgpe_d16_udimm_16mb/target.cfg index 852b9e63..d4079eb4 100644 --- a/config/coreboot/kgpe_d16_udimm_16mb/target.cfg +++ b/config/coreboot/kgpe_d16_udimm_16mb/target.cfg @@ -7,3 +7,4 @@ payload_memtest="y" xlang="c" grub_timeout=10 grub_scan_disk="nvme ahci" +grubtree="nvme" diff --git a/config/coreboot/kgpe_d16_udimm_2mb/target.cfg b/config/coreboot/kgpe_d16_udimm_2mb/target.cfg index 852b9e63..d4079eb4 100644 --- a/config/coreboot/kgpe_d16_udimm_2mb/target.cfg +++ b/config/coreboot/kgpe_d16_udimm_2mb/target.cfg @@ -7,3 +7,4 @@ payload_memtest="y" xlang="c" grub_timeout=10 grub_scan_disk="nvme ahci" +grubtree="nvme" diff --git a/config/coreboot/t1650_12mb/target.cfg b/config/coreboot/t1650_12mb/target.cfg index ebf3fca1..a2b3d31f 100644 --- a/config/coreboot/t1650_12mb/target.cfg +++ b/config/coreboot/t1650_12mb/target.cfg @@ -4,3 +4,4 @@ payload_seabios="y" payload_seabios_withgrub="y" payload_memtest="y" grub_scan_disk="nvme ahci" +grubtree="nvme" -- cgit v1.2.1