| 1 |
commit: 9425c287f6d6ab0e0a205aad41ba755b556cc251 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 23 20:32:46 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 23 20:34:29 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9425c287 |
| 7 |
|
| 8 |
kconfig/ppc: Build BLK_DEV_S* as modules |
| 9 |
|
| 10 |
We think that maybe these being built into the kernel when the libata |
| 11 |
driver is a module somehow breaks booting the livecd. |
| 12 |
|
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
.../weekly/kconfig/powerpc/installcd-ibm-4.19.config | 6 +++--- |
| 16 |
.../kconfig/powerpc/installcd-ppc32apple-4.19.config | 18 +++++++++--------- |
| 17 |
.../kconfig/powerpc/installcd-ppc64apple-4.19.config | 10 +++++----- |
| 18 |
3 files changed, 17 insertions(+), 17 deletions(-) |
| 19 |
|
| 20 |
diff --git a/releases/weekly/kconfig/powerpc/installcd-ibm-4.19.config b/releases/weekly/kconfig/powerpc/installcd-ibm-4.19.config |
| 21 |
index cac68c16..5a4687de 100644 |
| 22 |
--- a/releases/weekly/kconfig/powerpc/installcd-ibm-4.19.config |
| 23 |
+++ b/releases/weekly/kconfig/powerpc/installcd-ibm-4.19.config |
| 24 |
@@ -1198,11 +1198,11 @@ CONFIG_SCSI_PROC_FS=y |
| 25 |
# |
| 26 |
# SCSI support type (disk, tape, CD-ROM) |
| 27 |
# |
| 28 |
-CONFIG_BLK_DEV_SD=y |
| 29 |
+CONFIG_BLK_DEV_SD=m |
| 30 |
# CONFIG_CHR_DEV_ST is not set |
| 31 |
-CONFIG_BLK_DEV_SR=y |
| 32 |
+CONFIG_BLK_DEV_SR=m |
| 33 |
CONFIG_BLK_DEV_SR_VENDOR=y |
| 34 |
-CONFIG_CHR_DEV_SG=y |
| 35 |
+CONFIG_CHR_DEV_SG=m |
| 36 |
# CONFIG_CHR_DEV_SCH is not set |
| 37 |
CONFIG_SCSI_CONSTANTS=y |
| 38 |
# CONFIG_SCSI_LOGGING is not set |
| 39 |
|
| 40 |
diff --git a/releases/weekly/kconfig/powerpc/installcd-ppc32apple-4.19.config b/releases/weekly/kconfig/powerpc/installcd-ppc32apple-4.19.config |
| 41 |
index bcb6fed3..75de161d 100644 |
| 42 |
--- a/releases/weekly/kconfig/powerpc/installcd-ppc32apple-4.19.config |
| 43 |
+++ b/releases/weekly/kconfig/powerpc/installcd-ppc32apple-4.19.config |
| 44 |
@@ -908,7 +908,7 @@ CONFIG_BLK_DEV=y |
| 45 |
# CONFIG_BLK_DEV_NULL_BLK is not set |
| 46 |
CONFIG_BLK_DEV_FD=m |
| 47 |
CONFIG_MAC_FLOPPY=m |
| 48 |
-CONFIG_CDROM=y |
| 49 |
+CONFIG_CDROM=m |
| 50 |
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set |
| 51 |
# CONFIG_BLK_DEV_UMEM is not set |
| 52 |
CONFIG_BLK_DEV_LOOP=y |
| 53 |
@@ -1030,9 +1030,9 @@ CONFIG_HAVE_IDE=y |
| 54 |
# |
| 55 |
# SCSI device support |
| 56 |
# |
| 57 |
-CONFIG_SCSI_MOD=y |
| 58 |
+CONFIG_SCSI_MOD=m |
| 59 |
CONFIG_RAID_ATTRS=m |
| 60 |
-CONFIG_SCSI=y |
| 61 |
+CONFIG_SCSI=m |
| 62 |
CONFIG_SCSI_DMA=y |
| 63 |
CONFIG_SCSI_PROC_FS=y |
| 64 |
|
| 65 |
@@ -1041,18 +1041,18 @@ CONFIG_SCSI_PROC_FS=y |
| 66 |
# |
| 67 |
CONFIG_BLK_DEV_SD=m |
| 68 |
# CONFIG_CHR_DEV_ST is not set |
| 69 |
-CONFIG_BLK_DEV_SR=y |
| 70 |
+CONFIG_BLK_DEV_SR=m |
| 71 |
CONFIG_BLK_DEV_SR_VENDOR=y |
| 72 |
CONFIG_CHR_DEV_SG=m |
| 73 |
# CONFIG_CHR_DEV_SCH is not set |
| 74 |
-# CONFIG_SCSI_CONSTANTS is not set |
| 75 |
+CONFIG_SCSI_CONSTANTS=y |
| 76 |
# CONFIG_SCSI_LOGGING is not set |
| 77 |
# CONFIG_SCSI_SCAN_ASYNC is not set |
| 78 |
|
| 79 |
# |
| 80 |
# SCSI Transports |
| 81 |
# |
| 82 |
-CONFIG_SCSI_SPI_ATTRS=y |
| 83 |
+CONFIG_SCSI_SPI_ATTRS=m |
| 84 |
# CONFIG_SCSI_FC_ATTRS is not set |
| 85 |
CONFIG_SCSI_ISCSI_ATTRS=m |
| 86 |
CONFIG_SCSI_SAS_ATTRS=m |
| 87 |
@@ -1075,7 +1075,7 @@ CONFIG_SCSI_3W_9XXX=m |
| 88 |
# CONFIG_SCSI_3W_SAS is not set |
| 89 |
CONFIG_SCSI_ACARD=m |
| 90 |
CONFIG_SCSI_AACRAID=m |
| 91 |
-CONFIG_SCSI_AIC7XXX=y |
| 92 |
+CONFIG_SCSI_AIC7XXX=m |
| 93 |
CONFIG_AIC7XXX_CMDS_PER_DEVICE=32 |
| 94 |
CONFIG_AIC7XXX_RESET_DELAY_MS=15000 |
| 95 |
CONFIG_AIC7XXX_DEBUG_ENABLE=y |
| 96 |
@@ -1129,7 +1129,7 @@ CONFIG_SCSI_DC395x=m |
| 97 |
CONFIG_SCSI_NSP32=m |
| 98 |
# CONFIG_SCSI_WD719X is not set |
| 99 |
# CONFIG_SCSI_DEBUG is not set |
| 100 |
-CONFIG_SCSI_MESH=y |
| 101 |
+CONFIG_SCSI_MESH=m |
| 102 |
CONFIG_SCSI_MESH_SYNC_RATE=5 |
| 103 |
CONFIG_SCSI_MESH_RESET_DELAY_MS=4000 |
| 104 |
CONFIG_SCSI_MAC53C94=m |
| 105 |
@@ -1193,7 +1193,7 @@ CONFIG_PATA_HPT366=m |
| 106 |
CONFIG_PATA_HPT37X=m |
| 107 |
CONFIG_PATA_HPT3X2N=m |
| 108 |
CONFIG_PATA_HPT3X3=m |
| 109 |
-CONFIG_PATA_HPT3X3_DMA=y |
| 110 |
+# CONFIG_PATA_HPT3X3_DMA is not set |
| 111 |
CONFIG_PATA_IT8213=m |
| 112 |
CONFIG_PATA_IT821X=m |
| 113 |
CONFIG_PATA_JMICRON=m |
| 114 |
|
| 115 |
diff --git a/releases/weekly/kconfig/powerpc/installcd-ppc64apple-4.19.config b/releases/weekly/kconfig/powerpc/installcd-ppc64apple-4.19.config |
| 116 |
index 507590fa..d43ad9f9 100644 |
| 117 |
--- a/releases/weekly/kconfig/powerpc/installcd-ppc64apple-4.19.config |
| 118 |
+++ b/releases/weekly/kconfig/powerpc/installcd-ppc64apple-4.19.config |
| 119 |
@@ -938,7 +938,7 @@ CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y |
| 120 |
CONFIG_BLK_DEV=y |
| 121 |
# CONFIG_BLK_DEV_NULL_BLK is not set |
| 122 |
# CONFIG_BLK_DEV_FD is not set |
| 123 |
-CONFIG_CDROM=y |
| 124 |
+CONFIG_CDROM=m |
| 125 |
# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set |
| 126 |
# CONFIG_BLK_DEV_UMEM is not set |
| 127 |
CONFIG_BLK_DEV_LOOP=y |
| 128 |
@@ -1071,11 +1071,11 @@ CONFIG_SCSI_PROC_FS=y |
| 129 |
# |
| 130 |
# SCSI support type (disk, tape, CD-ROM) |
| 131 |
# |
| 132 |
-CONFIG_BLK_DEV_SD=y |
| 133 |
+CONFIG_BLK_DEV_SD=m |
| 134 |
# CONFIG_CHR_DEV_ST is not set |
| 135 |
-CONFIG_BLK_DEV_SR=y |
| 136 |
+CONFIG_BLK_DEV_SR=m |
| 137 |
CONFIG_BLK_DEV_SR_VENDOR=y |
| 138 |
-CONFIG_CHR_DEV_SG=y |
| 139 |
+CONFIG_CHR_DEV_SG=m |
| 140 |
# CONFIG_CHR_DEV_SCH is not set |
| 141 |
CONFIG_SCSI_CONSTANTS=y |
| 142 |
# CONFIG_SCSI_LOGGING is not set |
| 143 |
@@ -1130,7 +1130,7 @@ CONFIG_SCSI_LOWLEVEL=y |
| 144 |
# CONFIG_SCSI_INITIO is not set |
| 145 |
# CONFIG_SCSI_INIA100 is not set |
| 146 |
# CONFIG_SCSI_STEX is not set |
| 147 |
-CONFIG_SCSI_SYM53C8XX_2=y |
| 148 |
+CONFIG_SCSI_SYM53C8XX_2=m |
| 149 |
CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=0 |
| 150 |
CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 |
| 151 |
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 |
Archives