diff --git a/config/coreboot/dell3050micro_vfsp_16mb/target.cfg b/config/coreboot/dell3050micro_vfsp_16mb/target.cfg index e100fbed..4e04f453 100644 --- a/config/coreboot/dell3050micro_vfsp_16mb/target.cfg +++ b/config/coreboot/dell3050micro_vfsp_16mb/target.cfg @@ -6,8 +6,8 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" -grubtree="xhci" +grubtree="xhci_nvme" vcfg="3050micro" -build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot" IFD_platform="sklkbl" payload_uboot="amd64" diff --git a/config/coreboot/dell9020mt_nri_12mb/target.cfg b/config/coreboot/dell9020mt_nri_12mb/target.cfg index 7c26ae5e..47e228b7 100644 --- a/config/coreboot/dell9020mt_nri_12mb/target.cfg +++ b/config/coreboot/dell9020mt_nri_12mb/target.cfg @@ -6,7 +6,7 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" -grubtree="xhci" +grubtree="xhci_nvme" vcfg="haswell" -build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/coreboot/dell9020sff_nri_12mb/target.cfg b/config/coreboot/dell9020sff_nri_12mb/target.cfg index 7c26ae5e..47e228b7 100644 --- a/config/coreboot/dell9020sff_nri_12mb/target.cfg +++ b/config/coreboot/dell9020sff_nri_12mb/target.cfg @@ -6,7 +6,7 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" -grubtree="xhci" +grubtree="xhci_nvme" vcfg="haswell" -build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/coreboot/hp820g2_12mb/target.cfg b/config/coreboot/hp820g2_12mb/target.cfg index 66d0433e..8a69483f 100644 --- a/config/coreboot/hp820g2_12mb/target.cfg +++ b/config/coreboot/hp820g2_12mb/target.cfg @@ -6,7 +6,7 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" -grubtree="xhci" +grubtree="xhci_nvme" vcfg="hp820g2" -build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/coreboot/t1700mt_bmrc_12mb/target.cfg b/config/coreboot/t1700mt_bmrc_12mb/target.cfg index 5fd0d500..a2d591d1 100644 --- a/config/coreboot/t1700mt_bmrc_12mb/target.cfg +++ b/config/coreboot/t1700mt_bmrc_12mb/target.cfg @@ -6,7 +6,7 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" -grubtree="xhci" +grubtree="xhci_nvme" vcfg="t1700" -build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/coreboot/t1700sff_bmrc_12mb/target.cfg b/config/coreboot/t1700sff_bmrc_12mb/target.cfg index 5fd0d500..a2d591d1 100644 --- a/config/coreboot/t1700sff_bmrc_12mb/target.cfg +++ b/config/coreboot/t1700sff_bmrc_12mb/target.cfg @@ -6,7 +6,7 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" -grubtree="xhci" +grubtree="xhci_nvme" vcfg="t1700" -build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/coreboot/t440plibremrc_12mb/target.cfg b/config/coreboot/t440plibremrc_12mb/target.cfg index 7c26ae5e..47e228b7 100644 --- a/config/coreboot/t440plibremrc_12mb/target.cfg +++ b/config/coreboot/t440plibremrc_12mb/target.cfg @@ -6,7 +6,7 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" -grubtree="xhci" +grubtree="xhci_nvme" vcfg="haswell" -build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg b/config/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg index 7c26ae5e..47e228b7 100644 --- a/config/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg +++ b/config/coreboot/t440plibremrc_4mcbfs_12mb/target.cfg @@ -6,7 +6,7 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" -grubtree="xhci" +grubtree="xhci_nvme" vcfg="haswell" -build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/coreboot/t480_vfsp_16mb/target.cfg b/config/coreboot/t480_vfsp_16mb/target.cfg index 6ba1e1cd..1cc6d167 100644 --- a/config/coreboot/t480_vfsp_16mb/target.cfg +++ b/config/coreboot/t480_vfsp_16mb/target.cfg @@ -6,7 +6,7 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" -grubtree="xhci" +grubtree="xhci_nvme" vcfg="t480" -build_depend="seabios/default grub/xhci memtest86plus" +build_depend="seabios/default grub/xhci_nvme memtest86plus" IFD_platform="sklkbl" diff --git a/config/coreboot/t480s_vfsp_16mb/target.cfg b/config/coreboot/t480s_vfsp_16mb/target.cfg index 6dd3a6f8..a8fffe9a 100644 --- a/config/coreboot/t480s_vfsp_16mb/target.cfg +++ b/config/coreboot/t480s_vfsp_16mb/target.cfg @@ -6,7 +6,7 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" -grubtree="xhci" +grubtree="xhci_nvme" vcfg="t480s" -build_depend="seabios/default grub/xhci memtest86plus" +build_depend="seabios/default grub/xhci_nvme memtest86plus" IFD_platform="sklkbl" diff --git a/config/coreboot/w541_12mb/target.cfg b/config/coreboot/w541_12mb/target.cfg index 7c26ae5e..47e228b7 100644 --- a/config/coreboot/w541_12mb/target.cfg +++ b/config/coreboot/w541_12mb/target.cfg @@ -6,7 +6,7 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" -grubtree="xhci" +grubtree="xhci_nvme" vcfg="haswell" -build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot" payload_uboot="amd64" diff --git a/config/coreboot/x2e_n150/target.cfg b/config/coreboot/x2e_n150/target.cfg index 2d576527..f2dc73e0 100644 --- a/config/coreboot/x2e_n150/target.cfg +++ b/config/coreboot/x2e_n150/target.cfg @@ -6,8 +6,8 @@ payload_seabios="y" payload_grub="y" payload_memtest="y" grub_scan_disk="nvme ahci" -grubtree="xhci" +grubtree="xhci_nvme" vcfg="x2e_n150" -build_depend="seabios/default grub/xhci memtest86plus u-boot/amd64coreboot" +build_depend="seabios/default grub/xhci_nvme memtest86plus u-boot/amd64coreboot" IFD_platform="adl" payload_uboot="amd64" diff --git a/config/data/grub/module/xhci b/config/data/grub/module/xhci_nvme similarity index 100% rename from config/data/grub/module/xhci rename to config/data/grub/module/xhci_nvme diff --git a/config/grub/xhci/config/payload b/config/grub/xhci_nvme/config/payload similarity index 100% rename from config/grub/xhci/config/payload rename to config/grub/xhci_nvme/config/payload diff --git a/config/grub/xhci/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch b/config/grub/xhci_nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch similarity index 100% rename from config/grub/xhci/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch rename to config/grub/xhci_nvme/patches/0001-mitigate-grub-s-missing-characters-for-borders-arrow.patch diff --git a/config/grub/xhci/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch b/config/grub/xhci_nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch similarity index 100% rename from config/grub/xhci/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch rename to config/grub/xhci_nvme/patches/0002-say-the-name-libreboot-in-the-grub-menu.patch diff --git a/config/grub/xhci/patches/0003-Add-CC0-license.patch b/config/grub/xhci_nvme/patches/0003-Add-CC0-license.patch similarity index 100% rename from config/grub/xhci/patches/0003-Add-CC0-license.patch rename to config/grub/xhci_nvme/patches/0003-Add-CC0-license.patch diff --git a/config/grub/xhci/patches/0004-Define-GRUB_UINT32_MAX.patch b/config/grub/xhci_nvme/patches/0004-Define-GRUB_UINT32_MAX.patch similarity index 100% rename from config/grub/xhci/patches/0004-Define-GRUB_UINT32_MAX.patch rename to config/grub/xhci_nvme/patches/0004-Define-GRUB_UINT32_MAX.patch diff --git a/config/grub/xhci/patches/0005-Add-Argon2-algorithm.patch b/config/grub/xhci_nvme/patches/0005-Add-Argon2-algorithm.patch similarity index 100% rename from config/grub/xhci/patches/0005-Add-Argon2-algorithm.patch rename to config/grub/xhci_nvme/patches/0005-Add-Argon2-algorithm.patch diff --git a/config/grub/xhci/patches/0006-Error-on-missing-Argon2id-parameters.patch b/config/grub/xhci_nvme/patches/0006-Error-on-missing-Argon2id-parameters.patch similarity index 100% rename from config/grub/xhci/patches/0006-Error-on-missing-Argon2id-parameters.patch rename to config/grub/xhci_nvme/patches/0006-Error-on-missing-Argon2id-parameters.patch diff --git a/config/grub/xhci/patches/0007-Compile-with-Argon2id-support.patch b/config/grub/xhci_nvme/patches/0007-Compile-with-Argon2id-support.patch similarity index 100% rename from config/grub/xhci/patches/0007-Compile-with-Argon2id-support.patch rename to config/grub/xhci_nvme/patches/0007-Compile-with-Argon2id-support.patch diff --git a/config/grub/xhci/patches/0008-Make-grub-install-work-with-Argon2.patch b/config/grub/xhci_nvme/patches/0008-Make-grub-install-work-with-Argon2.patch similarity index 100% rename from config/grub/xhci/patches/0008-Make-grub-install-work-with-Argon2.patch rename to config/grub/xhci_nvme/patches/0008-Make-grub-install-work-with-Argon2.patch diff --git a/config/grub/xhci/patches/0009-at_keyboard-coreboot-force-scancodes2-translate.patch b/config/grub/xhci_nvme/patches/0009-at_keyboard-coreboot-force-scancodes2-translate.patch similarity index 100% rename from config/grub/xhci/patches/0009-at_keyboard-coreboot-force-scancodes2-translate.patch rename to config/grub/xhci_nvme/patches/0009-at_keyboard-coreboot-force-scancodes2-translate.patch diff --git a/config/grub/xhci/patches/0010-keylayouts-don-t-print-Unknown-key-message.patch b/config/grub/xhci_nvme/patches/0010-keylayouts-don-t-print-Unknown-key-message.patch similarity index 100% rename from config/grub/xhci/patches/0010-keylayouts-don-t-print-Unknown-key-message.patch rename to config/grub/xhci_nvme/patches/0010-keylayouts-don-t-print-Unknown-key-message.patch diff --git a/config/grub/xhci/patches/0011-don-t-print-missing-prefix-errors-on-the-screen.patch b/config/grub/xhci_nvme/patches/0011-don-t-print-missing-prefix-errors-on-the-screen.patch similarity index 100% rename from config/grub/xhci/patches/0011-don-t-print-missing-prefix-errors-on-the-screen.patch rename to config/grub/xhci_nvme/patches/0011-don-t-print-missing-prefix-errors-on-the-screen.patch diff --git a/config/grub/xhci/patches/0012-don-t-print-error-if-module-not-found.patch b/config/grub/xhci_nvme/patches/0012-don-t-print-error-if-module-not-found.patch similarity index 100% rename from config/grub/xhci/patches/0012-don-t-print-error-if-module-not-found.patch rename to config/grub/xhci_nvme/patches/0012-don-t-print-error-if-module-not-found.patch diff --git a/config/grub/xhci/patches/0013-don-t-print-empty-error-messages.patch b/config/grub/xhci_nvme/patches/0013-don-t-print-empty-error-messages.patch similarity index 100% rename from config/grub/xhci/patches/0013-don-t-print-empty-error-messages.patch rename to config/grub/xhci_nvme/patches/0013-don-t-print-empty-error-messages.patch diff --git a/config/grub/xhci/patches/0014-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch b/config/grub/xhci_nvme/patches/0014-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch similarity index 100% rename from config/grub/xhci/patches/0014-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch rename to config/grub/xhci_nvme/patches/0014-grub-core-bus-usb-Parse-SuperSpeed-companion-descrip.patch diff --git a/config/grub/xhci/patches/0015-usb-Add-enum-for-xHCI.patch b/config/grub/xhci_nvme/patches/0015-usb-Add-enum-for-xHCI.patch similarity index 100% rename from config/grub/xhci/patches/0015-usb-Add-enum-for-xHCI.patch rename to config/grub/xhci_nvme/patches/0015-usb-Add-enum-for-xHCI.patch diff --git a/config/grub/xhci/patches/0016-usbtrans-Set-default-maximum-packet-size.patch b/config/grub/xhci_nvme/patches/0016-usbtrans-Set-default-maximum-packet-size.patch similarity index 100% rename from config/grub/xhci/patches/0016-usbtrans-Set-default-maximum-packet-size.patch rename to config/grub/xhci_nvme/patches/0016-usbtrans-Set-default-maximum-packet-size.patch diff --git a/config/grub/xhci/patches/0017-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch b/config/grub/xhci_nvme/patches/0017-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch similarity index 100% rename from config/grub/xhci/patches/0017-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch rename to config/grub/xhci_nvme/patches/0017-grub-core-bus-usb-Add-function-pointer-for-attach-de.patch diff --git a/config/grub/xhci/patches/0018-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch b/config/grub/xhci_nvme/patches/0018-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch similarity index 100% rename from config/grub/xhci/patches/0018-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch rename to config/grub/xhci_nvme/patches/0018-grub-core-bus-usb-usbhub-Add-new-private-fields-for-.patch diff --git a/config/grub/xhci/patches/0019-grub-core-bus-usb-Add-xhci-support.patch b/config/grub/xhci_nvme/patches/0019-grub-core-bus-usb-Add-xhci-support.patch similarity index 100% rename from config/grub/xhci/patches/0019-grub-core-bus-usb-Add-xhci-support.patch rename to config/grub/xhci_nvme/patches/0019-grub-core-bus-usb-Add-xhci-support.patch diff --git a/config/grub/xhci/patches/0020-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch b/config/grub/xhci_nvme/patches/0020-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch similarity index 100% rename from config/grub/xhci/patches/0020-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch rename to config/grub/xhci_nvme/patches/0020-grub-core-bus-usb-usbhub-Add-xHCI-non-root-hub-suppo.patch diff --git a/config/grub/xhci/patches/0021-xHCI-also-accept-SBRN-0x31-and-0x32.patch b/config/grub/xhci_nvme/patches/0021-xHCI-also-accept-SBRN-0x31-and-0x32.patch similarity index 100% rename from config/grub/xhci/patches/0021-xHCI-also-accept-SBRN-0x31-and-0x32.patch rename to config/grub/xhci_nvme/patches/0021-xHCI-also-accept-SBRN-0x31-and-0x32.patch diff --git a/config/grub/xhci/patches/0022-xhci-fix-port-indexing.patch b/config/grub/xhci_nvme/patches/0022-xhci-fix-port-indexing.patch similarity index 100% rename from config/grub/xhci/patches/0022-xhci-fix-port-indexing.patch rename to config/grub/xhci_nvme/patches/0022-xhci-fix-port-indexing.patch diff --git a/config/grub/xhci/patches/0023-xhci-configure-TT-for-non-root-hubs.patch b/config/grub/xhci_nvme/patches/0023-xhci-configure-TT-for-non-root-hubs.patch similarity index 100% rename from config/grub/xhci/patches/0023-xhci-configure-TT-for-non-root-hubs.patch rename to config/grub/xhci_nvme/patches/0023-xhci-configure-TT-for-non-root-hubs.patch diff --git a/config/grub/xhci/patches/0024-Fix-compilation-on-x86_64.patch b/config/grub/xhci_nvme/patches/0024-Fix-compilation-on-x86_64.patch similarity index 100% rename from config/grub/xhci/patches/0024-Fix-compilation-on-x86_64.patch rename to config/grub/xhci_nvme/patches/0024-Fix-compilation-on-x86_64.patch diff --git a/config/grub/xhci/patches/0025-Add-native-NVMe-driver-based-on-SeaBIOS.patch b/config/grub/xhci_nvme/patches/0025-Add-native-NVMe-driver-based-on-SeaBIOS.patch similarity index 100% rename from config/grub/xhci/patches/0025-Add-native-NVMe-driver-based-on-SeaBIOS.patch rename to config/grub/xhci_nvme/patches/0025-Add-native-NVMe-driver-based-on-SeaBIOS.patch diff --git a/config/grub/xhci/patches/0026-kern-coreboot-mmap-Map-to-reserved.patch b/config/grub/xhci_nvme/patches/0026-kern-coreboot-mmap-Map-to-reserved.patch similarity index 100% rename from config/grub/xhci/patches/0026-kern-coreboot-mmap-Map-to-reserved.patch rename to config/grub/xhci_nvme/patches/0026-kern-coreboot-mmap-Map-to-reserved.patch diff --git a/config/grub/xhci/target.cfg b/config/grub/xhci_nvme/target.cfg similarity index 100% rename from config/grub/xhci/target.cfg rename to config/grub/xhci_nvme/target.cfg diff --git a/config/submodule/grub/xhci/gnulib/module.cfg b/config/submodule/grub/xhci_nvme/gnulib/module.cfg similarity index 100% rename from config/submodule/grub/xhci/gnulib/module.cfg rename to config/submodule/grub/xhci_nvme/gnulib/module.cfg diff --git a/config/submodule/grub/xhci/module.list b/config/submodule/grub/xhci_nvme/module.list similarity index 100% rename from config/submodule/grub/xhci/module.list rename to config/submodule/grub/xhci_nvme/module.list