Jaunty config changes: Build in most PATA/SATA drivers

Tim Gardner timg at tpi.com
Mon Jan 5 19:31:35 UTC 2009 

>From 03fdac69ef7e63a5db1ccaae4a0a3346a36102dd Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner at canonical.com>
Date: Tue, 30 Dec 2008 15:03:30 -0700
Subject: [PATCH] UBUNTU: Build in most PATA/SATA drivers

Bug: #311730

Signed-off-by: Tim Gardner <tim.gardner at canonical.com>
---
 debian/abi/2.6.28-4.5/modules.ignore |   48 +++++++++++++++
 debian/config/amd64/config           |  106 +++++++++++++++++-----------------
 debian/config/i386/config            |  106 +++++++++++++++++-----------------
 debian/d-i/modules/pata-modules      |   30 ----------
 debian/d-i/modules/sata-modules      |   17 ------
 5 files changed, 154 insertions(+), 153 deletions(-)
 create mode 100644 debian/abi/2.6.28-4.5/modules.ignore

diff --git a/debian/abi/2.6.28-4.5/modules.ignore b/debian/abi/2.6.28-4.5/modules.ignore
new file mode 100644
index 0000000..cc0538e
--- /dev/null
+++ b/debian/abi/2.6.28-4.5/modules.ignore
@@ -0,0 +1,48 @@
+ahci
+ata_generic
+ata_piix
+pata_acpi
+pata_ali
+pata_amd
+pata_artop
+pata_atiixp
+pata_cmd64x
+pata_cs5520
+pata_cs5530
+pata_cs5536
+pata_efar
+pata_hpt366
+pata_hpt37x
+pata_hpt3x3
+pata_it821x
+pata_jmicron
+pata_marvell
+pata_mpiix
+pata_netcell
+pata_ns87410
+pata_ns87415
+pata_oldpiix
+pata_pdc2027x
+pata_pdc202xx_old
+pata_qdi
+pata_rz1000
+pata_sch
+pata_serverworks
+pata_sil680
+pata_sis
+pata_sl82c105
+pata_triflex
+pata_via
+pdc_adma
+sata_inic162x
+sata_nv
+sata_promise
+sata_qstor
+sata_sil
+sata_sil24
+sata_sis
+sata_svw
+sata_sx4
+sata_uli
+sata_via
+sata_vsc
diff --git a/debian/config/amd64/config b/debian/config/amd64/config
index a4c735e..ad55a84 100644
--- a/debian/config/amd64/config
+++ b/debian/config/amd64/config
@@ -132,10 +132,10 @@ CONFIG_ATA=y
 CONFIG_ATALK=m
 CONFIG_ATARI_PARTITION=y
 CONFIG_ATA_ACPI=y
-CONFIG_ATA_GENERIC=m
+CONFIG_ATA_GENERIC=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_OVER_ETH=m
-CONFIG_ATA_PIIX=m
+CONFIG_ATA_PIIX=y
 CONFIG_ATA_SFF=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
@@ -2234,47 +2234,47 @@ CONFIG_PARPORT_PC_PCMCIA=m
 # CONFIG_PARPORT_PC_SUPERIO is not set
 CONFIG_PARPORT_SERIAL=m
 CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-# CONFIG_PATA_CMD640_PCI is not set
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-# CONFIG_PATA_CYPRESS is not set
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-# CONFIG_PATA_HPT3X2N is not set
-CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_ACPI=y
+CONFIG_PATA_ALI=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_CMD64X=y
+CONFIG_PATA_CS5520=y
+CONFIG_PATA_CS5530=y
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=y
+CONFIG_PATA_HPT366=y
+CONFIG_PATA_HPT37X=y
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=y
 # CONFIG_PATA_HPT3X3_DMA is not set
 CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
+CONFIG_PATA_IT821X=y
+CONFIG_PATA_JMICRON=y
+CONFIG_PATA_MARVELL=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NETCELL=y
 CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OLDPIIX=m
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_OPTIDMA is not set
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_NS87415=y
+CONFIG_PATA_OLDPIIX=y
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RZ1000=m
-# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RZ1000=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TRIFLEX=y
+CONFIG_PATA_VIA=y
+CONFIG_PATA_WINBOND=y
 # CONFIG_PC300TOO is not set
 CONFIG_PC8736x_GPIO=m
 CONFIG_PC87413_WDT=m
@@ -2323,7 +2323,7 @@ CONFIG_PCNET32=m
 CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PD6729=m
 CONFIG_PDA_POWER=m
-CONFIG_PDC_ADMA=m
+CONFIG_PDC_ADMA=y
 CONFIG_PHANTOM=m
 CONFIG_PHONE=m
 CONFIG_PHONET=m
@@ -2513,21 +2513,21 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_RXKAD=m
 CONFIG_S2IO=m
 # CONFIG_SAMPLES is not set
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_INIC162X=m
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_INIC162X=y
 CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
+CONFIG_SATA_NV=y
 CONFIG_SATA_PMP=y
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_SIL=y
+CONFIG_SATA_SIL24=y
+CONFIG_SATA_SIS=y
+CONFIG_SATA_SVW=y
+CONFIG_SATA_SX4=y
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
 CONFIG_SBC8360_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
 CONFIG_SBNI=m
diff --git a/debian/config/i386/config b/debian/config/i386/config
index 7a72ef3..c919816 100644
--- a/debian/config/i386/config
+++ b/debian/config/i386/config
@@ -149,10 +149,10 @@ CONFIG_ATA=y
 CONFIG_ATALK=m
 CONFIG_ATARI_PARTITION=y
 CONFIG_ATA_ACPI=y
-CONFIG_ATA_GENERIC=m
+CONFIG_ATA_GENERIC=y
 # CONFIG_ATA_NONSTANDARD is not set
 CONFIG_ATA_OVER_ETH=m
-CONFIG_ATA_PIIX=m
+CONFIG_ATA_PIIX=y
 CONFIG_ATA_SFF=y
 CONFIG_ATH5K=m
 # CONFIG_ATH5K_DEBUG is not set
@@ -2348,52 +2348,52 @@ CONFIG_PARPORT_PC_PCMCIA=m
 # CONFIG_PARPORT_PC_SUPERIO is not set
 CONFIG_PARPORT_SERIAL=m
 CONFIG_PARTITION_ADVANCED=y
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATIIXP=m
-# CONFIG_PATA_CMD640_PCI is not set
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
+CONFIG_PATA_ACPI=y
+CONFIG_PATA_ALI=y
+CONFIG_PATA_AMD=y
+CONFIG_PATA_ARTOP=y
+CONFIG_PATA_ATIIXP=y
+CONFIG_PATA_CMD640_PCI=y
+CONFIG_PATA_CMD64X=y
+CONFIG_PATA_CS5520=y
+CONFIG_PATA_CS5530=y
 CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-# CONFIG_PATA_CYPRESS is not set
-CONFIG_PATA_EFAR=m
-CONFIG_PATA_HPT366=m
+CONFIG_PATA_CS5536=y
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=y
+CONFIG_PATA_HPT366=y
 CONFIG_PATA_HPT37X=m
-# CONFIG_PATA_HPT3X2N is not set
-CONFIG_PATA_HPT3X3=m
+CONFIG_PATA_HPT3X2N=y
+CONFIG_PATA_HPT3X3=y
 # CONFIG_PATA_HPT3X3_DMA is not set
-# CONFIG_PATA_ISAPNP is not set
+CONFIG_PATA_ISAPNP=m
 CONFIG_PATA_IT8213=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_JMICRON=m
+CONFIG_PATA_IT821X=y
+CONFIG_PATA_JMICRON=y
 CONFIG_PATA_LEGACY=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_NETCELL=m
+CONFIG_PATA_MARVELL=y
+CONFIG_PATA_MPIIX=y
+CONFIG_PATA_NETCELL=y
 CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
+CONFIG_PATA_NS87410=y
+CONFIG_PATA_NS87415=y
 CONFIG_PATA_OLDPIIX=m
-# CONFIG_PATA_OPTI is not set
-# CONFIG_PATA_OPTIDMA is not set
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_OPTIDMA=m
 CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_QDI=m
-# CONFIG_PATA_RADISYS is not set
-CONFIG_PATA_RZ1000=m
-# CONFIG_PATA_SC1200 is not set
-CONFIG_PATA_SCH=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
+CONFIG_PATA_PDC2027X=y
+CONFIG_PATA_PDC_OLD=y
+CONFIG_PATA_QDI=y
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RZ1000=y
+CONFIG_PATA_SC1200=y
+CONFIG_PATA_SCH=y
+CONFIG_PATA_SERVERWORKS=y
+CONFIG_PATA_SIL680=y
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TRIFLEX=y
+CONFIG_PATA_VIA=y
+CONFIG_PATA_WINBOND=y
 CONFIG_PATA_WINBOND_VLB=m
 # CONFIG_PC300TOO is not set
 CONFIG_PC8736x_GPIO=m
@@ -2454,7 +2454,7 @@ CONFIG_PCSPKR_PLATFORM=y
 CONFIG_PCWATCHDOG=m
 CONFIG_PD6729=m
 CONFIG_PDA_POWER=m
-CONFIG_PDC_ADMA=m
+CONFIG_PDC_ADMA=y
 CONFIG_PHANTOM=m
 CONFIG_PHONE=m
 CONFIG_PHONET=m
@@ -2657,21 +2657,21 @@ CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_RXKAD=m
 CONFIG_S2IO=m
 # CONFIG_SAMPLES is not set
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_INIC162X=m
+CONFIG_SATA_AHCI=y
+CONFIG_SATA_INIC162X=y
 CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
+CONFIG_SATA_NV=y
 CONFIG_SATA_PMP=y
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIL24=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_SVW=m
+CONFIG_SATA_PROMISE=y
+CONFIG_SATA_QSTOR=y
+CONFIG_SATA_SIL=y
+CONFIG_SATA_SIL24=y
+CONFIG_SATA_SIS=y
+CONFIG_SATA_SVW=y
 CONFIG_SATA_SX4=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
+CONFIG_SATA_ULI=y
+CONFIG_SATA_VIA=y
+CONFIG_SATA_VITESSE=y
 CONFIG_SBC7240_WDT=m
 CONFIG_SBC8360_WDT=m
 CONFIG_SBC_EPX_C3_WATCHDOG=m
diff --git a/debian/d-i/modules/pata-modules b/debian/d-i/modules/pata-modules
index a37f848..2664ffd 100644
--- a/debian/d-i/modules/pata-modules
+++ b/debian/d-i/modules/pata-modules
@@ -1,32 +1,2 @@
-ata_generic
-pata_acpi
-pata_ali
-pata_amd
-pata_artop
-pata_atiixp
-pata_cmd64x
-pata_cs5520
-pata_cs5530
-pata_efar
-pata_hpt366
-pata_hpt37x
-pata_hpt3x3
 pata_it8213
-pata_it821x
-pata_jmicron
-pata_marvell
-pata_mpiix
-pata_netcell
 pata_ninja32
-pata_ns87410
-pata_ns87415
-pata_oldpiix
-pata_pdc2027x
-pata_pdc202xx_old
-pata_rz1000
-pata_sch
-pata_serverworks
-pata_sil680
-pata_sl82c105
-pata_triflex
-pata_via
diff --git a/debian/d-i/modules/sata-modules b/debian/d-i/modules/sata-modules
index 40f54a1..c902034 100644
--- a/debian/d-i/modules/sata-modules
+++ b/debian/d-i/modules/sata-modules
@@ -1,19 +1,2 @@
-# Rerquired by sata_sis
-pata_sis
 
-ahci
-ata_piix
-pdc_adma
-sata_inic162x
 sata_mv
-sata_nv
-sata_promise
-sata_qstor
-sata_sil
-sata_sil24
-sata_sis
-sata_svw
-sata_sx4
-sata_uli
-sata_via
-sata_vsc
-- 
1.5.6.3

More information about the kernel-team mailing list