commit: 9425c287f6d6ab0e0a205aad41ba755b556cc251 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Thu Apr 23 20:32:46 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Thu Apr 23 20:34:29 2020 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9425c287
kconfig/ppc: Build BLK_DEV_S* as modules We think that maybe these being built into the kernel when the libata driver is a module somehow breaks booting the livecd. Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> .../weekly/kconfig/powerpc/installcd-ibm-4.19.config | 6 +++--- .../kconfig/powerpc/installcd-ppc32apple-4.19.config | 18 +++++++++--------- .../kconfig/powerpc/installcd-ppc64apple-4.19.config | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/releases/weekly/kconfig/powerpc/installcd-ibm-4.19.config b/releases/weekly/kconfig/powerpc/installcd-ibm-4.19.config index cac68c16..5a4687de 100644 --- a/releases/weekly/kconfig/powerpc/installcd-ibm-4.19.config +++ b/releases/weekly/kconfig/powerpc/installcd-ibm-4.19.config @@ -1198,11 +1198,11 @@ CONFIG_SCSI_PROC_FS=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_ST is not set -CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SG=m # CONFIG_CHR_DEV_SCH is not set CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_LOGGING is not set diff --git a/releases/weekly/kconfig/powerpc/installcd-ppc32apple-4.19.config b/releases/weekly/kconfig/powerpc/installcd-ppc32apple-4.19.config index bcb6fed3..75de161d 100644 --- a/releases/weekly/kconfig/powerpc/installcd-ppc32apple-4.19.config +++ b/releases/weekly/kconfig/powerpc/installcd-ppc32apple-4.19.config @@ -908,7 +908,7 @@ CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set CONFIG_BLK_DEV_FD=m CONFIG_MAC_FLOPPY=m -CONFIG_CDROM=y +CONFIG_CDROM=m # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set # CONFIG_BLK_DEV_UMEM is not set CONFIG_BLK_DEV_LOOP=y @@ -1030,9 +1030,9 @@ CONFIG_HAVE_IDE=y # # SCSI device support # -CONFIG_SCSI_MOD=y +CONFIG_SCSI_MOD=m CONFIG_RAID_ATTRS=m -CONFIG_SCSI=y +CONFIG_SCSI=m CONFIG_SCSI_DMA=y CONFIG_SCSI_PROC_FS=y @@ -1041,18 +1041,18 @@ CONFIG_SCSI_PROC_FS=y # CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_ST is not set -CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=m # CONFIG_CHR_DEV_SCH is not set -# CONFIG_SCSI_CONSTANTS is not set +CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_LOGGING is not set # CONFIG_SCSI_SCAN_ASYNC is not set # # SCSI Transports # -CONFIG_SCSI_SPI_ATTRS=y +CONFIG_SCSI_SPI_ATTRS=m # CONFIG_SCSI_FC_ATTRS is not set CONFIG_SCSI_ISCSI_ATTRS=m CONFIG_SCSI_SAS_ATTRS=m @@ -1075,7 +1075,7 @@ CONFIG_SCSI_3W_9XXX=m # CONFIG_SCSI_3W_SAS is not set CONFIG_SCSI_ACARD=m CONFIG_SCSI_AACRAID=m -CONFIG_SCSI_AIC7XXX=y +CONFIG_SCSI_AIC7XXX=m CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 CONFIG_AIC7XXX_RESET_DELAY_MS=15000 CONFIG_AIC7XXX_DEBUG_ENABLE=y @@ -1129,7 +1129,7 @@ CONFIG_SCSI_DC395x=m CONFIG_SCSI_NSP32=m # CONFIG_SCSI_WD719X is not set # CONFIG_SCSI_DEBUG is not set -CONFIG_SCSI_MESH=y +CONFIG_SCSI_MESH=m CONFIG_SCSI_MESH_SYNC_RATE=5 CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 CONFIG_SCSI_MAC53C94=m @@ -1193,7 +1193,7 @@ CONFIG_PATA_HPT366=m CONFIG_PATA_HPT37X=m CONFIG_PATA_HPT3X2N=m CONFIG_PATA_HPT3X3=m -CONFIG_PATA_HPT3X3_DMA=y +# CONFIG_PATA_HPT3X3_DMA is not set CONFIG_PATA_IT8213=m CONFIG_PATA_IT821X=m CONFIG_PATA_JMICRON=m diff --git a/releases/weekly/kconfig/powerpc/installcd-ppc64apple-4.19.config b/releases/weekly/kconfig/powerpc/installcd-ppc64apple-4.19.config index 507590fa..d43ad9f9 100644 --- a/releases/weekly/kconfig/powerpc/installcd-ppc64apple-4.19.config +++ b/releases/weekly/kconfig/powerpc/installcd-ppc64apple-4.19.config @@ -938,7 +938,7 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_BLK_DEV=y # CONFIG_BLK_DEV_NULL_BLK is not set # CONFIG_BLK_DEV_FD is not set -CONFIG_CDROM=y +CONFIG_CDROM=m # CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set # CONFIG_BLK_DEV_UMEM is not set CONFIG_BLK_DEV_LOOP=y @@ -1071,11 +1071,11 @@ CONFIG_SCSI_PROC_FS=y # # SCSI support type (disk, tape, CD-ROM) # -CONFIG_BLK_DEV_SD=y +CONFIG_BLK_DEV_SD=m # CONFIG_CHR_DEV_ST is not set -CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR=m CONFIG_BLK_DEV_SR_VENDOR=y -CONFIG_CHR_DEV_SG=y +CONFIG_CHR_DEV_SG=m # CONFIG_CHR_DEV_SCH is not set CONFIG_SCSI_CONSTANTS=y # CONFIG_SCSI_LOGGING is not set @@ -1130,7 +1130,7 @@ CONFIG_SCSI_LOWLEVEL=y # CONFIG_SCSI_INITIO is not set # CONFIG_SCSI_INIA100 is not set # CONFIG_SCSI_STEX is not set -CONFIG_SCSI_SYM53C8XX_2=y +CONFIG_SCSI_SYM53C8XX_2=m CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
