commit: c5a5f233b727381917b0f22c5d7ab3863bfe2e33
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 22 18:25:50 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 19:59:16 2019 +0000
URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=c5a5f233
Make arch/*/modules_load only extending defaults/modules_load
Since commit fe488f95270 we are sourcing defaults/modules_load first
and arch-specific file later.
This commit will cleanup duplicated entries in modules_load files
and make it clear that arch/*/modules_load is only extending
defaults/modules_load.
In addition, module order was adjusted to speed up root detection.
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
TODO | 2 --
arch/alpha/modules_load | 41 ++---------------------------------------
arch/arm/modules_load | 41 ++---------------------------------------
arch/ia64/modules_load | 41 ++---------------------------------------
arch/mips/modules_load | 40 +++-------------------------------------
arch/parisc/modules_load | 41 ++---------------------------------------
arch/parisc64/modules_load | 40 ++--------------------------------------
arch/ppc/modules_load | 41 ++---------------------------------------
arch/ppc64/modules_load | 40 +++-------------------------------------
arch/ppc64le/modules_load | 40 +++-------------------------------------
arch/s390/modules_load | 41 ++---------------------------------------
arch/sparc/modules_load | 41 ++---------------------------------------
arch/sparc64/modules_load | 40 +++-------------------------------------
arch/um/modules_load | 41 ++---------------------------------------
arch/x86/modules_load | 41 +++--------------------------------------
arch/x86_64/modules_load | 40 +++-------------------------------------
defaults/modules_load | 22 +++++++++++-----------
17 files changed, 47 insertions(+), 586 deletions(-)
diff --git a/TODO b/TODO
index 00e1208..4838650 100644
--- a/TODO
+++ b/TODO
@@ -3,12 +3,10 @@
- Need configs for other currently-unsupported arches
- Make configs stackable
- Move modules_load to /etc/genkernel
-- Refactor modules_load to not ship 12 identical arch configs
- Move main config to /etc/genkernel
- Refactor code to be more simple and extendable
- Fix all TODO sections in the code
- Add "include" options to genkernel.conf
-- Allow for architecture-specific or module-specific files to override defaults
- Create hooks for various points in the build/install phases for modules
- Add new boot support for the following:
- Hardware
diff --git a/arch/alpha/modules_load b/arch/alpha/modules_load
index 0ee8173..5fa717b 100644
--- a/arch/alpha/modules_load
+++ b/arch/alpha/modules_load
@@ -1,39 +1,2 @@
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="e1000 tg3 broadcom bcm_phy_lib virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
-
-# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic
aes_generic xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+# alpha module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
diff --git a/arch/arm/modules_load b/arch/arm/modules_load
index 0ee8173..c5f3c24 100644
--- a/arch/arm/modules_load
+++ b/arch/arm/modules_load
@@ -1,39 +1,2 @@
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="e1000 tg3 broadcom bcm_phy_lib virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
-
-# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic
aes_generic xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+# arm module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
diff --git a/arch/ia64/modules_load b/arch/ia64/modules_load
index b9ccaf2..35d1bf0 100644
--- a/arch/ia64/modules_load
+++ b/arch/ia64/modules_load
@@ -1,39 +1,2 @@
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_acpi sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="e1000 tg3 broadcom bcm_phy_lib virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
-
-# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic
aes_generic xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+# ia64 module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
diff --git a/arch/mips/modules_load b/arch/mips/modules_load
index cbc6774..ee13325 100644
--- a/arch/mips/modules_load
+++ b/arch/mips/modules_load
@@ -1,39 +1,5 @@
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="e1000 tg3 broadcom bcm_phy_lib virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
+# mips module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic
crc32-mips aes_generic xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+MODULES_CRYPTO+=" crc32-mips"
diff --git a/arch/parisc/modules_load b/arch/parisc/modules_load
index 0ee8173..24b0e2a 100644
--- a/arch/parisc/modules_load
+++ b/arch/parisc/modules_load
@@ -1,39 +1,2 @@
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="e1000 tg3 broadcom bcm_phy_lib virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
-
-# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic
aes_generic xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+# parisc module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
diff --git a/arch/parisc64/modules_load b/arch/parisc64/modules_load
index 46c8d16..9c9f66f 100644
--- a/arch/parisc64/modules_load
+++ b/arch/parisc64/modules_load
@@ -1,38 +1,2 @@
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-
-# Hardware (Network)
-MODULES_NET="e1000 tg3 broadcom bcm_phy_lib virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
-
-# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic
aes_generic xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+# parisc64 module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
diff --git a/arch/ppc/modules_load b/arch/ppc/modules_load
index 0ee8173..702029d 100644
--- a/arch/ppc/modules_load
+++ b/arch/ppc/modules_load
@@ -1,39 +1,2 @@
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="e1000 tg3 broadcom bcm_phy_lib virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
-
-# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic
aes_generic xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+# ppc module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
diff --git a/arch/ppc64/modules_load b/arch/ppc64/modules_load
index 024de41..f5f3ed7 100644
--- a/arch/ppc64/modules_load
+++ b/arch/ppc64/modules_load
@@ -1,39 +1,5 @@
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="e1000 tg3 broadcom bcm_phy_lib virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
+# ppc64 module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32c-vpmsum crc32
crc32_generic aes_generic xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+MODULES_CRYPTO+=" crc32c-vpmsum"
diff --git a/arch/ppc64le/modules_load b/arch/ppc64le/modules_load
index 024de41..2b8de31 100644
--- a/arch/ppc64le/modules_load
+++ b/arch/ppc64le/modules_load
@@ -1,39 +1,5 @@
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="e1000 tg3 broadcom bcm_phy_lib virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
+# ppc64le module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32c-vpmsum crc32
crc32_generic aes_generic xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+MODULES_CRYPTO+=" crc32c-vpmsum"
diff --git a/arch/s390/modules_load b/arch/s390/modules_load
index 0ee8173..5870292 100644
--- a/arch/s390/modules_load
+++ b/arch/s390/modules_load
@@ -1,39 +1,2 @@
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="e1000 tg3 broadcom bcm_phy_lib virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
-
-# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic
aes_generic xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+# s390 module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
diff --git a/arch/sparc/modules_load b/arch/sparc/modules_load
index 0ee8173..91ded35 100644
--- a/arch/sparc/modules_load
+++ b/arch/sparc/modules_load
@@ -1,39 +1,2 @@
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="e1000 tg3 broadcom bcm_phy_lib virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
-
-# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic
aes_generic xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+# sparc module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
diff --git a/arch/sparc64/modules_load b/arch/sparc64/modules_load
index 6c7777a..9a1585f 100644
--- a/arch/sparc64/modules_load
+++ b/arch/sparc64/modules_load
@@ -1,39 +1,5 @@
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="e1000 tg3 broadcom bcm_phy_lib virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
+# sparc64 module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32c-sparc64 crc32
crc32_generic aes_generic xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+MODULES_CRYPTO+=" crc32c-sparc64"
diff --git a/arch/um/modules_load b/arch/um/modules_load
index 1ed0e41..988ed7a 100644
--- a/arch/um/modules_load
+++ b/arch/um/modules_load
@@ -1,39 +1,2 @@
-# Module groups for genkernel initrd/initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="e1000 tg3 broadcom bcm_phy_lib virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
-
-# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32 crc32_generic
aes_generic xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+# um module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
diff --git a/arch/x86/modules_load b/arch/x86/modules_load
index a545a81..9d9431d 100644
--- a/arch/x86/modules_load
+++ b/arch/x86/modules_load
@@ -1,40 +1,5 @@
-
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_acpi sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="8139cp 8139too atl1c bnx2 e1000 igb pcnet32 r8169 sky2 tg3
broadcom bcm_phy_lib virtio_net vmxnet3 virtio_net"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
+# x86 module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32c-intel crc32
crc32_generic crc32-pclmul aes_generic aes_586 aesni-intel xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+MODULES_CRYPTO+=" crc32c-intel crc32-pclmul aes_586 aesni-intel"
diff --git a/arch/x86_64/modules_load b/arch/x86_64/modules_load
index 015b5b1..3f6a19c 100644
--- a/arch/x86_64/modules_load
+++ b/arch/x86_64/modules_load
@@ -1,39 +1,5 @@
-# Module groups for genkernel initramfs auto-loading
-
-# RAID
-MODULES_ATARAID="ataraid pdcraid hptraid"
-MODULES_DMRAID="dm-mod dm-mirror dm-crypt"
-MODULES_MDADM="md-mod dm-mod dm-snapshot dm-mirror dm-bbr dm-raid dm-crypt
raid0 raid1 raid456 raid5 raid6 raid10 linear multipath async_raid6_recov
async_pq libcrc32c raid6_pq async_tx async_memcpy async_xor"
-MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache dm-cache-smq dm-crypt
dm-delay dm-era dm-flakey dm-integrity dm-log dm-log-userspace dm-log-writes
dm-mirror dm-raid dm-region-hash dm-snapshot dm-switch dm-thin-pool dm-verity
dm-zero dm-persistent-data ${MODULES_MDADM}"
-MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
-
-# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
-MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_acpi sdhci_pci"
-
-# Hardware (Network)
-MODULES_NET="atl1c bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3 cxgb4 e1000
e1000e igb ixgb ixgbe macvlan pcnet32 r8169 samsung-sxgbe sky2 tg3 tulip
virtio_net vmxnet3 vxge vxlan"
-
-# iSCSI support
-MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
-
-# Hardware (Pluggable)
-MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
-MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
-
-# Filesystems
-MODULES_FS="ext2 ext3 ext4 bcache btrfs reiserfs jfs nfs xfs zfs f2fs fuse
loop squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
+# x86_64 module groups for genkernel initramfs auto-loading
+# (extending defaults/modules_load)
# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c crc32c_generic crc32c-intel crc32
crc32_generic crc32-pclmul aes_generic aes-x86_64 aesni-intel xts"
-
-# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
-
-# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+MODULES_CRYPTO+=" crc32c-intel crc32-pclmul aes-x86_64 aesni-intel"
diff --git a/defaults/modules_load b/defaults/modules_load
index b4caf50..644cf21 100644
--- a/defaults/modules_load
+++ b/defaults/modules_load
@@ -1,4 +1,4 @@
-# Module groups for genkernel initramfs auto-loading
+# Default module groups for genkernel initramfs auto-loading
# RAID
MODULES_ATARAID="ataraid pdcraid hptraid"
@@ -8,15 +8,15 @@ MODULES_LVM="dm-mod dm-bio-prison dm-bufio dm-cache
dm-cache-smq dm-crypt dm-del
MODULES_MULTIPATH="dm-mod dm-multipath dm-round-robin dm-rdac dm-queue-length
dm-service-time"
# Hardware (IDE/SCSI/SATA/NVMe)
-MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop"
-MODULES_PATA="pata_mpiix pata_pdc2027x pata_radisys pata_sil680 pata_rz1000
pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3 pata_hpt3x2n
pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress pata_platform
pata_serverworks pata_legacy pata_ns87410 pata_ns87415 pata_pcmcia pata_isapnp
pata_it8213 pata_ali pata_amd pata_opti pata_atiixp pata_triflex
pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis pata_hpt3x2n
pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530 pata_cs5535
pata_sl82c105 libata"
-MODULES_SATA="sata_promise sata_sil sata_sil24 sata_svw sata_via sata_nv
sata_sx4 sata_sis sata_uli sata_vsc sata_qstor ahci libata ata_piix sata_mv
sata_inic162x pdc_adma"
-MODULES_SCSI="sd_mod sg sr_mod aic79xx aic7xxx aic7xxx_old arcmsr BusLogic
ncr53c8xx NCR53c406a initio advansys aha1740 aha1542 aha152x dtc fdomain gdth
pas16 pci2220i pci2000 psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate
t128 u14-34f ultrastor wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710
sym53c416 dc395x atp870u mptbase mptscsih mptspi mptfc mptsas 3w-sas 3w-xxxx
3w-9xxx cpqarray cciss hpsa DAC960 sx8 aacraid megaraid megaraid_mbox
megaraid_mm megaraid_sas qla2xxx lpfc scsi_transport_fc aic94xx mpt2sas mpt3sas
virtio_scsi virtio_blk"
+MODULES_NVME="nvme-core nvme nvme-fabrics nvme-rdma nvme-loop nvme-fc"
+MODULES_PATA="libata pata_mpiix pata_pdc2027x pata_radisys pata_sil680
pata_rz1000 pata_efar pata_cmd64x pata_hpt366 pata_hpt37x pata_hpt3x3
pata_hpt3x2n pata_optidma pata_it821x pata_artop pata_oldpiix pata_cypress
pata_platform pata_serverworks pata_legacy pata_ns87410 pata_ns87415
pata_pcmcia pata_isapnp pata_it8213 pata_ali pata_amd pata_opti pata_atiixp
pata_triflex pata_pdc202xx_old pata_sc1200 pata_qdi pata_netcell pata_sis
pata_hpt3x2n pata_marvell pata_jmicron pata_via pata_cs5520 pata_cs5530
pata_cs5535 pata_sl82c105"
+MODULES_SATA="ahci libata ata_piix sata_promise sata_sil sata_sil24 sata_svw
sata_via sata_nv sata_sx4 sata_sis sata_uli sata_vsc sata_qstor sata_mv
sata_inic162x pdc_adma"
+MODULES_SCSI="mptspi megaraid_sas megaraid mpt2sas mpt3sas sd_mod sg sr_mod
aic79xx aic7xxx aic7xxx_old arcmsr BusLogic ncr53c8xx NCR53c406a initio
advansys aha1740 aha1542 aha152x dtc fdomain gdth pas16 pci2220i pci2000
psi240i qlogicfas qlogicfc qlogicisp qlogicpti seagate t128 u14-34f ultrastor
wd7000 sym53c8xx dmx3191d imm in2000 ips qla1280 sim710 sym53c416 dc395x
atp870u mptbase mptscsih mptfc mptsas 3w-sas 3w-xxxx 3w-9xxx cpqarray cciss
hpsa DAC960 sx8 aacraid megaraid_mbox megaraid_mm qla2xxx lpfc
scsi_transport_fc aic94xx"
MODULES_WAITSCAN="scsi_wait_scan"
-MODULES_BLOCK="sdhci_pci"
+MODULES_BLOCK="sdhci_acpi sdhci_pci"
# Hardware (Network)
-MODULES_NET="e1000 tg3 virtio_net"
+MODULES_NET="8139cp 8139too atl1c bcm_phy_lib bnx2 bonding broadcom cxgb cxgb3
cxgb4 e1000 e1000e hv_netvsc igb ixgb ixgbe macvlan pcnet32 r8169 samsung-sxgbe
sky2 tg3 tulip virtio_net vmxnet3 vxge vxlan"
# iSCSI support
MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
@@ -24,16 +24,16 @@ MODULES_ISCSI="scsi_transport_iscsi libiscsi iscsi_tcp"
# Hardware (Pluggable)
MODULES_FIREWIRE="ieee1394 ohci1394 sbp2"
MODULES_PCMCIA="pcmcia pcmcia_core yenta_socket pd6729 i82092 i82365 tcic ds
ide-cs firmware_class"
-MODULES_USB="ehci-pci ehci-hcd uhci usb-ohci hid usb-storage uas uhci-hcd
ohci-hcd xhci-hcd xhci-pci xhci-plat usbhid hid-generic sl811-hcd hid-a4tech
hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy hid-ezkey
hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
+MODULES_USB="ehci-pci ehci-hcd xhci-hcd xhci-pci xhci-plat xhci-plat-hcd uhci
usb-ohci hid usb-storage uas uhci-hcd ohci-hcd usbhid hid-generic sl811-hcd
hid-a4tech hid-apple hid-belkin hid-cherry hid-chicony hid-cypress hid-dummy
hid-ezkey hid-gyration hid-logitech hid-logitech-dj hid-microsoft hid-monterey
hid-petalynx hid-pl hid-samsung hid-sony hid-sunplus"
# Filesystems
MODULES_FS="ext2 ext3 ext4 btrfs reiserfs jfs nfs xfs zfs f2fs fuse loop
squashfs aufs overlay cramfs configfs fscrypto efivarfs msdos qemu_fw_cfg"
# Crypto
-MODULES_CRYPTO="sha256_generic cbc crc32c_generic crc32c-intel crc32_generic
aes_generic xts"
+MODULES_CRYPTO="sha256_generic cbc crc32 crc32c crc32c_generic crc32_generic
aes_generic xts"
# Hyper-V
-MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hv_netvsc
hid_hyperv hv_utils hyperv_fb hv_storvsc"
+MODULES_HYPERV="hv_utils hv_vmbus hv_balloon hyperv_keyboard hid_hyperv
hv_utils hyperv_fb hv_storvsc"
# Virtio
-MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto
virtio_net"
+MODULES_VIRTIO="virtio_scsi virtio_blk virtio_console virtio-rng virtio
virtio_balloon virtio_input virtio_ring virtio_pci virtio_mmio virtio_crypto"
