debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Use libata-based drivers for most PATA controllers (Closes: #444182) 

Add transition script to linux-base and make all images depend on it


svn path=/dists/trunk/linux-2.6/; revision=15272
This commit is contained in:
Ben Hutchings 2010-02-25 04:11:39 +00:00
parent 2b9b4f709a
commit 1010d1cd17
10 changed files with 1560 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
debian/changelog vendored
View File

@ -16,6 +16,32 @@ linux-2.6 (2.6.33-1~experimental.1) UNRELEASED; urgency=low
* [x86] set CS5535_MFGPT, SENSORS_K10TEMP, GEODE_WDT, MSI_WMI,
TOSHIBA_BT_RFKILL, ACPI_CMPC, CRYPTO_GHASH_CLMUL_NI_INTE.
[ Ben Hutchings ]
* Use libata-based drivers for most PATA controllers (Closes: #444182):
- pata_triflex replaces triflex
- pata_atiixp replaces atiixp
- pata_ns87415 replaces ns87415
- pata_sc1200 replaces sc1200
- pata_cs5536 replaces cs5536
- pata_amd replaces amd74xx
- pata_sis replaces sis5513
- pata_rz1000 replaces rz1000
- pata_efar replaces slc90e66
- pata_pdc202xx_old replaces pdc202xx_old
- pata_pdc2027x replaces pdc202xx_new
- pata_cs5520 replaces cs5520
- pata_cs5530 replaces cs5530
- pata_cmd64x replaces cmd64x
- pata_sil680 replaces siimage
- pata_ali replaces alim15x3
- pata_via replaces via82cxxx
- pata_serverworks replaces serverworks
- pata_artop replaces aec62xx
- pata_it821x replaces it821x
- ata_piix, pata_oldpiix, pata_mpiix mostly replace piix
- ata_generic, pata_ns87410, pata_netcell replace ide-pci-generic
* Add libata transition script
-- maximilian attems <maks@debian.org> Mon, 15 Feb 2010 23:54:52 +0200
linux-2.6 (2.6.32-9) UNRELEASED; urgency=low

44
debian/config/kernelarch-x86/config vendored
View File

@ -145,7 +145,26 @@ CONFIG_ACPI_SBS=m
##
## file: drivers/ata/Kconfig
##
# CONFIG_PATA_SIS is not set
CONFIG_PATA_ALI=m
CONFIG_PATA_AMD=m
CONFIG_PATA_ATIIXP=m
CONFIG_PATA_CMD64X=m
CONFIG_PATA_CS5520=m
CONFIG_PATA_CS5530=m
CONFIG_PATA_EFAR=m
CONFIG_PATA_TRIFLEX=m
CONFIG_PATA_MPIIX=m
CONFIG_PATA_OLDPIIX=m
CONFIG_PATA_NETCELL=m
CONFIG_PATA_NS87410=m
CONFIG_PATA_NS87415=m
CONFIG_PATA_PDC_OLD=m
CONFIG_PATA_RZ1000=m
CONFIG_PATA_SC1200=m
CONFIG_PATA_SERVERWORKS=m
CONFIG_PATA_PDC2027X=m
CONFIG_PATA_SIL680=m
CONFIG_PATA_VIA=m
##
## file: drivers/atm/Kconfig
@ -455,36 +474,17 @@ CONFIG_IDE_GD=m
CONFIG_BLK_DEV_IDECS=m
CONFIG_BLK_DEV_IDECD=m
CONFIG_BLK_DEV_IDETAPE=m
CONFIG_BLK_DEV_IDEACPI=y
# CONFIG_BLK_DEV_IDEACPI is not set
CONFIG_IDE_GENERIC=m
CONFIG_BLK_DEV_CMD640=y
# CONFIG_BLK_DEV_CMD640 is not set
# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
CONFIG_BLK_DEV_IDEPNP=y
# CONFIG_BLK_DEV_OFFBOARD is not set
CONFIG_BLK_DEV_GENERIC=m
CONFIG_BLK_DEV_OPTI621=m
CONFIG_BLK_DEV_RZ1000=m
CONFIG_BLK_DEV_AEC62XX=m
CONFIG_BLK_DEV_ALI15X3=m
CONFIG_BLK_DEV_AMD74XX=m
CONFIG_BLK_DEV_ATIIXP=m
CONFIG_BLK_DEV_CMD64X=m
CONFIG_BLK_DEV_TRIFLEX=m
CONFIG_BLK_DEV_CY82C693=m
CONFIG_BLK_DEV_CS5520=m
CONFIG_BLK_DEV_CS5530=m
CONFIG_BLK_DEV_HPT366=m
CONFIG_BLK_DEV_SC1200=m
CONFIG_BLK_DEV_PIIX=m
CONFIG_BLK_DEV_NS87415=m
CONFIG_BLK_DEV_PDC202XX_OLD=m
CONFIG_BLK_DEV_PDC202XX_NEW=m
CONFIG_BLK_DEV_SVWKS=m
CONFIG_BLK_DEV_SIIMAGE=m
CONFIG_BLK_DEV_SIS5513=m
CONFIG_BLK_DEV_SLC90E66=m
CONFIG_BLK_DEV_TRM290=m
CONFIG_BLK_DEV_VIA82CXXX=m
##
## file: drivers/input/Kconfig

1470
debian/linux-base.postinst vendored Normal file
View File

File diff suppressed because it is too large Load Diff

53
debian/patches/debian/drivers-ata-ata_piix-postpone-pata.patch vendored
View File

@ -1,53 +0,0 @@
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index b952c58..5634cc1 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -164,48 +164,6 @@ static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev);
static unsigned int in_module_init = 1;
static const struct pci_device_id piix_pci_tbl[] = {
- /* Intel PIIX3 for the 430HX etc */
- { 0x8086, 0x7010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_mwdma },
- /* VMware ICH4 */
- { 0x8086, 0x7111, 0x15ad, 0x1976, 0, 0, piix_pata_vmw },
- /* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */
- /* Also PIIX4E (fn3 rev 2) and PIIX4M (fn3 rev 3) */
- { 0x8086, 0x7111, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
- /* Intel PIIX4 */
- { 0x8086, 0x7199, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
- /* Intel PIIX4 */
- { 0x8086, 0x7601, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
- /* Intel PIIX */
- { 0x8086, 0x84CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_33 },
- /* Intel ICH (i810, i815, i840) UDMA 66*/
- { 0x8086, 0x2411, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_66 },
- /* Intel ICH0 : UDMA 33*/
- { 0x8086, 0x2421, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_33 },
- /* Intel ICH2M */
- { 0x8086, 0x244A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* Intel ICH2 (i810E2, i845, 850, 860) UDMA 100 */
- { 0x8086, 0x244B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* Intel ICH3M */
- { 0x8086, 0x248A, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* Intel ICH3 (E7500/1) UDMA 100 */
- { 0x8086, 0x248B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* Intel ICH4 (i845GV, i845E, i852, i855) UDMA 100 */
- { 0x8086, 0x24CA, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- { 0x8086, 0x24CB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* Intel ICH5 */
- { 0x8086, 0x24DB, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* C-ICH (i810E2) */
- { 0x8086, 0x245B, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* ESB (855GME/875P + 6300ESB) UDMA 100 */
- { 0x8086, 0x25A2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* ICH6 (and 6) (i915) UDMA 100 */
- { 0x8086, 0x266F, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
- /* ICH7/7-R (i945, i975) UDMA 100*/
- { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 },
- { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100_nomwdma1 },
- /* ICH8 Mobile PATA Controller */
- { 0x8086, 0x2850, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
-
/* SATA ports */
/* 82801EB (ICH5) */

69
debian/patches/debian/drivers-ata-pata_sis-postpone-pata.patch vendored
View File

@ -1,69 +0,0 @@
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index ae84949..f17c19b 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -172,7 +172,7 @@ config SATA_SIL
config SATA_SIS
tristate "SiS 964/965/966/180 SATA support"
depends on PCI
- select PATA_SIS
+ select PATA_SIS_STUB
help
This option enables support for SiS Serial ATA on
SiS 964/965/966/180 and Parallel ATA on SiS 180.
@@ -618,9 +618,13 @@ config PATA_SIL680
If unsure, say N.
+config PATA_SIS_STUB
+ tristate
+
config PATA_SIS
tristate "SiS PATA support"
depends on PCI
+ select PATA_SIS_STUB
help
This option enables support for SiS PATA controllers
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 674965f..c4bce57 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -63,7 +63,7 @@ obj-$(CONFIG_PATA_SIL680) += pata_sil680.o
obj-$(CONFIG_PATA_VIA) += pata_via.o
obj-$(CONFIG_PATA_WINBOND) += pata_sl82c105.o
obj-$(CONFIG_PATA_WINBOND_VLB) += pata_winbond.o
-obj-$(CONFIG_PATA_SIS) += pata_sis.o
+obj-$(CONFIG_PATA_SIS_STUB) += pata_sis.o
obj-$(CONFIG_PATA_TRIFLEX) += pata_triflex.o
obj-$(CONFIG_PATA_IXP4XX_CF) += pata_ixp4xx_cf.o
obj-$(CONFIG_PATA_SCC) += pata_scc.o
diff --git a/drivers/ata/pata_sis.c b/drivers/ata/pata_sis.c
index 26345d7..2c3e3ba 100644
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
@@ -826,13 +826,16 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
}
static const struct pci_device_id sis_pci_tbl[] = {
+#ifdef CONFIG_PATA_SIS
{ PCI_VDEVICE(SI, 0x5513), }, /* SiS 5513 */
{ PCI_VDEVICE(SI, 0x5518), }, /* SiS 5518 */
{ PCI_VDEVICE(SI, 0x1180), }, /* SiS 1180 */
+#endif
{ }
};
+#ifdef CONFIG_PATA_SIS
static struct pci_driver sis_pci_driver = {
.name = DRV_NAME,
.id_table = sis_pci_tbl,
@@ -856,6 +859,7 @@ static void __exit sis_exit(void)
module_init(sis_init);
module_exit(sis_exit);
+#endif
MODULE_AUTHOR("Alan Cox");
MODULE_DESCRIPTION("SCSI low-level driver for SiS ATA");

37
debian/patches/debian/piix-disable-redundant-devids.patch vendored Normal file
View File

@ -0,0 +1,37 @@
--- a/drivers/ide/piix.c
+++ b/drivers/ide/piix.c
@@ -416,8 +416,14 @@
static const struct pci_device_id piix_pci_tbl[] = {
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371FB_0), 1 },
+#if !defined(CONFIG_PATA_OLDPIIX) && !defined(CONFIG_PATA_OLDPIIX_MODULE)
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371FB_1), 1 },
+#endif
+#if !defined(CONFIG_PATA_MPIIX) && !defined(CONFIG_PATA_MPIIX_MODULE)
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371MX), 0 },
+#endif
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801DB_1), 6 },
+#if !defined(CONFIG_ATA_PIIX) && !defined(CONFIG_ATA_PIIX_MODULE)
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371SB_1), 1 },
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82371AB), 2 },
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801AB_1), 3 },
@@ -433,15 +439,15 @@
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801EB_11), 6 },
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801E_11), 6 },
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801DB_10), 6 },
-#ifdef CONFIG_BLK_DEV_IDE_SATA
- { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801EB_1), 6 },
-#endif
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ESB_2), 6 },
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICH6_19), 6 },
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICH7_21), 6 },
- { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801DB_1), 6 },
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ESB2_18), 6 },
{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_ICH8_6), 6 },
+#endif
+#ifdef CONFIG_BLK_DEV_IDE_SATA
+ { PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_82801EB_1), 6 },
+#endif
{ 0, },
};
MODULE_DEVICE_TABLE(pci, piix_pci_tbl);

3
debian/patches/series/base vendored
View File

@ -3,8 +3,7 @@
+ debian/doc-build-parallel.patch
+ debian/scripts-kconfig-reportoldconfig.patch
+ debian/drivers-ata-ata_piix-postpone-pata.patch
+ debian/drivers-ata-pata_sis-postpone-pata.patch
+ debian/piix-disable-redundant-devids.patch
+ features/all/drivers-infiniband-hw-ipath-iba7220-use-request_firmware.patch
+ features/all/drivers-media-dvb-usb-af9005-request_firmware.patch

3
debian/rules.real vendored
View File

@ -50,7 +50,7 @@ binary-indep: install-patch
binary-indep: install-source
binary-indep: install-support
binary-indep: install-firmware
#binary-indep: install-linux-base
binary-indep: install-linux-base
build: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_$(TYPE)
@ -476,6 +476,7 @@ install-linux-base:
dh_testroot
dh_prep
dh_install -X.svn
dh_installdebconf
+$(MAKE_SELF) install-base
# vim: filetype=make

2
debian/templates/control.image.type-plain.in vendored
View File

@ -1,7 +1,7 @@
Package: linux-image-@upstreamversion@@abiname@@localversion@
Provides: linux-image, linux-image-@major@, linux-modules-@upstreamversion@@abiname@@localversion@
Pre-Depends: debconf | debconf-2.0
Depends: module-init-tools, ${shlibs:Depends}
Depends: module-init-tools, linux-base (>= @source_upstream@), ${shlibs:Depends}
Recommends: firmware-linux-free (>= @source_upstream@)
Suggests: linux-doc-@version@
Description: Linux @upstreamversion@ for @class@

2
debian/templates/control.main.in vendored
View File

@ -79,7 +79,7 @@ Description: Support files for Linux @upstreamversion@
Package: linux-base
Architecture: all
Depends: ${misc:Depends}
Depends: libapt-pkg-perl, ${misc:Depends}
Description: Linux image base package
This package contains files and support scripts for all Linux
images.