update to 2.6.29-rc5
- all stable patches dropped - tg3 finaly uses firmware_request(), corresponding patches dropped. - nuke acenic, tg3, e100, cassini, starfire, cxgb3 firmware on orig tarball generation. - no longer disable acenic. - update firmware-cleanup.patch to all those new ones. - trivial update scripts-kconfig-reportoldconfig.patch - disable some arm feature patches that no longer apply svn path=/dists/trunk/linux-2.6/; revision=12854
This commit is contained in:
Maximilian Attems
parent
e29339c773
commit
6ad66037fa
|
|
@ -1,3 +1,15 @@
|
|||
linux-2.6 (2.6.29~rc5-1~experimental.1) UNRELEASED; urgency=low
|
||||
|
||||
* New upstream release
|
||||
- tg3 use request_firmware and firmware nuked
|
||||
- acenic use request_firmware and firmware nuked
|
||||
- e100 use request_firmware and firmware nuked
|
||||
- cassini use request_firmware and firmware nuked
|
||||
- starfire use request_firmware and firmware nuked
|
||||
- cxgb3 use request_firmware and firmware nuked
|
||||
|
||||
-- maximilian attems <maks@debian.org> Thu, 19 Feb 2009 13:25:20 +0100
|
||||
|
||||
linux-2.6 (2.6.28-2) UNRELEASED; urgency=low
|
||||
|
||||
[ Martin Michlmayr ]
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
|
||||
index 5b9e17b..5a827af 100644
|
||||
--- a/drivers/net/Kconfig
|
||||
+++ b/drivers/net/Kconfig
|
||||
@@ -1983,6 +1983,7 @@ if NETDEV_1000
|
||||
|
||||
config ACENIC
|
||||
tristate "Alteon AceNIC/3Com 3C985/NetGear GA620 Gigabit support"
|
||||
+ depends on BROKEN
|
||||
depends on PCI
|
||||
---help---
|
||||
Say Y here if you have an Alteon AceNIC, 3Com 3C985(B), NetGear
|
||||
|
|
@ -1,283 +0,0 @@
|
|||
--- a/drivers/net/Kconfig
|
||||
+++ b/drivers/net/Kconfig
|
||||
@@ -2229,7 +2229,6 @@
|
||||
|
||||
config TIGON3
|
||||
tristate "Broadcom Tigon3 support"
|
||||
- depends on BROKEN
|
||||
depends on PCI
|
||||
select PHYLIB
|
||||
help
|
||||
--- a/drivers/net/tg3.c
|
||||
+++ b/drivers/net/tg3.c
|
||||
@@ -5124,11 +5124,6 @@
|
||||
}
|
||||
|
||||
|
||||
-#define RX_CPU_SCRATCH_BASE 0x30000
|
||||
-#define RX_CPU_SCRATCH_SIZE 0x04000
|
||||
-#define TX_CPU_SCRATCH_BASE 0x34000
|
||||
-#define TX_CPU_SCRATCH_SIZE 0x04000
|
||||
-
|
||||
/* tp->lock is held. */
|
||||
static int tg3_halt_cpu(struct tg3 *tp, u32 offset)
|
||||
{
|
||||
@@ -5177,205 +5172,6 @@
|
||||
return 0;
|
||||
}
|
||||
|
||||
-struct fw_info {
|
||||
- unsigned int text_base;
|
||||
- unsigned int text_len;
|
||||
- const u32 *text_data;
|
||||
- unsigned int rodata_base;
|
||||
- unsigned int rodata_len;
|
||||
- const u32 *rodata_data;
|
||||
- unsigned int data_base;
|
||||
- unsigned int data_len;
|
||||
- const u32 *data_data;
|
||||
-};
|
||||
-
|
||||
-/* tp->lock is held. */
|
||||
-static int tg3_load_firmware_cpu(struct tg3 *tp, u32 cpu_base, u32 cpu_scratch_base,
|
||||
- int cpu_scratch_size, struct fw_info *info)
|
||||
-{
|
||||
- int err, lock_err, i;
|
||||
- void (*write_op)(struct tg3 *, u32, u32);
|
||||
-
|
||||
- if (cpu_base == TX_CPU_BASE &&
|
||||
- (tp->tg3_flags2 & TG3_FLG2_5705_PLUS)) {
|
||||
- printk(KERN_ERR PFX "tg3_load_firmware_cpu: Trying to load "
|
||||
- "TX cpu firmware on %s which is 5705.\n",
|
||||
- tp->dev->name);
|
||||
- return -EINVAL;
|
||||
- }
|
||||
-
|
||||
- if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS)
|
||||
- write_op = tg3_write_mem;
|
||||
- else
|
||||
- write_op = tg3_write_indirect_reg32;
|
||||
-
|
||||
- /* It is possible that bootcode is still loading at this point.
|
||||
- * Get the nvram lock first before halting the cpu.
|
||||
- */
|
||||
- lock_err = tg3_nvram_lock(tp);
|
||||
- err = tg3_halt_cpu(tp, cpu_base);
|
||||
- if (!lock_err)
|
||||
- tg3_nvram_unlock(tp);
|
||||
- if (err)
|
||||
- goto out;
|
||||
-
|
||||
- for (i = 0; i < cpu_scratch_size; i += sizeof(u32))
|
||||
- write_op(tp, cpu_scratch_base + i, 0);
|
||||
- tw32(cpu_base + CPU_STATE, 0xffffffff);
|
||||
- tw32(cpu_base + CPU_MODE, tr32(cpu_base+CPU_MODE)|CPU_MODE_HALT);
|
||||
- for (i = 0; i < (info->text_len / sizeof(u32)); i++)
|
||||
- write_op(tp, (cpu_scratch_base +
|
||||
- (info->text_base & 0xffff) +
|
||||
- (i * sizeof(u32))),
|
||||
- (info->text_data ?
|
||||
- info->text_data[i] : 0));
|
||||
- for (i = 0; i < (info->rodata_len / sizeof(u32)); i++)
|
||||
- write_op(tp, (cpu_scratch_base +
|
||||
- (info->rodata_base & 0xffff) +
|
||||
- (i * sizeof(u32))),
|
||||
- (info->rodata_data ?
|
||||
- info->rodata_data[i] : 0));
|
||||
- for (i = 0; i < (info->data_len / sizeof(u32)); i++)
|
||||
- write_op(tp, (cpu_scratch_base +
|
||||
- (info->data_base & 0xffff) +
|
||||
- (i * sizeof(u32))),
|
||||
- (info->data_data ?
|
||||
- info->data_data[i] : 0));
|
||||
-
|
||||
- err = 0;
|
||||
-
|
||||
-out:
|
||||
- return err;
|
||||
-}
|
||||
-
|
||||
-/* tp->lock is held. */
|
||||
-static int tg3_load_5701_a0_firmware_fix(struct tg3 *tp)
|
||||
-{
|
||||
- struct fw_info info;
|
||||
- int err, i;
|
||||
-
|
||||
- info.text_base = TG3_FW_TEXT_ADDR;
|
||||
- info.text_len = TG3_FW_TEXT_LEN;
|
||||
- info.text_data = &tg3FwText[0];
|
||||
- info.rodata_base = TG3_FW_RODATA_ADDR;
|
||||
- info.rodata_len = TG3_FW_RODATA_LEN;
|
||||
- info.rodata_data = &tg3FwRodata[0];
|
||||
- info.data_base = TG3_FW_DATA_ADDR;
|
||||
- info.data_len = TG3_FW_DATA_LEN;
|
||||
- info.data_data = NULL;
|
||||
-
|
||||
- err = tg3_load_firmware_cpu(tp, RX_CPU_BASE,
|
||||
- RX_CPU_SCRATCH_BASE, RX_CPU_SCRATCH_SIZE,
|
||||
- &info);
|
||||
- if (err)
|
||||
- return err;
|
||||
-
|
||||
- err = tg3_load_firmware_cpu(tp, TX_CPU_BASE,
|
||||
- TX_CPU_SCRATCH_BASE, TX_CPU_SCRATCH_SIZE,
|
||||
- &info);
|
||||
- if (err)
|
||||
- return err;
|
||||
-
|
||||
- /* Now startup only the RX cpu. */
|
||||
- tw32(RX_CPU_BASE + CPU_STATE, 0xffffffff);
|
||||
- tw32_f(RX_CPU_BASE + CPU_PC, TG3_FW_TEXT_ADDR);
|
||||
-
|
||||
- for (i = 0; i < 5; i++) {
|
||||
- if (tr32(RX_CPU_BASE + CPU_PC) == TG3_FW_TEXT_ADDR)
|
||||
- break;
|
||||
- tw32(RX_CPU_BASE + CPU_STATE, 0xffffffff);
|
||||
- tw32(RX_CPU_BASE + CPU_MODE, CPU_MODE_HALT);
|
||||
- tw32_f(RX_CPU_BASE + CPU_PC, TG3_FW_TEXT_ADDR);
|
||||
- udelay(1000);
|
||||
- }
|
||||
- if (i >= 5) {
|
||||
- printk(KERN_ERR PFX "tg3_load_firmware fails for %s "
|
||||
- "to set RX CPU PC, is %08x should be %08x\n",
|
||||
- tp->dev->name, tr32(RX_CPU_BASE + CPU_PC),
|
||||
- TG3_FW_TEXT_ADDR);
|
||||
- return -ENODEV;
|
||||
- }
|
||||
- tw32(RX_CPU_BASE + CPU_STATE, 0xffffffff);
|
||||
- tw32_f(RX_CPU_BASE + CPU_MODE, 0x00000000);
|
||||
-
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-
|
||||
-
|
||||
-/* tp->lock is held. */
|
||||
-static int tg3_load_tso_firmware(struct tg3 *tp)
|
||||
-{
|
||||
- struct fw_info info;
|
||||
- unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
|
||||
- int err, i;
|
||||
-
|
||||
- if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
|
||||
- return 0;
|
||||
-
|
||||
- if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5705) {
|
||||
- info.text_base = TG3_TSO5_FW_TEXT_ADDR;
|
||||
- info.text_len = TG3_TSO5_FW_TEXT_LEN;
|
||||
- info.text_data = &tg3Tso5FwText[0];
|
||||
- info.rodata_base = TG3_TSO5_FW_RODATA_ADDR;
|
||||
- info.rodata_len = TG3_TSO5_FW_RODATA_LEN;
|
||||
- info.rodata_data = &tg3Tso5FwRodata[0];
|
||||
- info.data_base = TG3_TSO5_FW_DATA_ADDR;
|
||||
- info.data_len = TG3_TSO5_FW_DATA_LEN;
|
||||
- info.data_data = &tg3Tso5FwData[0];
|
||||
- cpu_base = RX_CPU_BASE;
|
||||
- cpu_scratch_base = NIC_SRAM_MBUF_POOL_BASE5705;
|
||||
- cpu_scratch_size = (info.text_len +
|
||||
- info.rodata_len +
|
||||
- info.data_len +
|
||||
- TG3_TSO5_FW_SBSS_LEN +
|
||||
- TG3_TSO5_FW_BSS_LEN);
|
||||
- } else {
|
||||
- info.text_base = TG3_TSO_FW_TEXT_ADDR;
|
||||
- info.text_len = TG3_TSO_FW_TEXT_LEN;
|
||||
- info.text_data = &tg3TsoFwText[0];
|
||||
- info.rodata_base = TG3_TSO_FW_RODATA_ADDR;
|
||||
- info.rodata_len = TG3_TSO_FW_RODATA_LEN;
|
||||
- info.rodata_data = &tg3TsoFwRodata[0];
|
||||
- info.data_base = TG3_TSO_FW_DATA_ADDR;
|
||||
- info.data_len = TG3_TSO_FW_DATA_LEN;
|
||||
- info.data_data = &tg3TsoFwData[0];
|
||||
- cpu_base = TX_CPU_BASE;
|
||||
- cpu_scratch_base = TX_CPU_SCRATCH_BASE;
|
||||
- cpu_scratch_size = TX_CPU_SCRATCH_SIZE;
|
||||
- }
|
||||
-
|
||||
- err = tg3_load_firmware_cpu(tp, cpu_base,
|
||||
- cpu_scratch_base, cpu_scratch_size,
|
||||
- &info);
|
||||
- if (err)
|
||||
- return err;
|
||||
-
|
||||
- /* Now startup the cpu. */
|
||||
- tw32(cpu_base + CPU_STATE, 0xffffffff);
|
||||
- tw32_f(cpu_base + CPU_PC, info.text_base);
|
||||
-
|
||||
- for (i = 0; i < 5; i++) {
|
||||
- if (tr32(cpu_base + CPU_PC) == info.text_base)
|
||||
- break;
|
||||
- tw32(cpu_base + CPU_STATE, 0xffffffff);
|
||||
- tw32(cpu_base + CPU_MODE, CPU_MODE_HALT);
|
||||
- tw32_f(cpu_base + CPU_PC, info.text_base);
|
||||
- udelay(1000);
|
||||
- }
|
||||
- if (i >= 5) {
|
||||
- printk(KERN_ERR PFX "tg3_load_tso_firmware fails for %s "
|
||||
- "to set CPU PC, is %08x should be %08x\n",
|
||||
- tp->dev->name, tr32(cpu_base + CPU_PC),
|
||||
- info.text_base);
|
||||
- return -ENODEV;
|
||||
- }
|
||||
- tw32(cpu_base + CPU_STATE, 0xffffffff);
|
||||
- tw32_f(cpu_base + CPU_MODE, 0x00000000);
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
-
|
||||
/* tp->lock is held. */
|
||||
static void __tg3_set_mac_addr(struct tg3 *tp, int skip_mac_1)
|
||||
{
|
||||
@@ -5590,18 +5386,8 @@
|
||||
tw32(BUFMGR_DMA_DESC_POOL_SIZE, NIC_SRAM_DMA_DESC_POOL_SIZE);
|
||||
}
|
||||
else if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) {
|
||||
- int fw_len;
|
||||
-
|
||||
- fw_len = (TG3_TSO5_FW_TEXT_LEN +
|
||||
- TG3_TSO5_FW_RODATA_LEN +
|
||||
- TG3_TSO5_FW_DATA_LEN +
|
||||
- TG3_TSO5_FW_SBSS_LEN +
|
||||
- TG3_TSO5_FW_BSS_LEN);
|
||||
- fw_len = (fw_len + (0x80 - 1)) & ~(0x80 - 1);
|
||||
- tw32(BUFMGR_MB_POOL_ADDR,
|
||||
- NIC_SRAM_MBUF_POOL_BASE5705 + fw_len);
|
||||
- tw32(BUFMGR_MB_POOL_SIZE,
|
||||
- NIC_SRAM_MBUF_POOL_SIZE5705 - fw_len - 0xa00);
|
||||
+ tw32(BUFMGR_MB_POOL_ADDR, NIC_SRAM_MBUF_POOL_BASE5705);
|
||||
+ tw32(BUFMGR_MB_POOL_SIZE, NIC_SRAM_MBUF_POOL_SIZE5705 - 0xa00);
|
||||
}
|
||||
|
||||
if (tp->dev->mtu <= ETH_DATA_LEN) {
|
||||
@@ -5980,18 +5766,6 @@
|
||||
tw32(SNDBDI_MODE, SNDBDI_MODE_ENABLE | SNDBDI_MODE_ATTN_ENABLE);
|
||||
tw32(SNDBDS_MODE, SNDBDS_MODE_ENABLE | SNDBDS_MODE_ATTN_ENABLE);
|
||||
|
||||
- if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0) {
|
||||
- err = tg3_load_5701_a0_firmware_fix(tp);
|
||||
- if (err)
|
||||
- return err;
|
||||
- }
|
||||
-
|
||||
- if (tp->tg3_flags2 & TG3_FLG2_TSO_CAPABLE) {
|
||||
- err = tg3_load_tso_firmware(tp);
|
||||
- if (err)
|
||||
- return err;
|
||||
- }
|
||||
-
|
||||
tp->tx_mode = TX_MODE_ENABLE;
|
||||
tw32_f(MAC_TX_MODE, tp->tx_mode);
|
||||
udelay(100);
|
||||
@@ -11284,6 +11058,12 @@
|
||||
goto err_out_iounmap;
|
||||
}
|
||||
|
||||
+ if (tp->pci_chip_rev_id == CHIPREV_ID_5701_A0) {
|
||||
+ printk(KERN_ERR PFX "5701 A0 firmware fix not available, aborting.\n");
|
||||
+ err = -ENODEV;
|
||||
+ goto err_out_iounmap;
|
||||
+ }
|
||||
+
|
||||
/* The EPB bridge inside 5714, 5715, and 5780 and any
|
||||
* device behind the EPB cannot support DMA addresses > 40-bit.
|
||||
* On 64-bit systems with IOMMU, use 40-bit dma_mask.
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
--- a/drivers/net/tg3.c
|
||||
+++ b/drivers/net/tg3.c
|
||||
@@ -5131,6 +5131,7 @@ static int tg3_halt(struct tg3 *tp, int kind, int silent)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+#ifdef REMOVE_DFSG
|
||||
#define TG3_FW_RELEASE_MAJOR 0x0
|
||||
#define TG3_FW_RELASE_MINOR 0x0
|
||||
#define TG3_FW_RELEASE_FIX 0x0
|
||||
@@ -5255,4 +5256,5 @@ u32 tg3FwData[(TG3_FW_DATA_LEN / sizeof(u32)) + 1] = {
|
||||
};
|
||||
#endif
|
||||
+#endif /* REMOVE_DFSG */
|
||||
|
||||
#define RX_CPU_SCRATCH_BASE 0x30000
|
||||
@@ -5433,6 +5435,7 @@ static int tg3_load_5701_a0_firmware_fix(struct tg3 *tp)
|
||||
}
|
||||
|
||||
|
||||
+#ifdef REMOVE_DFSG
|
||||
#define TG3_TSO_FW_RELEASE_MAJOR 0x1
|
||||
#define TG3_TSO_FW_RELASE_MINOR 0x6
|
||||
#define TG3_TSO_FW_RELEASE_FIX 0x0
|
||||
@@ -5936,4 +5939,5 @@ static const u32 tg3Tso5FwData[(TG3_TSO5_FW_DATA_LEN / 4) + 1] = {
|
||||
0x00000000, 0x00000000, 0x00000000,
|
||||
};
|
||||
+#endif /* REMOVE_DFSG */
|
||||
|
||||
/* tp->lock is held. */
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
--- a/drivers/net/Kconfig
|
||||
+++ b/drivers/net/Kconfig
|
||||
@@ -2229,6 +2229,7 @@ config VIA_VELOCITY
|
||||
|
||||
config TIGON3
|
||||
tristate "Broadcom Tigon3 support"
|
||||
+ depends on BROKEN
|
||||
depends on PCI
|
||||
select PHYLIB
|
||||
help
|
||||
--- a/drivers/net/tg3.c
|
||||
+++ b/drivers/net/tg3.c
|
||||
@@ -5,14 +5,6 @@
|
||||
* Copyright (C) 2001, 2002, 2003 Jeff Garzik (jgarzik@pobox.com)
|
||||
* Copyright (C) 2004 Sun Microsystems Inc.
|
||||
* Copyright (C) 2005-2007 Broadcom Corporation.
|
||||
- *
|
||||
- * Firmware is:
|
||||
- * Derived from proprietary unpublished source code,
|
||||
- * Copyright (C) 2000-2003 Broadcom Corporation.
|
||||
- *
|
||||
- * Permission is hereby granted for the distribution of this firmware
|
||||
- * data in hexadecimal or equivalent format, provided this copyright
|
||||
- * notice is accompanying it.
|
||||
*/
|
||||
|
||||
|
||||
|
|
@ -2,9 +2,13 @@ rm Documentation/netlabel/draft-ietf-cipso-ipsecurity-01.txt
|
|||
|
||||
rm firmware/*.HEX
|
||||
rm firmware/*.ihex
|
||||
rm firmware/acenic
|
||||
rm firmware/adaptec
|
||||
rm firmware/cpia2
|
||||
rm firmware/cxgb3
|
||||
rm firmware/dabusb
|
||||
rm firmware/dsp56k
|
||||
rm firmware/e100
|
||||
rm firmware/edgeport
|
||||
rm firmware/emi26
|
||||
rm firmware/emi62
|
||||
|
|
@ -13,14 +17,12 @@ rm firmware/kaweth
|
|||
rm firmware/keyspan
|
||||
rm firmware/korg
|
||||
rm firmware/sb16
|
||||
rm firmware/sun
|
||||
rm firmware/tigon
|
||||
rm firmware/ttusb-budget
|
||||
rm firmware/vicam
|
||||
rm firmware/yamaha
|
||||
|
||||
rm drivers/net/acenic_firmware.h
|
||||
|
||||
unifdef drivers/net/tg3.c -UREMOVE_DFSG
|
||||
|
||||
rm drivers/net/appletalk/cops.c
|
||||
rm drivers/net/appletalk/cops.h
|
||||
rm drivers/net/appletalk/cops_ffdrv.h
|
||||
|
|
|
|||
|
|
@ -1,14 +1,30 @@
|
|||
diff --git a/firmware/Makefile b/firmware/Makefile
|
||||
index 466106f..fea3504 100644
|
||||
--- a/firmware/Makefile
|
||||
+++ b/firmware/Makefile
|
||||
@@ -20,58 +20,8 @@
|
||||
@@ -20,75 +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.
|
||||
|
||||
-ifdef CONFIG_ACENIC_OMIT_TIGON_I
|
||||
-acenic-objs := acenic/tg2.bin
|
||||
-fw-shipped- += acenic/tg1.bin
|
||||
-else
|
||||
-acenic-objs := acenic/tg1.bin acenic/tg2.bin
|
||||
-endif
|
||||
-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_ATM_AMBASSADOR) += atmsar11.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
|
||||
-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_SMCTR) += tr_smctr.bin
|
||||
-fw-shipped-$(CONFIG_SND_KORG1212) += korg/k1212.dsp
|
||||
-fw-shipped-$(CONFIG_SND_MAESTRO3) += ess/maestro3_assp_kernel.fw \
|
||||
|
|
@ -19,6 +35,8 @@
|
|||
- sb16/ima_adpcm_capture.csp
|
||||
-fw-shipped-$(CONFIG_SND_YMFPCI) += yamaha/ds1_ctrl.fw yamaha/ds1_dsp.fw \
|
||||
- yamaha/ds1e_ctrl.fw
|
||||
-fw-shipped-$(CONFIG_TIGON3) += tigon/tg3.bin tigon/tg3_tso.bin \
|
||||
- tigon/tg3_tso5.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
|
||||
|
|
@ -46,7 +64,8 @@
|
|||
- keyspan/usa28.fw keyspan/usa28xa.fw keyspan/usa28xb.fw \
|
||||
- keyspan/usa28x.fw keyspan/usa49w.fw keyspan/usa49wlc.fw
|
||||
-endif
|
||||
-fw-shipped-$(CONFIG_USB_SERIAL_TI) += ti_3410.fw ti_5052.fw
|
||||
-fw-shipped-$(CONFIG_USB_SERIAL_TI) += ti_3410.fw ti_5052.fw \
|
||||
- mts_cdma.fw mts_gsm.fw mts_edge.fw
|
||||
-fw-shipped-$(CONFIG_USB_SERIAL_EDGEPORT) += edgeport/boot.fw edgeport/boot2.fw \
|
||||
- edgeport/down.fw edgeport/down2.fw
|
||||
-fw-shipped-$(CONFIG_USB_SERIAL_EDGEPORT_TI) += edgeport/down3.bin
|
||||
|
|
|
|||
|
|
@ -205,14 +205,14 @@ index ee5fe94..3efce9f 100644
|
|||
case S_STRING:
|
||||
case S_INT:
|
||||
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
|
||||
index 9d4cba1..439608b 100644
|
||||
index 6408fef..9d276f6 100644
|
||||
--- a/scripts/kconfig/expr.h
|
||||
+++ b/scripts/kconfig/expr.h
|
||||
@@ -100,6 +100,7 @@ struct symbol {
|
||||
#define SYMBOL_DEF_AUTO 0x20000
|
||||
#define SYMBOL_DEF3 0x40000
|
||||
#define SYMBOL_DEF4 0x80000
|
||||
+#define SYMBOL_CHANGED_REAL 0x100000
|
||||
@@ -106,6 +106,7 @@ struct symbol {
|
||||
#define SYMBOL_DEF_AUTO 0x20000 /* symbol.def[S_DEF_AUTO] is valid */
|
||||
#define SYMBOL_DEF3 0x40000 /* symbol.def[S_DEF_3] is valid */
|
||||
#define SYMBOL_DEF4 0x80000 /* symbol.def[S_DEF_4] is valid */
|
||||
+#define SYMBOL_CHANGED_REAL 0x100000
|
||||
|
||||
#define SYMBOL_MAXLENGTH 256
|
||||
#define SYMBOL_HASHSIZE 257
|
||||
|
|
|
|||
|
|
@ -1,12 +1,11 @@
|
|||
+ debian/version.patch
|
||||
+ debian/kernelvariables.patch
|
||||
#+ debian/kernelvariables.patch
|
||||
+ 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/dfsg/drivers-net-tg3-fix-simple.patch
|
||||
#+ debian/dfsg/drivers-net-bnx2-request_firmware-1.patch
|
||||
#+ features/all/drivers-net-acenic-firmwar_request.patch
|
||||
+ features/all/export-gfs2-locking-symbols.patch
|
||||
|
|
@ -23,12 +22,6 @@
|
|||
+ bugfix/powerpc/lpar-console.patch
|
||||
+ bugfix/all/sata_mv-clear_irq.patch
|
||||
#+ bugfix/all/wireless-regulatory-default-EU.patch
|
||||
+ features/arm/led-pca9532-mem-leak.patch
|
||||
+ features/arm/led-pca9532-workqueque.patch
|
||||
#+ features/arm/led-pca9532-mem-leak.patch
|
||||
#+ features/arm/led-pca9532-workqueque.patch
|
||||
+ features/sparc/video-sunxvr500-intergraph.patch
|
||||
+ bugfix/all/stable/patch-2.6.28.1
|
||||
+ bugfix/all/stable/patch-2.6.28.2
|
||||
+ bugfix/all/stable/patch-2.6.28.3
|
||||
+ bugfix/all/stable/patch-2.6.28.4
|
||||
+ bugfix/all/stable/patch-2.6.28.5
|
||||
+ bugfix/all/stable/patch-2.6.28.6
|
||||
|
|
@ -1,12 +1,9 @@
|
|||
+ debian/dfsg/drivers-net-tg3-mark.patch
|
||||
X debian/dfsg/files-1
|
||||
+ debian/dfsg/drivers-net-acenic-remove.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-tg3-remove.patch
|
||||
+ debian/dfsg/drivers-net-tokenring-3c359-smctr.patch
|
||||
+ debian/dfsg/drivers-scsi-qlogicpti.patch
|
||||
+ debian/dfsg/firmware-cleanup.patch
|
||||
|
|
|
|||
Loading…
Reference in New Issue