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@gentoo.org>

1 files changed, 2 insertions, 39 deletions

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)