Martin, Aurelien, When switching from IDE to libata drivers I updated all per-architecture configuration files but I failed to cover per-flavour configuration files. These configuration files currently enable some IDE drivers and the associated flavours may be broken due to the partial conversion:
debian/config/armel/config.iop32x debian/config/m68k/config.amiga debian/config/m68k/config.atari debian/config/m68k/config.mac debian/config/m68k/config.q40 debian/config/mips/config.4kc-malta (known broken; see #584784) debian/config/mips/config.5kc-malta debian/config/mips/config.r4k-ip22 debian/config/mips/config.r5k-ip32 debian/config/mips/config.sb1a-bcm91480b debian/config/mips/config.sb1-bcm91250a debian/config/mipsel/config.r5k-cobalt debian/config/sh4/config.sh7751r debian/config/sh4/config.sh7785lcr Ignoring m68k and sh4 as not release architectures, this leaves mostly MIPS platforms. Since I know approximately nothing about these and I'm not sure exactly which boot methods are supposed to be supported, I'll have to ask you to review the configurations. I've attached a patch which was my best guess at the necessary changes. Note that pata_generic replaces ide-pci-generic whereas pata_platform appears to be the correct replacement for ide-generic. But you probably knew that. Ben. -- Ben Hutchings Once a job is fouled up, anything done to improve it makes it worse.
Index: debian/config/mipsel/config.r5k-cobalt =================================================================== --- debian/config/mipsel/config.r5k-cobalt (revision 15825) +++ debian/config/mipsel/config.r5k-cobalt (working copy) @@ -89,6 +89,13 @@ # CONFIG_TOSHIBA_RBTX4938 is not set ## +## file: drivers/ata/Kconfig +## +CONFIG_ATA=y +CONFIG_PATA_PLATFORM=y +CONFIG_PATA_VIA=y + +## ## file: drivers/base/Kconfig ## # CONFIG_STANDALONE is not set @@ -163,36 +170,7 @@ ## ## file: drivers/ide/Kconfig ## -CONFIG_IDE=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=y -CONFIG_IDE_GD_ATA=y -# CONFIG_BLK_DEV_IDECD is not set -# CONFIG_BLK_DEV_IDETAPE is not set -CONFIG_IDE_GENERIC=y -# CONFIG_BLK_DEV_OFFBOARD is not set -# CONFIG_BLK_DEV_GENERIC is not set -# CONFIG_BLK_DEV_OPTI621 is not set -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_CY82C693 is not set -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_CS5530 is not set -# CONFIG_BLK_DEV_HPT366 is not set -# CONFIG_BLK_DEV_SC1200 is not set -# CONFIG_BLK_DEV_PIIX is not set -# CONFIG_BLK_DEV_IT821X is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -CONFIG_BLK_DEV_VIA82CXXX=y +# CONFIG_IDE is not set ## ## file: drivers/infiniband/Kconfig @@ -590,6 +568,8 @@ ## ## file: drivers/scsi/Kconfig ## +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set Index: debian/config/mips/config.4kc-malta =================================================================== --- debian/config/mips/config.4kc-malta (revision 15825) +++ debian/config/mips/config.4kc-malta (working copy) @@ -134,12 +134,14 @@ # CONFIG_SATA_VITESSE is not set CONFIG_PATA_CMD64X=y CONFIG_ATA_GENERIC=y +CONFIG_PATA_HPT366=y CONFIG_PATA_MPIIX=y CONFIG_PATA_OLDPIIX=y CONFIG_PATA_NETCELL=y CONFIG_PATA_NS87410=y CONFIG_PATA_PDC_OLD=y CONFIG_PATA_PDC2027X=y +CONFIG_PATA_PLATFORM=y CONFIG_PATA_SIL680=y ## @@ -359,38 +361,7 @@ ## ## file: drivers/ide/Kconfig ## -CONFIG_IDE=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=y -CONFIG_IDE_GD_ATA=y -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDETAPE=m -# CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_GENERIC=y -# CONFIG_BLK_DEV_OFFBOARD is not set -# CONFIG_BLK_DEV_GENERIC is not set -# CONFIG_BLK_DEV_OPTI621 is not set -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_CY82C693 is not set -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_CS5530 is not set -CONFIG_BLK_DEV_HPT366=y -# CONFIG_BLK_DEV_JMICRON is not set -# CONFIG_BLK_DEV_SC1200 is not set -CONFIG_BLK_DEV_PIIX=y -# CONFIG_BLK_DEV_IT821X is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_IDE is not set ## ## file: drivers/input/gameport/Kconfig @@ -869,6 +840,7 @@ ## file: drivers/scsi/Kconfig ## CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y CONFIG_SCSI_DPT_I2O=m CONFIG_SCSI_ARCMSR=m CONFIG_SCSI_HPTIOP=m Index: debian/config/mips/config.sb1a-bcm91480b =================================================================== --- debian/config/mips/config.sb1a-bcm91480b (revision 15825) +++ debian/config/mips/config.sb1a-bcm91480b (working copy) @@ -120,7 +120,7 @@ ## ## file: drivers/ata/Kconfig ## -CONFIG_ATA=m +CONFIG_ATA=y CONFIG_SATA_AHCI=m CONFIG_SATA_SIL24=m CONFIG_SATA_SVW=m @@ -140,12 +140,14 @@ CONFIG_PATA_AMD=m CONFIG_PATA_CMD64X=m CONFIG_PATA_CS5530=m +CONFIG_PATA_CYPRESS=y CONFIG_PATA_EFAR=m CONFIG_PATA_TRIFLEX=m CONFIG_PATA_MPIIX=m CONFIG_PATA_OLDPIIX=m CONFIG_PATA_NS87415=m CONFIG_PATA_PDC_OLD=m +CONFIG_PATA_PLATFORM=y CONFIG_PATA_SC1200=m CONFIG_PATA_SERVERWORKS=m CONFIG_PATA_PDC2027X=m @@ -288,36 +290,7 @@ ## ## file: drivers/ide/Kconfig ## -CONFIG_IDE=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=y -CONFIG_IDE_GD_ATA=y -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDETAPE=m -CONFIG_IDE_GENERIC=y -# CONFIG_BLK_DEV_OFFBOARD is not set -# CONFIG_BLK_DEV_GENERIC is not set -# CONFIG_BLK_DEV_OPTI621 is not set -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -CONFIG_BLK_DEV_CY82C693=m -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_CS5530 is not set -CONFIG_BLK_DEV_HPT366=m -# CONFIG_BLK_DEV_SC1200 is not set -CONFIG_BLK_DEV_PIIX=m -# CONFIG_BLK_DEV_IT821X is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -CONFIG_BLK_DEV_TRM290=m -# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_IDE is not set ## ## file: drivers/infiniband/Kconfig @@ -566,6 +539,8 @@ ## ## file: drivers/scsi/Kconfig ## +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y # CONFIG_SCSI_MULTI_LUN is not set # CONFIG_SCSI_CONSTANTS is not set # CONFIG_SCSI_LOGGING is not set Index: debian/config/mips/config.5kc-malta =================================================================== --- debian/config/mips/config.5kc-malta (revision 15825) +++ debian/config/mips/config.5kc-malta (working copy) @@ -120,12 +120,14 @@ CONFIG_SATA_INIC162X=m CONFIG_PATA_CMD64X=y CONFIG_ATA_GENERIC=y +CONFIG_PATA_HPT366=y CONFIG_PATA_MPIIX=y CONFIG_PATA_OLDPIIX=y CONFIG_PATA_NETCELL=y CONFIG_PATA_NS87410=y CONFIG_PATA_PDC_OLD=y CONFIG_PATA_PDC2027X=y +CONFIG_PATA_PLATFORM=y CONFIG_PATA_SIL680=y ## @@ -348,40 +350,7 @@ ## ## file: drivers/ide/Kconfig ## -CONFIG_IDE=y -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_IDE_GD=y -CONFIG_IDE_GD_ATA=y -CONFIG_BLK_DEV_IDECD=m -CONFIG_BLK_DEV_IDETAPE=m -# CONFIG_IDE_TASK_IOCTL is not set -CONFIG_IDE_PROC_FS=y -CONFIG_IDE_GENERIC=y -CONFIG_IDEPCI_PCIBUS_ORDER=y -# CONFIG_BLK_DEV_OFFBOARD is not set -# CONFIG_BLK_DEV_GENERIC is not set -# CONFIG_BLK_DEV_OPTI621 is not set -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -# CONFIG_BLK_DEV_CMD64X is not set -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_CY82C693 is not set -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_CS5530 is not set -CONFIG_BLK_DEV_HPT366=y -# CONFIG_BLK_DEV_JMICRON is not set -# CONFIG_BLK_DEV_SC1200 is not set -CONFIG_BLK_DEV_PIIX=y -# CONFIG_BLK_DEV_IT821X is not set -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_SVWKS is not set -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_IDE is not set ## ## file: drivers/ieee1394/Kconfig @@ -916,6 +885,7 @@ ## file: drivers/scsi/Kconfig ## CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y CONFIG_SCSI_ARCMSR=m CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_DMX3191D=m
signature.asc
Description: This is a digitally signed message part
