From d7efe2e3fee1afce4dd7e9725b4ebf896cc6d0b9 Mon Sep 17 00:00:00 2001 From: q66 Date: Fri, 29 May 2020 04:44:41 +0200 Subject: [PATCH] linux*: switch mac pata and sd block devices to modules again --- srcpkgs/linux4.14/files/ppc-dotconfig | 12 ++++++------ srcpkgs/linux4.19/files/ppc-dotconfig | 12 ++++++------ srcpkgs/linux4.4/files/ppc-dotconfig | 12 ++++++------ srcpkgs/linux4.9/files/ppc-dotconfig | 12 ++++++------ srcpkgs/linux5.4/files/ppc-dotconfig | 12 ++++++------ srcpkgs/linux5.6/files/ppc-dotconfig | 14 +++++++------- 6 files changed, 37 insertions(+), 37 deletions(-) diff --git a/srcpkgs/linux4.14/files/ppc-dotconfig b/srcpkgs/linux4.14/files/ppc-dotconfig index d8386a145a..33b4ce8e67 100644 --- a/srcpkgs/linux4.14/files/ppc-dotconfig +++ b/srcpkgs/linux4.14/files/ppc-dotconfig @@ -1770,7 +1770,7 @@ CONFIG_SCSI_MQ_DEFAULT=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m @@ -1910,7 +1910,7 @@ CONFIG_SCSI_OSD_INITIATOR=m CONFIG_SCSI_OSD_ULD=m CONFIG_SCSI_OSD_DPRINT_SENSE=1 # CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_ATA=y +CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y CONFIG_SATA_PMP=y @@ -1968,7 +1968,7 @@ CONFIG_PATA_HPT37X=m CONFIG_PATA_IT8213=m CONFIG_PATA_IT821X=m CONFIG_PATA_JMICRON=m -CONFIG_PATA_MACIO=y +CONFIG_PATA_MACIO=m CONFIG_PATA_MARVELL=m CONFIG_PATA_MPC52xx=m CONFIG_PATA_NETCELL=m @@ -1976,7 +1976,7 @@ CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87415=m # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OPTIDMA is not set -CONFIG_PATA_PDC2027X=y +CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC_OLD=m # CONFIG_PATA_RADISYS is not set CONFIG_PATA_RDC=m @@ -1987,7 +1987,7 @@ CONFIG_PATA_SIS=m CONFIG_PATA_TOSHIBA=m # CONFIG_PATA_TRIFLEX is not set CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=y +CONFIG_PATA_WINBOND=m # # PIO-only SFF controllers @@ -2003,7 +2003,7 @@ CONFIG_PATA_PCMCIA=m # # Generic fallback / legacy drivers # -CONFIG_ATA_GENERIC=y +CONFIG_ATA_GENERIC=m # CONFIG_PATA_LEGACY is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=m diff --git a/srcpkgs/linux4.19/files/ppc-dotconfig b/srcpkgs/linux4.19/files/ppc-dotconfig index 040daa95e9..8ca2ee9826 100644 --- a/srcpkgs/linux4.19/files/ppc-dotconfig +++ b/srcpkgs/linux4.19/files/ppc-dotconfig @@ -1791,7 +1791,7 @@ CONFIG_SCSI_MQ_DEFAULT=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m @@ -1925,7 +1925,7 @@ CONFIG_SCSI_OSD_INITIATOR=m CONFIG_SCSI_OSD_ULD=m CONFIG_SCSI_OSD_DPRINT_SENSE=1 # CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_ATA=y +CONFIG_ATA=m CONFIG_ATA_VERBOSE_ERROR=y CONFIG_SATA_PMP=y @@ -1983,7 +1983,7 @@ CONFIG_PATA_HPT37X=m CONFIG_PATA_IT8213=m CONFIG_PATA_IT821X=m CONFIG_PATA_JMICRON=m -CONFIG_PATA_MACIO=y +CONFIG_PATA_MACIO=m CONFIG_PATA_MARVELL=m CONFIG_PATA_MPC52xx=m CONFIG_PATA_NETCELL=m @@ -1991,7 +1991,7 @@ CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87415=m # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OPTIDMA is not set -CONFIG_PATA_PDC2027X=y +CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC_OLD=m # CONFIG_PATA_RADISYS is not set CONFIG_PATA_RDC=m @@ -2002,7 +2002,7 @@ CONFIG_PATA_SIS=m CONFIG_PATA_TOSHIBA=m # CONFIG_PATA_TRIFLEX is not set CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=y +CONFIG_PATA_WINBOND=m # # PIO-only SFF controllers @@ -2018,7 +2018,7 @@ CONFIG_PATA_PCMCIA=m # # Generic fallback / legacy drivers # -CONFIG_ATA_GENERIC=y +CONFIG_ATA_GENERIC=m # CONFIG_PATA_LEGACY is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=m diff --git a/srcpkgs/linux4.4/files/ppc-dotconfig b/srcpkgs/linux4.4/files/ppc-dotconfig index 475d8d2792..518e8734da 100644 --- a/srcpkgs/linux4.4/files/ppc-dotconfig +++ b/srcpkgs/linux4.4/files/ppc-dotconfig @@ -1649,7 +1649,7 @@ CONFIG_SCSI_MQ_DEFAULT=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m @@ -1784,7 +1784,7 @@ CONFIG_SCSI_OSD_INITIATOR=m CONFIG_SCSI_OSD_ULD=m CONFIG_SCSI_OSD_DPRINT_SENSE=1 # CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_ATA=y +CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y CONFIG_SATA_PMP=y @@ -1841,7 +1841,7 @@ CONFIG_PATA_HPT37X=m CONFIG_PATA_IT8213=m CONFIG_PATA_IT821X=m CONFIG_PATA_JMICRON=m -CONFIG_PATA_MACIO=y +CONFIG_PATA_MACIO=m CONFIG_PATA_MARVELL=m CONFIG_PATA_MPC52xx=m CONFIG_PATA_NETCELL=m @@ -1849,7 +1849,7 @@ CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87415=m # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OPTIDMA is not set -CONFIG_PATA_PDC2027X=y +CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC_OLD=m # CONFIG_PATA_RADISYS is not set CONFIG_PATA_RDC=m @@ -1860,7 +1860,7 @@ CONFIG_PATA_SIS=m CONFIG_PATA_TOSHIBA=m # CONFIG_PATA_TRIFLEX is not set CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=y +CONFIG_PATA_WINBOND=m # # PIO-only SFF controllers @@ -1876,7 +1876,7 @@ CONFIG_PATA_PCMCIA=m # # Generic fallback / legacy drivers # -CONFIG_ATA_GENERIC=y +CONFIG_ATA_GENERIC=m # CONFIG_PATA_LEGACY is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=m diff --git a/srcpkgs/linux4.9/files/ppc-dotconfig b/srcpkgs/linux4.9/files/ppc-dotconfig index 5a821e02e8..33dfeba24a 100644 --- a/srcpkgs/linux4.9/files/ppc-dotconfig +++ b/srcpkgs/linux4.9/files/ppc-dotconfig @@ -1725,7 +1725,7 @@ CONFIG_SCSI_MQ_DEFAULT=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_ST=m CONFIG_CHR_DEV_OSST=m CONFIG_BLK_DEV_SR=m @@ -1863,7 +1863,7 @@ CONFIG_SCSI_OSD_INITIATOR=m CONFIG_SCSI_OSD_ULD=m CONFIG_SCSI_OSD_DPRINT_SENSE=1 # CONFIG_SCSI_OSD_DEBUG is not set -CONFIG_ATA=y +CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_VERBOSE_ERROR=y CONFIG_SATA_PMP=y @@ -1921,7 +1921,7 @@ CONFIG_PATA_HPT37X=m CONFIG_PATA_IT8213=m CONFIG_PATA_IT821X=m CONFIG_PATA_JMICRON=m -CONFIG_PATA_MACIO=y +CONFIG_PATA_MACIO=m CONFIG_PATA_MARVELL=m CONFIG_PATA_MPC52xx=m CONFIG_PATA_NETCELL=m @@ -1929,7 +1929,7 @@ CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87415=m # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OPTIDMA is not set -CONFIG_PATA_PDC2027X=y +CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC_OLD=m # CONFIG_PATA_RADISYS is not set CONFIG_PATA_RDC=m @@ -1940,7 +1940,7 @@ CONFIG_PATA_SIS=m CONFIG_PATA_TOSHIBA=m # CONFIG_PATA_TRIFLEX is not set CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=y +CONFIG_PATA_WINBOND=m # # PIO-only SFF controllers @@ -1956,7 +1956,7 @@ CONFIG_PATA_PCMCIA=m # # Generic fallback / legacy drivers # -CONFIG_ATA_GENERIC=y +CONFIG_ATA_GENERIC=m # CONFIG_PATA_LEGACY is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=m diff --git a/srcpkgs/linux5.4/files/ppc-dotconfig b/srcpkgs/linux5.4/files/ppc-dotconfig index 58b95a3629..c1df86c760 100644 --- a/srcpkgs/linux5.4/files/ppc-dotconfig +++ b/srcpkgs/linux5.4/files/ppc-dotconfig @@ -1901,7 +1901,7 @@ CONFIG_SCSI_NETLINK=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y @@ -2038,7 +2038,7 @@ CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_ALUA=m # end of SCSI device support -CONFIG_ATA=y +CONFIG_ATA=m CONFIG_ATA_VERBOSE_ERROR=y CONFIG_SATA_PMP=y @@ -2096,7 +2096,7 @@ CONFIG_PATA_HPT37X=m CONFIG_PATA_IT8213=m CONFIG_PATA_IT821X=m CONFIG_PATA_JMICRON=m -CONFIG_PATA_MACIO=y +CONFIG_PATA_MACIO=m CONFIG_PATA_MARVELL=m CONFIG_PATA_MPC52xx=m CONFIG_PATA_NETCELL=m @@ -2104,7 +2104,7 @@ CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87415=m # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OPTIDMA is not set -CONFIG_PATA_PDC2027X=y +CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC_OLD=m # CONFIG_PATA_RADISYS is not set CONFIG_PATA_RDC=m @@ -2115,7 +2115,7 @@ CONFIG_PATA_SIS=m CONFIG_PATA_TOSHIBA=m # CONFIG_PATA_TRIFLEX is not set CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=y +CONFIG_PATA_WINBOND=m # # PIO-only SFF controllers @@ -2131,7 +2131,7 @@ CONFIG_PATA_PCMCIA=m # # Generic fallback / legacy drivers # -CONFIG_ATA_GENERIC=y +CONFIG_ATA_GENERIC=m # CONFIG_PATA_LEGACY is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=m diff --git a/srcpkgs/linux5.6/files/ppc-dotconfig b/srcpkgs/linux5.6/files/ppc-dotconfig index 439f2e1d81..14ed612567 100644 --- a/srcpkgs/linux5.6/files/ppc-dotconfig +++ b/srcpkgs/linux5.6/files/ppc-dotconfig @@ -549,7 +549,7 @@ CONFIG_BLK_CGROUP_RWSTAT=y CONFIG_BLK_DEV_BSG=y CONFIG_BLK_DEV_BSGLIB=y CONFIG_BLK_DEV_INTEGRITY=y -CONFIG_BLK_DEV_INTEGRITY_T10=y +CONFIG_BLK_DEV_INTEGRITY_T10=m CONFIG_BLK_DEV_ZONED=y CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_DEV_THROTTLING_LOW is not set @@ -1889,7 +1889,7 @@ CONFIG_SCSI_NETLINK=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SD=m CONFIG_CHR_DEV_ST=m CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y @@ -2026,7 +2026,7 @@ CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_ALUA=m # end of SCSI device support -CONFIG_ATA=y +CONFIG_ATA=m CONFIG_ATA_VERBOSE_ERROR=y CONFIG_SATA_PMP=y @@ -2084,7 +2084,7 @@ CONFIG_PATA_HPT37X=m CONFIG_PATA_IT8213=m CONFIG_PATA_IT821X=m CONFIG_PATA_JMICRON=m -CONFIG_PATA_MACIO=y +CONFIG_PATA_MACIO=m CONFIG_PATA_MARVELL=m CONFIG_PATA_MPC52xx=m CONFIG_PATA_NETCELL=m @@ -2092,7 +2092,7 @@ CONFIG_PATA_NINJA32=m CONFIG_PATA_NS87415=m # CONFIG_PATA_OLDPIIX is not set # CONFIG_PATA_OPTIDMA is not set -CONFIG_PATA_PDC2027X=y +CONFIG_PATA_PDC2027X=m CONFIG_PATA_PDC_OLD=m # CONFIG_PATA_RADISYS is not set CONFIG_PATA_RDC=m @@ -2103,7 +2103,7 @@ CONFIG_PATA_SIS=m CONFIG_PATA_TOSHIBA=m # CONFIG_PATA_TRIFLEX is not set CONFIG_PATA_VIA=m -CONFIG_PATA_WINBOND=y +CONFIG_PATA_WINBOND=m # # PIO-only SFF controllers @@ -2119,7 +2119,7 @@ CONFIG_PATA_PCMCIA=m # # Generic fallback / legacy drivers # -CONFIG_ATA_GENERIC=y +CONFIG_ATA_GENERIC=m # CONFIG_PATA_LEGACY is not set CONFIG_MD=y CONFIG_BLK_DEV_MD=m