nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: linux-libre: NVME core support is now built-in. 

* gnu/system/linux-initrd.scm (base-initrd)[linux-modules]: Remove "nvme".
* gnu/packages/aux-files/linux-libre/4.1-i686.conf,
gnu/packages/aux-files/linux-libre/4.1-x86_64.conf,
gnu/packages/aux-files/linux-libre/4.4-i686.conf,
gnu/packages/aux-files/linux-libre/4.4-x86_64.conf: Set CONFIG_BLK_DEV_NVME=y.
* gnu/packages/aux-files/linux-libre/4.9-i686.conf,
gnu/packages/aux-files/linux-libre/4.9-x86_64.conf,
gnu/packages/aux-files/linux-libre/4.14-arm.conf,
gnu/packages/aux-files/linux-libre/4.14-i686.conf,
gnu/packages/aux-files/linux-libre/4.14-x86_64.conf: Set CONFIG_BLK_DEV_NVME=y
and CONFIG_NVME_CORE=y.
This commit is contained in:
Mark H Weaver 2018-01-29 05:54:54 -05:00
parent 33c88fcb25
commit e0e10e2f58
No known key found for this signature in database
GPG Key ID: 7CEF29847562C516
10 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/packages/aux-files/linux-libre/4.1-i686.conf
View File

@ -1954,7 +1954,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_DRBD=m
# CONFIG_DRBD_FAULT_INJECTION is not set # CONFIG_DRBD_FAULT_INJECTION is not set
CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_NVME=y
CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_SX8=m
CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM=y

2
gnu/packages/aux-files/linux-libre/4.1-x86_64.conf
View File

@ -1919,7 +1919,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
CONFIG_BLK_DEV_DRBD=m CONFIG_BLK_DEV_DRBD=m
# CONFIG_DRBD_FAULT_INJECTION is not set # CONFIG_DRBD_FAULT_INJECTION is not set
CONFIG_BLK_DEV_NBD=m CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_NVME=y
CONFIG_BLK_DEV_SKD=m CONFIG_BLK_DEV_SKD=m
CONFIG_BLK_DEV_OSD=m CONFIG_BLK_DEV_OSD=m
CONFIG_BLK_DEV_SX8=m CONFIG_BLK_DEV_SX8=m

4
gnu/packages/aux-files/linux-libre/4.14-arm.conf
View File

@ -2051,8 +2051,8 @@ CONFIG_VIRTIO_BLK=m
# CONFIG_VIRTIO_BLK_SCSI is not set # CONFIG_VIRTIO_BLK_SCSI is not set
CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RBD=m
# CONFIG_BLK_DEV_RSXX is not set # CONFIG_BLK_DEV_RSXX is not set
CONFIG_NVME_CORE=m CONFIG_NVME_CORE=y
CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_NVME=y
CONFIG_NVME_FABRICS=m CONFIG_NVME_FABRICS=m
CONFIG_NVME_RDMA=m CONFIG_NVME_RDMA=m
# CONFIG_NVME_FC is not set # CONFIG_NVME_FC is not set

4
gnu/packages/aux-files/linux-libre/4.14-i686.conf
View File

@ -2156,8 +2156,8 @@ CONFIG_VIRTIO_BLK=y
# CONFIG_VIRTIO_BLK_SCSI is not set # CONFIG_VIRTIO_BLK_SCSI is not set
CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RBD=m
CONFIG_BLK_DEV_RSXX=m CONFIG_BLK_DEV_RSXX=m
CONFIG_NVME_CORE=m CONFIG_NVME_CORE=y
CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_NVME=y
CONFIG_NVME_FABRICS=m CONFIG_NVME_FABRICS=m
CONFIG_NVME_RDMA=m CONFIG_NVME_RDMA=m
CONFIG_NVME_FC=m CONFIG_NVME_FC=m

4
gnu/packages/aux-files/linux-libre/4.14-x86_64.conf
View File

@ -2140,8 +2140,8 @@ CONFIG_VIRTIO_BLK=y
# CONFIG_VIRTIO_BLK_SCSI is not set # CONFIG_VIRTIO_BLK_SCSI is not set
CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RBD=m
CONFIG_BLK_DEV_RSXX=m CONFIG_BLK_DEV_RSXX=m
CONFIG_NVME_CORE=m CONFIG_NVME_CORE=y
CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_NVME=y
CONFIG_NVME_FABRICS=m CONFIG_NVME_FABRICS=m
CONFIG_NVME_RDMA=m CONFIG_NVME_RDMA=m
CONFIG_NVME_FC=m CONFIG_NVME_FC=m

2
gnu/packages/aux-files/linux-libre/4.4-i686.conf
View File

@ -2016,7 +2016,7 @@ CONFIG_VIRTIO_BLK=y
# CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RBD=m
CONFIG_BLK_DEV_RSXX=m CONFIG_BLK_DEV_RSXX=m
CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_NVME=y
# #
# Misc devices # Misc devices

2
gnu/packages/aux-files/linux-libre/4.4-x86_64.conf
View File

@ -1980,7 +1980,7 @@ CONFIG_VIRTIO_BLK=y
# CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RBD=m
CONFIG_BLK_DEV_RSXX=m CONFIG_BLK_DEV_RSXX=m
CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_NVME=y
# #
# Misc devices # Misc devices

4
gnu/packages/aux-files/linux-libre/4.9-i686.conf
View File

@ -2105,8 +2105,8 @@ CONFIG_VIRTIO_BLK=y
# CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RBD=m
CONFIG_BLK_DEV_RSXX=m CONFIG_BLK_DEV_RSXX=m
CONFIG_NVME_CORE=m CONFIG_NVME_CORE=y
CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_NVME=y
# CONFIG_BLK_DEV_NVME_SCSI is not set # CONFIG_BLK_DEV_NVME_SCSI is not set
CONFIG_NVME_FABRICS=m CONFIG_NVME_FABRICS=m
CONFIG_NVME_RDMA=m CONFIG_NVME_RDMA=m

4
gnu/packages/aux-files/linux-libre/4.9-x86_64.conf
View File

@ -2081,8 +2081,8 @@ CONFIG_VIRTIO_BLK=y
# CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_HD is not set
CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RBD=m
CONFIG_BLK_DEV_RSXX=m CONFIG_BLK_DEV_RSXX=m
CONFIG_NVME_CORE=m CONFIG_NVME_CORE=y
CONFIG_BLK_DEV_NVME=m CONFIG_BLK_DEV_NVME=y
# CONFIG_BLK_DEV_NVME_SCSI is not set # CONFIG_BLK_DEV_NVME_SCSI is not set
CONFIG_NVME_FABRICS=m CONFIG_NVME_FABRICS=m
CONFIG_NVME_RDMA=m CONFIG_NVME_RDMA=m

1
gnu/system/linux-initrd.scm
View File

@ -290,7 +290,6 @@ loaded at boot time in the order in which they appear."
"usb-storage" "uas" ;for the installation image etc. "usb-storage" "uas" ;for the installation image etc.
"usbhid" "hid-generic" "hid-apple" ;keyboards during early boot "usbhid" "hid-generic" "hid-apple" ;keyboards during early boot
"dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions "dm-crypt" "xts" "serpent_generic" "wp512" ;for encrypted root partitions
"nvme" ;for new SSD NVMe devices
"nls_iso8859-1" ;for `mkfs.fat`, et.al "nls_iso8859-1" ;for `mkfs.fat`, et.al
,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system)) ,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system))
'("pata_acpi" "pata_atiixp" ;for ATA controllers '("pata_acpi" "pata_atiixp" ;for ATA controllers