[kernel] r13365 - in dists/trunk/linux-2.6/debian: . config patches/debian/dfsg patches/features/all patches/series
Maximilian Attems
maks at alioth.debian.org
Wed Apr 8 11:01:44 UTC 2009
Author: maks
Date: Wed Apr 8 11:01:42 2009
New Revision: 13365
Log:
update to 2.6.30-rc1
* bunch of request_firmware patches merged
* disable some staging crap
Ben Hutchings <ben at decadent.org.uk>
* nuke more stuff in firmware/ dir to keep beeing dfsg clean
much stuff outside of firmware/ gone
* rediff firmware/Makefile patch
* disable bunch of ?merged? arm patches
TODO: - review addition of new firmware outside of firmware/ dir
drivers/staging beeing the primary target, but maybe more..
- check gfs2 and gpu-drm-radeon-request_firmware patches
Added:
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-me4000-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch
Deleted:
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-tehuti-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-typhoon-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/features/all/drivers-scsi-qla1280-request_firmware.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/config
dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
dists/trunk/linux-2.6/debian/patches/series/base
dists/trunk/linux-2.6/debian/patches/series/orig-0
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Wed Apr 8 06:55:48 2009 (r13364)
+++ dists/trunk/linux-2.6/debian/changelog Wed Apr 8 11:01:42 2009 (r13365)
@@ -1,13 +1,19 @@
-linux-2.6 (2.6.29-1~experimental.2) UNRELEASED; urgency=low
+linux-2.6 (2.6.30~rc1-1~experimental.1) UNRELEASED; urgency=low
* New upstream release
- radeonfb: suspend/resume for ATI Mobility Radeon RV350.
(closes: #506964)
+ [ maximilian attems ]
* [sparc] Enable BLK_DEV_CRYPTOLOOP. (closes: #521829)
* Enable PATA_JMICRON instead of legacy BLK_DEV_JMICRON.
(closes: #431500, #458493)
+ [ Ben Hutchings ]
+ * Remove firmware from driver/staging (closes: #521553)
+ - Disable affected drivers: rt2860, rt2870
+
+
-- maximilian attems <maks at debian.org> Mon, 30 Mar 2009 14:40:26 +0200
linux-2.6 (2.6.29-2) unstable; urgency=low
Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config Wed Apr 8 06:55:48 2009 (r13364)
+++ dists/trunk/linux-2.6/debian/config/config Wed Apr 8 11:01:42 2009 (r13365)
@@ -1911,12 +1911,12 @@
##
## file: drivers/staging/rt2860/Kconfig
##
-CONFIG_RT2860=m
+# CONFIG_RT2860 is not set
##
## file: drivers/staging/rt2870/Kconfig
##
-CONFIG_RT2870=m
+# CONFIG_RT2870 is not set
##
## file: drivers/staging/rtl8187se/Kconfig
Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-me4000-disable.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-me4000-disable.patch Wed Apr 8 11:01:42 2009 (r13365)
@@ -0,0 +1,12 @@
+diff --git a/drivers/staging/me4000/Kconfig b/drivers/staging/me4000/Kconfig
+index 5e6c9de..45d2ea9 100644
+--- a/drivers/staging/me4000/Kconfig
++++ b/drivers/staging/me4000/Kconfig
+@@ -1,6 +1,7 @@
+ config ME4000
+ tristate "Meilhaus ME-4000 support"
+ default n
++ depends on BROKEN
+ depends on PCI
+ help
+ This driver supports the Meilhaus ME-4000 family of boards
Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch Wed Apr 8 11:01:42 2009 (r13365)
@@ -0,0 +1,11 @@
+diff --git a/drivers/staging/otus/Kconfig b/drivers/staging/otus/Kconfig
+index d549d08..fef9785 100644
+--- a/drivers/staging/otus/Kconfig
++++ b/drivers/staging/otus/Kconfig
+@@ -1,5 +1,6 @@
+ config OTUS
+ tristate "Atheros OTUS 802.11n USB wireless support"
++ depends on BROKEN
+ depends on USB && WLAN_80211 && MAC80211
+ default N
+ ---help---
Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch Wed Apr 8 11:01:42 2009 (r13365)
@@ -0,0 +1,11 @@
+diff --git a/drivers/staging/rt2860/Kconfig b/drivers/staging/rt2860/Kconfig
+index 7f44e5e..9fb130d 100644
+--- a/drivers/staging/rt2860/Kconfig
++++ b/drivers/staging/rt2860/Kconfig
+@@ -1,5 +1,6 @@
+ config RT2860
+ tristate "Ralink 2860 wireless support"
++ depends on BROKEN
+ depends on PCI && X86 && WLAN_80211
+ ---help---
+ This is an experimental driver for the Ralink 2860 wireless chip.
Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch Wed Apr 8 11:01:42 2009 (r13365)
@@ -0,0 +1,11 @@
+diff --git a/drivers/staging/rt2870/Kconfig b/drivers/staging/rt2870/Kconfig
+index 8398d97..cd4f0b6 100644
+--- a/drivers/staging/rt2870/Kconfig
++++ b/drivers/staging/rt2870/Kconfig
+@@ -1,5 +1,6 @@
+ config RT2870
+ tristate "Ralink 2870 wireless support"
++ depends on BROKEN
+ depends on USB && X86 && WLAN_80211
+ ---help---
+ This is an experimental driver for the Ralink 2870 wireless chip.
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Wed Apr 8 06:55:48 2009 (r13364)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Wed Apr 8 11:01:42 2009 (r13365)
@@ -2,8 +2,10 @@
rm firmware/*.HEX
rm firmware/*.ihex
+rm firmware/3com
rm firmware/acenic
rm firmware/adaptec
+rm firmware/bnx2
rm firmware/cpia2
rm firmware/cxgb3
rm firmware/dabusb
@@ -15,11 +17,18 @@
rm firmware/kaweth
rm firmware/keyspan
rm firmware/korg
+rm firmware/myricom
+rm firmware/ositech
+rm firmware/qlogic
rm firmware/sb16
+rm firmware/slicoss
rm firmware/sun
+rm firmware/sxg
+rm firmware/tehuti
rm firmware/tigon
rm firmware/ttusb-budget
rm firmware/vicam
+rm firmware/yam
rm firmware/yamaha
rm drivers/gpu/drm/mga/mga_ucode.h
@@ -38,24 +47,15 @@
rm drivers/net/bnx2x_init_values.h
-rm drivers/net/hamradio/yam1200.h
-rm drivers/net/hamradio/yam9600.h
-
-rm drivers/net/myri_code.h
-
-rm drivers/net/tehuti_fw.h
-
-rm drivers/net/tokenring/3c359.c
-rm drivers/net/tokenring/3c359.h
-rm drivers/net/tokenring/3c359_microcode.h
-
-rm drivers/net/typhoon-firmware.h
-
-rm drivers/scsi/ql1040_fw.h
-rm drivers/scsi/ql12160_fw.h
-rm drivers/scsi/ql1280_fw.h
-
-rm drivers/scsi/qlogicpti_asm.c
+rm drivers/staging/me4000/me*_firmware.h
+
+rm drivers/staging/otus/hal/hp*fw*.c
+
+rm drivers/staging/rt2860/common/firmware.h
+
+rm drivers/staging/rt2870/common/firmware.h
+
+rm drivers/staging/slicoss/*ucode.h
rm sound/pci/cs46xx/cs46xx_image.h
rm sound/pci/cs46xx/imgs
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Wed Apr 8 06:55:48 2009 (r13364)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Wed Apr 8 11:01:42 2009 (r13365)
@@ -1,8 +1,8 @@
diff --git a/firmware/Makefile b/firmware/Makefile
-index 466106f..fea3504 100644
+index 1e7fd4d..fea3504 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
-@@ -20,75 +20,9 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+@@ -20,96 +20,8 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
# accurate. In the latter case it doesn't matter -- it'll use $(fw-shipped-all).
# But be aware that the config file might not be included at all.
@@ -12,19 +12,31 @@
-else
-acenic-objs := acenic/tg1.bin acenic/tg2.bin
-endif
+-fw-shipped-$(CONFIG_3C359) += 3com/3C359.bin
-fw-shipped-$(CONFIG_ACENIC) += $(acenic-objs)
-fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_rx.bin \
- adaptec/starfire_tx.bin
- fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
+-fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
-fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
+-fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-4.6.17.fw \
+- bnx2/bnx2-rv2p-09-4.6.15.fw \
+- bnx2/bnx2-mips-06-4.6.16.fw \
+- bnx2/bnx2-rv2p-06-4.6.16.fw
-fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
-fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
-fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
- cxgb3/t3c_psram-1.1.0.bin \
-- cxgb3/t3fw-7.0.0.bin
+- cxgb3/t3fw-7.1.0.bin
-fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
-fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
- e100/d102e_ucode.bin
+-fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin
+-fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin
+-fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
+- advansys/3550.bin advansys/38C0800.bin
+-fw-shipped-$(CONFIG_SCSI_QLOGIC_1280) += qlogic/1040.bin qlogic/1280.bin \
+- qlogic/12160.bin
+-fw-shipped-$(CONFIG_SCSI_QLOGICPTI) += qlogic/isp1000.bin
-fw-shipped-$(CONFIG_SMCTR) += tr_smctr.bin
-fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp
-fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \
@@ -33,10 +45,18 @@
- sb16/ima_adpcm_init.csp \
- sb16/ima_adpcm_playback.csp \
- sb16/ima_adpcm_capture.csp
+-fw-shipped-$(CONFIG_SLICOSS) += slicoss/gbdownload.sys slicoss/gbrcvucode.sys \
+- slicoss/oasisdbgdownload.sys \
+- slicoss/oasisdownload.sys \
+- slicoss/oasisrcvucode.sys
+-fw-shipped-$(CONFIG_SXG) += sxg/saharadownloadB.sys \
+- sxg/saharadbgdownloadB.sys
-fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
- yamaha/ds1e_ctrl.fw
+-fw-shipped-$(CONFIG_TEHUTI) += tehuti/bdx.bin
-fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
- tigon/tg3_tso5.bin
+-fw-shipped-$(CONFIG_TYPHOON) += 3com/typhoon.bin
-fw-shipped-$(CONFIG_USB_DABUSB) += dabusb/firmware.fw dabusb/bitstream.bin
-fw-shipped-$(CONFIG_USB_EMI26) += emi26/loader.fw emi26/firmware.fw \
- emi26/bitstream.fw
@@ -75,6 +95,7 @@
fw-shipped-$(CONFIG_USB_SERIAL_XIRCOM) += keyspan_pda/xircom_pgs.fw
-fw-shipped-$(CONFIG_USB_VICAM) += vicam/firmware.fw
-fw-shipped-$(CONFIG_VIDEO_CPIA2) += cpia2/stv0672_vp4.bin
+-fw-shipped-$(CONFIG_YAM) += yam/1200.bin yam/9600.bin
fw-shipped-all := $(fw-shipped-y) $(fw-shipped-m) $(fw-shipped-)
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Wed Apr 8 06:55:48 2009 (r13364)
+++ dists/trunk/linux-2.6/debian/patches/series/base Wed Apr 8 11:01:42 2009 (r13365)
@@ -6,14 +6,11 @@
+ debian/drivers-ata-ata_piix-postpone-pata.patch
+ debian/drivers-ata-pata_sis-postpone-pata.patch
-+ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
+ features/all/drivers-gpu-drm-mga-request_firmware.patch
+ features/all/drivers-gpu-drm-r128-request_firmware.patch
-+ features/all/drivers-gpu-drm-radeon-request_firmware.patch
-+ features/all/drivers-net-tehuti-request_firmware.patch
-+ features/all/drivers-net-typhoon-request_firmware.patch
-+ features/all/drivers-scsi-qla1280-request_firmware.patch
-+ features/all/export-gfs2-locking-symbols.patch
+# FIXME:
+#+ features/all/drivers-gpu-drm-radeon-request_firmware.patch
+#+ features/all/export-gfs2-locking-symbols.patch
+ features/all/export-unionfs-symbols.patch
+ bugfix/sparc/drivers_net-broken.patch
@@ -25,17 +22,17 @@
+ bugfix/powerpc/mm-mol.patch
+ bugfix/powerpc/lpar-console.patch
#+ bugfix/all/wireless-regulatory-default-EU.patch
-+ features/sparc/video-sunxvr500-intergraph.patch
+#+ features/sparc/video-sunxvr500-intergraph.patch
# Kirkwood support, will be in 2.6.30
-+ features/arm/orion-gpio-input-output.patch
-+ features/arm/kw-mpp.patch
-+ features/arm/mv-sdio.patch
-+ features/arm/kw-register-sdio.patch
-+ features/arm/kw-register-internal-devices.patch
-+ features/arm/kw-sheevaplug.patch
-+ features/arm/kw-sheevaplug-usb-power.patch
-+ features/arm/kw-sheevaplug-led.patch
-+ features/arm/kw-hook-up-i2c.patch
-+ features/arm/kw-dont-init-rtc.patch
-+ features/arm/kw-consistency-mpp.patch
-+ features/arm/ts219.patch
+#+ features/arm/orion-gpio-input-output.patch
+#+ features/arm/kw-mpp.patch
+#+ features/arm/mv-sdio.patch
+#+ features/arm/kw-register-sdio.patch
+#+ features/arm/kw-register-internal-devices.patch
+#+ features/arm/kw-sheevaplug.patch
+#+ features/arm/kw-sheevaplug-usb-power.patch
+#+ features/arm/kw-sheevaplug-led.patch
+#+ features/arm/kw-hook-up-i2c.patch
+#+ features/arm/kw-dont-init-rtc.patch
+#+ features/arm/kw-consistency-mpp.patch
+#+ features/arm/ts219.patch
Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0 Wed Apr 8 06:55:48 2009 (r13364)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0 Wed Apr 8 11:01:42 2009 (r13365)
@@ -1,16 +1,12 @@
+ debian/dfsg/drivers-gpu-drm-mga-disable.patch
+ debian/dfsg/drivers-gpu-drm-r128-disable.patch
+ debian/dfsg/drivers-gpu-drm-radeon-disable.patch
-+ debian/dfsg/drivers-net-bnx2-disable.patch
+ debian/dfsg/drivers-net-bnx2x-disable.patch
+ debian/dfsg/drivers-net-appletalk-cops.patch
-+ debian/dfsg/drivers-net-hamradio-yam.patch
-+ debian/dfsg/drivers-net-myri.patch
-+ debian/dfsg/drivers-net-tehuti-disable.patch
-+ debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
-+ debian/dfsg/drivers-net-typhoon-disable.patch
-+ debian/dfsg/drivers-scsi-qla1280-disable.patch
-+ debian/dfsg/drivers-scsi-qlogicpti.patch
++ debian/dfsg/drivers-staging-me4000-disable.patch
++ debian/dfsg/drivers-staging-otus-disable.patch
++ debian/dfsg/drivers-staging-rt2860-disable.patch
++ debian/dfsg/drivers-staging-rt2870-disable.patch
+ debian/dfsg/firmware-cleanup.patch
+ debian/dfsg/sound-pci.patch
X debian/dfsg/files-1
More information about the Kernel-svn-changes
mailing list