KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

update to 2.6.25.19, and refresh patches

Browse source 
SVN-Revision: 13137
This commit is contained in:
Gabor Juhos 2008-11-07 08:44:56 +00:00
parent a1bf28950d
commit d35bad03e3
119 changed files with 1615 additions and 1637 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/kernel-version.mk
View file

@ -22,8 +22,8 @@ endif
ifeq ($(LINUX_VERSION),2.6.24.7)
LINUX_KERNEL_MD5SUM:=40a73780d51525d28d36dec852c680c4
endif
ifeq ($(LINUX_VERSION),2.6.25.17)
LINUX_KERNEL_MD5SUM:=30618bff93fd4fd048e20a9a6aab8e5d
ifeq ($(LINUX_VERSION),2.6.25.19)
LINUX_KERNEL_MD5SUM:=1b20d2d2a5a0f119372a166eaf816e13
endif
ifeq ($(LINUX_VERSION),2.6.26.7)
LINUX_KERNEL_MD5SUM:=ada8af1e3ec15bd6e9bdbcadf23a9cc2

2
target/linux/at91/Makefile
View file

@ -11,7 +11,7 @@ BOARD:=at91
BOARDNAME:=Atmel AT91
FEATURES:=squashfs usb
LINUX_VERSION:=2.6.25.17
LINUX_VERSION:=2.6.25.19
include $(INCLUDE_DIR)/target.mk

430
target/linux/at91/patches-2.6.25/000-at91patches.patch
View file

File diff suppressed because it is too large Load diff

4
target/linux/at91/patches-2.6.25/001-vlink-machine.patch
View file

@ -1,6 +1,6 @@
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -151,6 +151,12 @@
@@ -151,6 +151,12 @@ config MACH_TT9200
help
Select this if you are using Toptech's TT9200 board.
@ -15,7 +15,7 @@
# ----------------------------------------------------------
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -29,6 +29,7 @@
@@ -29,6 +29,7 @@ obj-$(CONFIG_MACH_KB9200) += board-kb920
obj-$(CONFIG_MACH_ATEB9200) += board-eb9200.o
obj-$(CONFIG_MACH_KAFA) += board-kafa.o
obj-$(CONFIG_MACH_CHUB) += board-chub.o

6
target/linux/at91/patches-2.6.25/002-led-driver.patch
View file

@ -1,6 +1,6 @@
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@ -717,6 +717,26 @@
@@ -717,6 +717,26 @@ static void __init at91_add_device_watch
static void __init at91_add_device_watchdog(void) {}
#endif
@ -29,7 +29,7 @@
* SSC -- Synchronous Serial Controller
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -60,7 +60,12 @@
@@ -60,7 +60,12 @@ obj-$(CONFIG_MACH_AT91CAP9ADK) += board-
obj-$(CONFIG_MACH_AT91EB01) += board-eb01.o
# Drivers
@ -153,7 +153,7 @@
+__initcall(leds_init);
--- a/include/asm-arm/arch-at91/board.h
+++ b/include/asm-arm/arch-at91/board.h
@@ -162,6 +162,11 @@
@@ -162,6 +162,11 @@ extern void __init at91_add_device_ac97(
/* ISI */
extern void __init at91_add_device_isi(void);

20
target/linux/at91/patches-2.6.25/003-gpio-driver.patch
View file

@ -1,6 +1,6 @@
--- a/arch/arm/mach-at91/board-vlink.c
+++ b/arch/arm/mach-at91/board-vlink.c
@@ -99,7 +99,7 @@
@@ -99,7 +99,7 @@ static struct at91_udc_data __initdata v
*/
static struct at91_mmc_data __initdata vlink_mmc_data = {
@ -9,7 +9,7 @@
.slot_b = 0,
.wire4 = 1,
// .wp_pin = AT91_PIN_PA17,
@@ -136,6 +136,7 @@
@@ -136,6 +136,7 @@ static struct spi_board_info vlink_spi_d
static void __init vlink_board_init(void)
{
@ -17,7 +17,7 @@
/* Serial */
at91_add_device_serial();
/* Ethernet */
@@ -157,36 +158,66 @@
@@ -157,36 +158,66 @@ static void __init vlink_board_init(void
// at91_set_gpio_output(AT91_PIN_PB22, 1); /* this MMC card slot can optionally use SPI signaling (CS3). */
at91_add_device_mmc(0, &vlink_mmc_data);
#endif
@ -112,7 +112,7 @@
static inline void __iomem *pin_to_controller(unsigned pin)
@@ -71,9 +72,13 @@
@@ -71,9 +72,13 @@ int __init_or_module at91_set_GPIO_perip
{
void __iomem *pio = pin_to_controller(pin);
unsigned mask = pin_to_mask(pin);
@ -126,7 +126,7 @@
__raw_writel(mask, pio + PIO_IDR);
__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
__raw_writel(mask, pio + PIO_PER);
@@ -130,10 +135,13 @@
@@ -130,10 +135,13 @@ int __init_or_module at91_set_gpio_input
{
void __iomem *pio = pin_to_controller(pin);
unsigned mask = pin_to_mask(pin);
@ -140,7 +140,7 @@
__raw_writel(mask, pio + PIO_IDR);
__raw_writel(mask, pio + (use_pullup ? PIO_PUER : PIO_PUDR));
__raw_writel(mask, pio + PIO_ODR);
@@ -151,10 +159,13 @@
@@ -151,10 +159,13 @@ int __init_or_module at91_set_gpio_outpu
{
void __iomem *pio = pin_to_controller(pin);
unsigned mask = pin_to_mask(pin);
@ -154,7 +154,7 @@
__raw_writel(mask, pio + PIO_IDR);
__raw_writel(mask, pio + PIO_PUDR);
__raw_writel(mask, pio + (value ? PIO_SODR : PIO_CODR));
@@ -262,6 +273,18 @@
@@ -262,6 +273,18 @@ int at91_get_gpio_value(unsigned pin)
}
EXPORT_SYMBOL(at91_get_gpio_value);
@ -175,7 +175,7 @@
#ifdef CONFIG_PM
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -1072,5 +1072,12 @@
@@ -1072,5 +1072,12 @@ config AT91_SPIDEV
The SPI driver gives user mode access to this serial
bus on the AT91RM9200 processor.
@ -190,7 +190,7 @@
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -100,6 +100,7 @@
@@ -100,6 +100,7 @@ obj-$(CONFIG_GPIO_TB0219) += tb0219.o
obj-$(CONFIG_TELCLOCK) += tlclk.o
obj-$(CONFIG_AT91_SPI) += at91_spi.o
obj-$(CONFIG_AT91_SPIDEV) += at91_spidev.o
@ -536,7 +536,7 @@
+MODULE_DESCRIPTION("FDL Versalink GPIO Driver");
--- a/include/asm-arm/arch-at91/gpio.h
+++ b/include/asm-arm/arch-at91/gpio.h
@@ -199,6 +199,7 @@
@@ -199,6 +199,7 @@ extern int __init_or_module at91_set_mul
/* callable at any time */
extern int at91_set_gpio_value(unsigned pin, int value);
extern int at91_get_gpio_value(unsigned pin);

6
target/linux/at91/patches-2.6.25/007-mtd-partition.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/at91_dataflash.c
+++ b/drivers/mtd/devices/at91_dataflash.c
@@ -175,7 +175,7 @@
@@ -175,7 +175,7 @@ static struct mtd_partition static_parti
};
#endif
@ -11,7 +11,7 @@
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -168,6 +168,12 @@
@@ -168,6 +168,12 @@ config MTD_OF_PARTS
the partition map from the children of the flash node,
as described in Documentation/powerpc/booting-without-of.txt.
@ -26,7 +26,7 @@
config MTD_CHAR
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -12,6 +12,7 @@
@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o

16
target/linux/at91/patches-2.6.25/008-fdl-serial.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/serial/atmel_serial.c
+++ b/drivers/serial/atmel_serial.c
@@ -214,6 +214,34 @@
@@ -214,6 +214,34 @@ static void atmel_set_mctrl(struct uart_
at91_set_gpio_value(AT91_PIN_PA21, 0);
else
at91_set_gpio_value(AT91_PIN_PA21, 1);
@ -35,7 +35,7 @@
}
}
#endif
@@ -251,8 +279,10 @@
@@ -251,8 +279,10 @@ static u_int atmel_get_mctrl(struct uart
/*
* The control signals are active low.
*/
@ -48,7 +48,7 @@
if (!(status & ATMEL_US_CTS))
ret |= TIOCM_CTS;
if (!(status & ATMEL_US_DSR))
@@ -260,6 +290,16 @@
@@ -260,6 +290,16 @@ static u_int atmel_get_mctrl(struct uart
if (!(status & ATMEL_US_RI))
ret |= TIOCM_RI;
@ -65,7 +65,7 @@
return ret;
}
@@ -453,6 +493,34 @@
@@ -453,6 +493,34 @@ static void atmel_tx_chars(struct uart_p
}
/*
@ -100,7 +100,7 @@
* receive interrupt handler.
*/
static void
@@ -815,6 +883,23 @@
@@ -815,6 +883,23 @@ static int atmel_startup(struct uart_por
return retval;
}
@ -124,7 +124,7 @@
/*
* Initialize DMA (if necessary)
*/
@@ -834,6 +919,10 @@
@@ -834,6 +919,10 @@ static int atmel_startup(struct uart_por
kfree(atmel_port->pdc_rx[0].buf);
}
free_irq(port->irq, port);
@ -135,7 +135,7 @@
return -ENOMEM;
}
pdc->dma_addr = dma_map_single(port->dev,
@@ -873,7 +962,11 @@
@@ -873,7 +962,11 @@ static int atmel_startup(struct uart_por
retval = atmel_open_hook(port);
if (retval) {
free_irq(port->irq, port);
@ -148,7 +148,7 @@
}
}
@@ -947,6 +1040,10 @@
@@ -947,6 +1040,10 @@ static void atmel_shutdown(struct uart_p
* Free the interrupt
*/
free_irq(port->irq, port);

4
target/linux/at91/patches-2.6.25/009-fdl-uartinit.patch
View file

@ -1,6 +1,6 @@
--- a/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@ -1001,7 +1001,15 @@
@@ -1001,7 +1001,15 @@ static inline void configure_usart0_pins
* We need to drive the pin manually. Default is off (RTS is active low).
*/
at91_set_gpio_output(AT91_PIN_PA21, 1);
@ -17,7 +17,7 @@
}
static struct resource uart1_resources[] = {
@@ -1139,6 +1147,14 @@
@@ -1139,6 +1147,14 @@ static inline void configure_usart3_pins
at91_set_B_periph(AT91_PIN_PB1, 0); /* CTS3 */
if (pins & ATMEL_UART_RTS)
at91_set_B_periph(AT91_PIN_PB0, 0); /* RTS3 */

4
target/linux/at91/patches-2.6.25/010-dm9161a-phyfix.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -146,6 +146,7 @@
@@ -146,6 +146,7 @@ static void update_linkspeed(struct net_
struct at91_private *lp = netdev_priv(dev);
unsigned int bmsr, bmcr, lpa, mac_cfg;
unsigned int speed, duplex;
@ -8,7 +8,7 @@
if (!mii_link_ok(&lp->mii)) { /* no link */
netif_carrier_off(dev);
@@ -158,8 +159,15 @@
@@ -158,8 +159,15 @@ static void update_linkspeed(struct net_
read_phy(lp->phy_address, MII_BMSR, &bmsr);
read_phy(lp->phy_address, MII_BMCR, &bmcr);
if (bmcr & BMCR_ANENABLE) { /* AutoNegotiation is enabled */

2
target/linux/at91/patches-2.6.25/014-initpartition.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/at91_dataflash.c
+++ b/drivers/mtd/devices/at91_dataflash.c
@@ -163,12 +163,12 @@
@@ -163,12 +163,12 @@ static struct mtd_partition static_parti
.mask_flags = MTD_WRITEABLE, /* read-only */
},
{

2
target/linux/at91/patches-2.6.25/017-usb_serial_endpoint_size.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -904,7 +904,7 @@
@@ -904,7 +904,7 @@ int usb_serial_probe(struct usb_interfac
dev_err(&interface->dev, "No free urbs available\n");
goto probe_error;
}

2
target/linux/au1000/Makefile
View file

@ -11,7 +11,7 @@ BOARD:=au1000
BOARDNAME:=RMI/AMD AU1x00
FEATURES:=jffs2 usb pci
LINUX_VERSION:=2.6.25.17
LINUX_VERSION:=2.6.25.19
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += yamonenv

2
target/linux/au1000/patches/001-au1000_gpio_kconfig.patch
View file

@ -12,7 +12,7 @@ Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
--- a/arch/mips/au1000/Kconfig
+++ b/arch/mips/au1000/Kconfig
@@ -135,3 +135,4 @@
@@ -135,3 +135,4 @@ config SOC_AU1X00
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_APM_EMULATION
select SYS_SUPPORTS_KGDB

2
target/linux/au1000/patches/002-sys_btn_gpio.patch
View file

@ -37,7 +37,7 @@ Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
static struct resource mtx1_wdt_res[] = {
[0] = {
.start = 15,
@@ -62,11 +85,13 @@
@@ -62,11 +85,13 @@ static struct platform_device mtx1_gpio_
static struct platform_device *mtx1_devs[] = {
&mtx1_gpio_leds,

2
target/linux/au1000/patches/005-au1000_eth_link_beat.patch
View file

@ -10,7 +10,7 @@
* ########################################################################
*
* This program is free software; you can distribute it and/or modify it
@@ -835,6 +838,10 @@
@@ -835,6 +838,10 @@ static int au1000_init(struct net_device
control = MAC_RX_ENABLE | MAC_TX_ENABLE;
#ifndef CONFIG_CPU_LITTLE_ENDIAN

2
target/linux/au1000/patches/012-mtx1_cmdline.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/au1000/mtx-1/init.c
+++ b/arch/mips/au1000/mtx-1/init.c
@@ -54,7 +54,7 @@
@@ -54,7 +54,7 @@ void __init prom_init(void)
prom_argv = (char **) fw_arg1;
prom_envp = (char **) fw_arg2;

2
target/linux/au1000/patches/013-openwrt_rootfs.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/maps/mtx-1_flash.c
+++ b/drivers/mtd/maps/mtx-1_flash.c
@@ -28,7 +28,7 @@
@@ -28,7 +28,7 @@ static struct map_info mtx1_map = {
static struct mtd_partition mtx1_partitions[] = {
{

2
target/linux/au1000/patches/014-au1000_eth_ioctl.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/net/au1000_eth.c
+++ b/drivers/net/au1000_eth.c
@@ -1306,9 +1306,12 @@
@@ -1306,9 +1306,12 @@ static void set_rx_mode(struct net_devic
}
}

2
target/linux/au1000/patches/016-net-irq.patch
View file

@ -1,6 +1,6 @@
--- a/include/asm-mips/mach-au1x00/au1000.h
+++ b/include/asm-mips/mach-au1x00/au1000.h
@@ -623,6 +623,7 @@
@@ -623,6 +623,7 @@ enum soc_au1500_ints {
AU1000_RTC_MATCH1_INT,
AU1000_RTC_MATCH2_INT,
AU1500_PCI_ERR_INT,

4
target/linux/au1000/patches/017-gpio-dir.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/au1000/common/gpio.c
+++ b/arch/mips/au1000/common/gpio.c
@@ -66,7 +66,8 @@
@@ -66,7 +66,8 @@ static int au1xxx_gpio2_direction_input(
static int au1xxx_gpio2_direction_output(unsigned gpio, int value)
{
gpio -= AU1XXX_GPIO_BASE;
@ -10,7 +10,7 @@
return 0;
}
@@ -95,6 +96,7 @@
@@ -95,6 +96,7 @@ static int au1xxx_gpio1_direction_input(
static int au1xxx_gpio1_direction_output(unsigned gpio, int value)
{
gpio1->trioutclr = (0x01 & gpio);

2
target/linux/avr32/Makefile
View file

@ -10,7 +10,7 @@ ARCH:=avr32
BOARD:=avr32
BOARDNAME:=Atmel AVR32
FEATURES:=squashfs
LINUX_VERSION:=2.6.25.17
LINUX_VERSION:=2.6.25.19
include $(INCLUDE_DIR)/target.mk

568
target/linux/avr32/patches/100-git_sync.patch
View file

File diff suppressed because it is too large Load diff

2
target/linux/avr32/patches/110-openwrt_flashmap.patch
View file

@ -1,6 +1,6 @@
--- a/arch/avr32/boards/atngw100/flash.c
+++ b/arch/avr32/boards/atngw100/flash.c
@@ -45,9 +45,14 @@
@@ -45,9 +45,14 @@ static struct mtd_partition flash_parts[
.mask_flags = MTD_WRITEABLE,
},
{

2
target/linux/brcm47xx/Makefile
View file

@ -11,7 +11,7 @@ BOARD:=brcm47xx
BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs usb
LINUX_VERSION:=2.6.25.17
LINUX_VERSION:=2.6.25.19
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += kmod-switch kmod-diag

4
target/linux/brcm47xx/patches-2.6.25/100-board_support.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -50,8 +50,10 @@
@@ -50,8 +50,10 @@ config BCM47XX
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_LITTLE_ENDIAN
select SSB
@ -11,7 +11,7 @@
select SSB_PCICORE_HOSTMODE if PCI
select GENERIC_GPIO
select SYS_HAS_EARLY_PRINTK
@@ -790,6 +792,7 @@
@@ -790,6 +792,7 @@ config CSRC_SB1250
config CFE
bool

4
target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -337,6 +337,12 @@
@@ -337,6 +337,12 @@ config MTD_CFI_FLAGADM
Mapping for the Flaga digital module. If you don't have one, ignore
this setting.
@ -15,7 +15,7 @@
depends on MTD_JEDECPROBE && WALNUT && !PPC_MERGE
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -31,6 +31,7 @@
@@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcm
obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o
obj-$(CONFIG_MTD_RPXLITE) += rpxlite.o
obj-$(CONFIG_MTD_TQM8XXL) += tqm8xxl.o

12
target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -228,7 +228,6 @@
@@ -228,7 +228,6 @@ config MIPS_MALTA
select I8259
select MIPS_BOARDS_GEN
select MIPS_BONITO64
@ -8,7 +8,7 @@
select PCI_GT64XXX_PCI0
select MIPS_MSC
select SWAP_IO_SPACE
@@ -1421,13 +1420,6 @@
@@ -1421,13 +1420,6 @@ config IP22_CPU_SCACHE
bool
select BOARD_SCACHE
@ -24,7 +24,7 @@
select BOARD_SCACHE
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -704,6 +704,8 @@
@@ -704,6 +704,8 @@ static inline void cpu_probe_mips(struct
break;
case PRID_IMP_25KF:
c->cputype = CPU_25KF;
@ -35,7 +35,7 @@
c->cputype = CPU_34K;
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -1103,7 +1103,6 @@
@@ -1103,7 +1103,6 @@ static void __init loongson2_sc_init(voi
extern int r5k_sc_init(void);
extern int rm7k_sc_init(void);
@ -43,7 +43,7 @@
static void __cpuinit setup_scache(void)
{
@@ -1157,29 +1156,17 @@
@@ -1157,29 +1156,17 @@ static void __cpuinit setup_scache(void)
#endif
default:
@ -80,7 +80,7 @@
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
@@ -32,6 +32,5 @@
@@ -32,6 +32,5 @@ obj-$(CONFIG_CPU_VR41XX) += c-r4k.o cex-
obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
obj-$(CONFIG_R5000_CPU_SCACHE) += sc-r5k.o
obj-$(CONFIG_RM7000_CPU_SCACHE) += sc-rm7k.o

42
target/linux/brcm47xx/patches-2.6.25/150-cpu_fixes.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/kernel/genex.S
+++ b/arch/mips/kernel/genex.S
@@ -51,6 +51,10 @@
@@ -51,6 +51,10 @@ NESTED(except_vec1_generic, 0, sp)
NESTED(except_vec3_generic, 0, sp)
.set push
.set noat
@ -23,7 +23,7 @@
/*
* Special Variant of smp_call_function for use by cache functions:
*
@@ -97,6 +100,9 @@
@@ -97,6 +100,9 @@ static void __cpuinit r4k_blast_dcache_p
{
unsigned long dc_lsize = cpu_dcache_line_size();
@ -33,7 +33,7 @@
if (dc_lsize == 0)
r4k_blast_dcache_page = (void *)cache_noop;
else if (dc_lsize == 16)
@@ -111,6 +117,9 @@
@@ -111,6 +117,9 @@ static void __cpuinit r4k_blast_dcache_p
{
unsigned long dc_lsize = cpu_dcache_line_size();
@ -43,7 +43,7 @@
if (dc_lsize == 0)
r4k_blast_dcache_page_indexed = (void *)cache_noop;
else if (dc_lsize == 16)
@@ -125,6 +134,9 @@
@@ -125,6 +134,9 @@ static void __cpuinit r4k_blast_dcache_s
{
unsigned long dc_lsize = cpu_dcache_line_size();
@ -53,7 +53,7 @@
if (dc_lsize == 0)
r4k_blast_dcache = (void *)cache_noop;
else if (dc_lsize == 16)
@@ -630,6 +642,8 @@
@@ -630,6 +642,8 @@ static void local_r4k_flush_cache_sigtra
unsigned long addr = (unsigned long) arg;
R4600_HIT_CACHEOP_WAR_IMPL;
@ -62,7 +62,7 @@
if (dc_lsize)
protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
if (!cpu_icache_snoops_remote_store && scache_size)
@@ -1215,6 +1229,17 @@
@@ -1215,6 +1229,17 @@ static void __cpuinit coherency_setup(vo
* silly idea of putting something else there ...
*/
switch (current_cpu_type()) {
@ -80,7 +80,7 @@
case CPU_R4000PC:
case CPU_R4000SC:
case CPU_R4000MC:
@@ -1254,6 +1279,15 @@
@@ -1254,6 +1279,15 @@ void __cpuinit r4k_cache_init(void)
break;
}
@ -96,7 +96,7 @@
probe_pcache();
setup_scache();
@@ -1303,5 +1337,13 @@
@@ -1303,5 +1337,13 @@ void __cpuinit r4k_cache_init(void)
build_clear_page();
build_copy_page();
local_r4k___flush_cache_all(NULL);
@ -112,7 +112,7 @@
}
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -677,6 +677,9 @@
@@ -677,6 +677,9 @@ static void __cpuinit build_r4000_tlb_re
/* No need for uasm_i_nop */
}
@ -122,7 +122,7 @@
#ifdef CONFIG_64BIT
build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
#else
@@ -1084,6 +1087,9 @@
@@ -1084,6 +1087,9 @@ build_r4000_tlbchange_handler_head(u32 *
struct uasm_reloc **r, unsigned int pte,
unsigned int ptr)
{
@ -155,7 +155,7 @@
/*
* This macro return a properly sign-extended address suitable as base address
* for indexed cache operations. Two issues here:
@@ -150,6 +164,7 @@
@@ -150,6 +164,7 @@ static inline void flush_icache_line_ind
static inline void flush_dcache_line_indexed(unsigned long addr)
{
__dflush_prologue
@ -163,7 +163,7 @@
cache_op(Index_Writeback_Inv_D, addr);
__dflush_epilogue
}
@@ -169,6 +184,7 @@
@@ -169,6 +184,7 @@ static inline void flush_icache_line(uns
static inline void flush_dcache_line(unsigned long addr)
{
__dflush_prologue
@ -171,7 +171,7 @@
cache_op(Hit_Writeback_Inv_D, addr);
__dflush_epilogue
}
@@ -176,6 +192,7 @@
@@ -176,6 +192,7 @@ static inline void flush_dcache_line(uns
static inline void invalidate_dcache_line(unsigned long addr)
{
__dflush_prologue
@ -179,7 +179,7 @@
cache_op(Hit_Invalidate_D, addr);
__dflush_epilogue
}
@@ -208,6 +225,7 @@
@@ -208,6 +225,7 @@ static inline void flush_scache_line(uns
*/
static inline void protected_flush_icache_line(unsigned long addr)
{
@ -187,7 +187,7 @@
protected_cache_op(Hit_Invalidate_I, addr);
}
@@ -219,6 +237,7 @@
@@ -219,6 +237,7 @@ static inline void protected_flush_icach
*/
static inline void protected_writeback_dcache_line(unsigned long addr)
{
@ -195,7 +195,7 @@
protected_cache_op(Hit_Writeback_Inv_D, addr);
}
@@ -339,8 +358,52 @@
@@ -339,8 +358,52 @@ static inline void invalidate_tcache_pag
: "r" (base), \
"i" (op));
@ -249,7 +249,7 @@
static inline void blast_##pfx##cache##lsize(void) \
{ \
unsigned long start = INDEX_BASE; \
@@ -352,6 +415,7 @@
@@ -352,6 +415,7 @@ static inline void blast_##pfx##cache##l
\
__##pfx##flush_prologue \
\
@ -257,7 +257,7 @@
for (ws = 0; ws < ws_end; ws += ws_inc) \
for (addr = start; addr < end; addr += lsize * 32) \
cache##lsize##_unroll32(addr|ws, indexop); \
@@ -366,6 +430,7 @@
@@ -366,6 +430,7 @@ static inline void blast_##pfx##cache##l
\
__##pfx##flush_prologue \
\
@ -265,7 +265,7 @@
do { \
cache##lsize##_unroll32(start, hitop); \
start += lsize * 32; \
@@ -384,6 +449,8 @@
@@ -384,6 +449,8 @@ static inline void blast_##pfx##cache##l
current_cpu_data.desc.waybit; \
unsigned long ws, addr; \
\
@ -274,7 +274,7 @@
__##pfx##flush_prologue \
\
for (ws = 0; ws < ws_end; ws += ws_inc) \
@@ -393,35 +460,37 @@
@@ -393,35 +460,37 @@ static inline void blast_##pfx##cache##l
__##pfx##flush_epilogue \
}
@ -329,7 +329,7 @@
prot##cache_op(hitop, addr); \
if (addr == aend) \
break; \
@@ -431,13 +500,13 @@
@@ -431,13 +500,13 @@ static inline void prot##blast_##pfx##ca
__##pfx##flush_epilogue \
}

10
target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -211,7 +211,7 @@
@@ -211,7 +211,7 @@ void copy_user_highpage(struct page *to,
void *vfrom, *vto;
vto = kmap_atomic(to, KM_USER1);
@ -9,7 +9,7 @@
page_mapped(from) && !Page_dcache_dirty(from)) {
vfrom = kmap_coherent(from, vaddr);
copy_page(vto, vfrom);
@@ -235,7 +235,7 @@
@@ -235,7 +235,7 @@ void copy_to_user_page(struct vm_area_st
struct page *page, unsigned long vaddr, void *dst, const void *src,
unsigned long len)
{
@ -18,7 +18,7 @@
page_mapped(page) && !Page_dcache_dirty(page)) {
void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
memcpy(vto, src, len);
@@ -255,7 +255,7 @@
@@ -255,7 +255,7 @@ void copy_from_user_page(struct vm_area_
struct page *page, unsigned long vaddr, void *dst, const void *src,
unsigned long len)
{
@ -57,7 +57,7 @@
* I-Cache snoops remote store. This only matters on SMP. Some multiprocessors
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -484,7 +484,7 @@
@@ -484,7 +484,7 @@ static inline void local_r4k_flush_cache
* Use kmap_coherent or kmap_atomic to do flushes for
* another ASID than the current one.
*/
@ -66,7 +66,7 @@
vaddr = kmap_coherent(page, addr);
else
vaddr = kmap_atomic(page, KM_USER0);
@@ -505,7 +505,7 @@
@@ -505,7 +505,7 @@ static inline void local_r4k_flush_cache
}
if (vaddr) {

6
target/linux/brcm47xx/patches-2.6.25/210-b44_phy_fix.patch
View file

@ -1,7 +1,5 @@
Index: linux-2.6.25.17/drivers/net/b44.c
===================================================================
--- linux-2.6.25.17.orig/drivers/net/b44.c 2008-10-16 23:13:19.000000000 +0200
+++ linux-2.6.25.17/drivers/net/b44.c 2008-11-02 12:13:38.000000000 +0100
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -339,7 +339,7 @@ static int b44_phy_reset(struct b44 *bp)
}
}

8
target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/ssb/driver_chipcommon.c
+++ b/drivers/ssb/driver_chipcommon.c
@@ -270,6 +270,8 @@
@@ -270,6 +270,8 @@ void ssb_chipco_resume(struct ssb_chipco
void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
u32 *plltype, u32 *n, u32 *m)
{
@ -9,7 +9,7 @@
*n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
*plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
switch (*plltype) {
@@ -293,6 +295,8 @@
@@ -293,6 +295,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
u32 *plltype, u32 *n, u32 *m)
{
@ -20,7 +20,7 @@
switch (*plltype) {
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
@@ -161,6 +161,8 @@
@@ -161,6 +161,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
if ((pll_type == SSB_PLLTYPE_5) || (bus->chip_id == 0x5365)) {
rate = 200000000;
@ -31,7 +31,7 @@
}
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -867,6 +867,8 @@
@@ -867,6 +867,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
if (bus->chip_id == 0x5365) {
rate = 100000000;

4
target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/usb/host/ohci-ssb.c
+++ b/drivers/usb/host/ohci-ssb.c
@@ -142,10 +142,59 @@
@@ -142,10 +142,59 @@ static int ssb_ohci_attach(struct ssb_de
int err = -ENOMEM;
u32 tmp, flags = 0;
@ -62,7 +62,7 @@
hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
dev->dev->bus_id);
@@ -236,6 +285,7 @@
@@ -236,6 +285,7 @@ static int ssb_ohci_resume(struct ssb_de
static const struct ssb_device_id ssb_ohci_table[] = {
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),

2
target/linux/brcm47xx/patches-2.6.25/260-ohci-set-dma-mask.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/usb/host/ohci-ssb.c
+++ b/drivers/usb/host/ohci-ssb.c
@@ -195,6 +195,11 @@
@@ -195,6 +195,11 @@ static int ssb_ohci_attach(struct ssb_de
else
ssb_device_enable(dev, 0);

4
target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -205,32 +205,6 @@
@@ -205,32 +205,6 @@ void kunmap_coherent(void)
preempt_check_resched();
}
@ -43,7 +43,7 @@
#include <asm/io.h>
/*
@@ -64,13 +65,16 @@
@@ -64,13 +65,16 @@ static inline void clear_user_page(void
flush_data_cache_page((unsigned long)addr);
}

10
target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch
View file

@ -27,7 +27,7 @@
void plat_irq_dispatch(void)
{
u32 cause;
@@ -53,3 +63,19 @@
@@ -53,3 +63,19 @@ void __init arch_init_irq(void)
{
mips_cpu_irq_init();
}
@ -115,7 +115,7 @@
while (1)
cpu_relax();
}
@@ -50,12 +79,13 @@
@@ -50,12 +79,13 @@ static void bcm47xx_machine_halt(void)
{
/* Disable interrupts and watchdog and spin forever */
local_irq_disable();
@ -131,7 +131,7 @@
{
int i = 0;
@@ -72,52 +102,141 @@
@@ -72,52 +102,141 @@ static void str2eaddr(char *str, char *d
}
}
@ -343,7 +343,7 @@
static char nvram_buf[NVRAM_SPACE];
static int cfe_env;
@@ -36,7 +36,7 @@
@@ -36,7 +36,7 @@ extern char *cfe_env_get(char *nv_buf, c
/* Probe for NVRAM header */
static void __init early_nvram_init(void)
{
@ -362,7 +362,7 @@
+obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -54,6 +54,7 @@
@@ -54,6 +54,7 @@ config BCM47XX
select SSB_DRIVER_MIPS
select SSB_DRIVER_EXTIF
select SSB_DRIVER_PCICORE

6
target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch
View file

@ -1,6 +1,6 @@
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -287,7 +287,7 @@
@@ -287,7 +287,7 @@ if [ ! -z ${output_file} ]; then
if [ "${is_cpio_compressed}" = "compressed" ]; then
cat ${cpio_tfile} > ${output_file}
else
@ -11,7 +11,7 @@
fi
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -441,6 +441,69 @@
@@ -441,6 +441,69 @@ static void __init flush_window(void)
outcnt = 0;
}
@ -81,7 +81,7 @@
static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
{
int written;
@@ -475,12 +538,28 @@
@@ -475,12 +538,28 @@ static char * __init unpack_to_rootfs(ch
inptr = 0;
outcnt = 0; /* bytes in output buffer */
bytes_out = 0;

2
target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
View file

@ -4,7 +4,7 @@ Remove this sanity check for now until we find a better solution.
--mb
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -182,12 +182,10 @@
@@ -182,12 +182,10 @@ static int pcibios_enable_resources(stru
if ((idx == PCI_ROM_RESOURCE) &&
(!(r->flags & IORESOURCE_ROM_ENABLE)))
continue;

2
target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1173,7 +1173,9 @@
@@ -1173,7 +1173,9 @@ static int __init ssb_modinit(void)
/* ssb must be initialized after PCI but before the ssb drivers.
* That means we must use some initcall between subsys_initcall
* and device_initcall. */

2
target/linux/brcm47xx/patches-2.6.25/630-ssb-fix-irq-init.patch
View file

@ -8,7 +8,7 @@ Signed-off-by: Michael Buesch <mb@bu3sch.de>
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -519,6 +519,13 @@
@@ -519,6 +519,13 @@ int ssb_pcicore_dev_irqvecs_enable(struc
int err = 0;
u32 tmp;

24
target/linux/brcm47xx/patches-2.6.25/680-ssb-support-8bit-writes.patch
View file

@ -1,7 +1,7 @@
Add support for 8bit reads/writes to SSB.
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -508,6 +508,14 @@
@@ -508,6 +508,14 @@ error:
return err;
}
@ -16,7 +16,7 @@ Add support for 8bit reads/writes to SSB.
static u16 ssb_ssb_read16(struct ssb_device *dev, u16 offset)
{
struct ssb_bus *bus = dev->bus;
@@ -524,6 +532,14 @@
@@ -524,6 +532,14 @@ static u32 ssb_ssb_read32(struct ssb_dev
return readl(bus->mmio + offset);
}
@ -31,7 +31,7 @@ Add support for 8bit reads/writes to SSB.
static void ssb_ssb_write16(struct ssb_device *dev, u16 offset, u16 value)
{
struct ssb_bus *bus = dev->bus;
@@ -542,8 +558,10 @@
@@ -542,8 +558,10 @@ static void ssb_ssb_write32(struct ssb_d
/* Ops for the plain SSB bus without a host-device (no PCI or PCMCIA). */
static const struct ssb_bus_ops ssb_ssb_ops = {
@ -44,7 +44,7 @@ Add support for 8bit reads/writes to SSB.
};
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -577,6 +577,19 @@
@@ -577,6 +577,19 @@ static inline int ssb_pci_assert_buspowe
}
#endif /* DEBUG */
@ -64,7 +64,7 @@ Add support for 8bit reads/writes to SSB.
static u16 ssb_pci_read16(struct ssb_device *dev, u16 offset)
{
struct ssb_bus *bus = dev->bus;
@@ -603,6 +616,19 @@
@@ -603,6 +616,19 @@ static u32 ssb_pci_read32(struct ssb_dev
return ioread32(bus->mmio + offset);
}
@ -84,7 +84,7 @@ Add support for 8bit reads/writes to SSB.
static void ssb_pci_write16(struct ssb_device *dev, u16 offset, u16 value)
{
struct ssb_bus *bus = dev->bus;
@@ -631,8 +657,10 @@
@@ -631,8 +657,10 @@ static void ssb_pci_write32(struct ssb_d
/* Not "static", as it's used in main.c */
const struct ssb_bus_ops ssb_pci_ops = {
@ -97,7 +97,7 @@ Add support for 8bit reads/writes to SSB.
};
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -172,6 +172,22 @@
@@ -172,6 +172,22 @@ static int select_core_and_segment(struc
return 0;
}
@ -120,7 +120,7 @@ Add support for 8bit reads/writes to SSB.
static u16 ssb_pcmcia_read16(struct ssb_device *dev, u16 offset)
{
struct ssb_bus *bus = dev->bus;
@@ -206,6 +222,20 @@
@@ -206,6 +222,20 @@ static u32 ssb_pcmcia_read32(struct ssb_
return (lo | (hi << 16));
}
@ -141,7 +141,7 @@ Add support for 8bit reads/writes to SSB.
static void ssb_pcmcia_write16(struct ssb_device *dev, u16 offset, u16 value)
{
struct ssb_bus *bus = dev->bus;
@@ -238,8 +268,10 @@
@@ -238,8 +268,10 @@ static void ssb_pcmcia_write32(struct ss
/* Not "static", as it's used in main.c */
const struct ssb_bus_ops ssb_pcmcia_ops = {
@ -154,7 +154,7 @@ Add support for 8bit reads/writes to SSB.
};
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -72,8 +72,10 @@
@@ -72,8 +72,10 @@ struct ssb_device;
/* Lowlevel read/write operations on the device MMIO.
* Internal, don't use that outside of ssb. */
struct ssb_bus_ops {
@ -165,7 +165,7 @@ Add support for 8bit reads/writes to SSB.
void (*write16)(struct ssb_device *dev, u16 offset, u16 value);
void (*write32)(struct ssb_device *dev, u16 offset, u32 value);
};
@@ -348,6 +350,10 @@
@@ -348,6 +350,10 @@ void ssb_device_disable(struct ssb_devic
/* Device MMIO register read/write functions. */
@ -176,7 +176,7 @@ Add support for 8bit reads/writes to SSB.
static inline u16 ssb_read16(struct ssb_device *dev, u16 offset)
{
return dev->ops->read16(dev, offset);
@@ -356,6 +362,10 @@
@@ -356,6 +362,10 @@ static inline u32 ssb_read32(struct ssb_
{
return dev->ops->read32(dev, offset);
}

10
target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch
View file

@ -21,7 +21,7 @@ This is an ugly hack and needs to be rewritten before going upstream.
#define PCI_ASSIGN_ALL_BUSSES 1
unsigned int pci_probe = PCI_ASSIGN_ALL_BUSSES;
@@ -75,8 +86,32 @@
@@ -75,8 +86,32 @@ pcibios_align_resource(void *data, struc
res->start = start;
}
@ -55,7 +55,7 @@ This is an ugly hack and needs to be rewritten before going upstream.
if (request_resource(&iomem_resource, hose->mem_resource) < 0)
goto out;
if (request_resource(&ioport_resource, hose->io_resource) < 0) {
@@ -84,9 +119,6 @@
@@ -84,9 +119,6 @@ void __devinit register_pci_controller(s
goto out;
}
@ -65,7 +65,7 @@ This is an ugly hack and needs to be rewritten before going upstream.
/*
* Do not panic here but later - this might hapen before console init.
*/
@@ -94,41 +126,47 @@
@@ -94,41 +126,47 @@ void __devinit register_pci_controller(s
printk(KERN_WARNING
"registering PCI controller with io_map_base unset\n");
}
@ -136,7 +136,7 @@ This is an ugly hack and needs to be rewritten before going upstream.
/* Scan all of the recorded PCI controllers. */
for (next_busno = 0, hose = hose_head; hose; hose = hose->next) {
@@ -157,6 +195,7 @@
@@ -157,6 +195,7 @@ static int __init pcibios_init(void)
if (!pci_probe_only)
pci_assign_unassigned_resources();
pci_fixup_irqs(common_swizzle, pcibios_map_irq);
@ -146,7 +146,7 @@ This is an ugly hack and needs to be rewritten before going upstream.
}
--- a/drivers/ssb/main.c
+++ b/drivers/ssb/main.c
@@ -1191,9 +1191,7 @@
@@ -1191,9 +1191,7 @@ static int __init ssb_modinit(void)
/* ssb must be initialized after PCI but before the ssb drivers.
* That means we must use some initcall between subsys_initcall
* and device_initcall. */

80
target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/ssb/Kconfig
+++ b/drivers/ssb/Kconfig
@@ -125,4 +125,13 @@
@@ -125,4 +125,13 @@ config SSB_DRIVER_EXTIF
If unsure, say N
@ -16,7 +16,7 @@
endmenu
--- a/drivers/ssb/Makefile
+++ b/drivers/ssb/Makefile
@@ -11,6 +11,7 @@
@@ -11,6 +11,7 @@ ssb-y += driver_chipcommon.o
ssb-$(CONFIG_SSB_DRIVER_MIPS) += driver_mipscore.o
ssb-$(CONFIG_SSB_DRIVER_EXTIF) += driver_extif.o
ssb-$(CONFIG_SSB_DRIVER_PCICORE) += driver_pcicore.o
@ -500,7 +500,7 @@
+#endif /* LINUX_SSB_DRIVER_GIGE_H_ */
--- a/drivers/ssb/driver_pcicore.c
+++ b/drivers/ssb/driver_pcicore.c
@@ -60,78 +60,6 @@
@@ -60,78 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock);
/* Core to access the external PCI config space. Can only have one. */
static struct ssb_pcicore *extpci_core;
@ -579,7 +579,7 @@
static u32 get_cfgspace_addr(struct ssb_pcicore *pc,
unsigned int bus, unsigned int dev,
unsigned int func, unsigned int off)
@@ -320,6 +248,95 @@
@@ -320,6 +248,95 @@ static struct pci_controller ssb_pcicore
.mem_offset = 0x24000000,
};
@ -687,7 +687,7 @@
#include "ssb_private.h"
@@ -130,3 +133,90 @@
@@ -130,3 +133,90 @@ u32 ssb_gpio_polarity(struct ssb_bus *bu
return res;
}
EXPORT_SYMBOL(ssb_gpio_polarity);
@ -780,7 +780,7 @@
+}
--- a/include/linux/ssb/ssb.h
+++ b/include/linux/ssb/ssb.h
@@ -426,5 +426,12 @@
@@ -426,5 +426,12 @@ extern int ssb_bus_powerup(struct ssb_bu
extern u32 ssb_admatch_base(u32 adm);
extern u32 ssb_admatch_size(u32 adm);
@ -807,7 +807,7 @@
#ifdef CONFIG_SSB_DRIVER_PCICORE
/* PCI core registers. */
@@ -88,6 +93,9 @@
@@ -88,6 +93,9 @@ extern void ssb_pcicore_init(struct ssb_
extern int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
struct ssb_device *dev);
@ -817,7 +817,7 @@
#else /* CONFIG_SSB_DRIVER_PCICORE */
@@ -107,5 +115,16 @@
@@ -107,5 +115,16 @@ int ssb_pcicore_dev_irqvecs_enable(struc
return 0;
}
@ -844,7 +844,7 @@
#include <linux/dma-mapping.h>
#include <linux/pci.h>
@@ -68,6 +69,25 @@
@@ -68,6 +69,25 @@ found:
}
#endif /* CONFIG_SSB_PCIHOST */
@ -870,7 +870,7 @@
static struct ssb_device *ssb_device_get(struct ssb_device *dev)
{
if (dev)
@@ -1181,7 +1201,14 @@
@@ -1181,7 +1201,14 @@ static int __init ssb_modinit(void)
err = b43_pci_ssb_bridge_init();
if (err) {
ssb_printk(KERN_ERR "Broadcom 43xx PCI-SSB-bridge "
@ -886,7 +886,7 @@
/* don't fail SSB init because of this */
err = 0;
}
@@ -1195,6 +1222,7 @@
@@ -1195,6 +1222,7 @@ fs_initcall(ssb_modinit);
static void __exit ssb_modexit(void)
{
@ -896,7 +896,7 @@
}
--- a/drivers/ssb/ssb_private.h
+++ b/drivers/ssb/ssb_private.h
@@ -118,6 +118,8 @@
@@ -118,6 +118,8 @@ extern u32 ssb_calc_clock_rate(u32 pllty
extern int ssb_devices_freeze(struct ssb_bus *bus);
extern int ssb_devices_thaw(struct ssb_bus *bus);
extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev);
@ -915,7 +915,7 @@
#include <net/checksum.h>
#include <net/ip.h>
@@ -425,8 +426,9 @@
@@ -425,8 +426,9 @@ static void _tw32_flush(struct tg3 *tp,
static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val)
{
tp->write32_mbox(tp, off, val);
@ -927,7 +927,7 @@
tp->read32_mbox(tp, off);
}
@@ -706,7 +708,7 @@
@@ -706,7 +708,7 @@ static void tg3_switch_clocks(struct tg3
#define PHY_BUSY_LOOPS 5000
@ -936,7 +936,7 @@
{
u32 frame_val;
unsigned int loops;
@@ -720,7 +722,7 @@
@@ -720,7 +722,7 @@ static int tg3_readphy(struct tg3 *tp, i
*val = 0x0;
@ -945,7 +945,7 @@
MI_COM_PHY_ADDR_MASK);
frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
MI_COM_REG_ADDR_MASK);
@@ -755,7 +757,12 @@
@@ -755,7 +757,12 @@ static int tg3_readphy(struct tg3 *tp, i
return ret;
}
@ -959,7 +959,7 @@
{
u32 frame_val;
unsigned int loops;
@@ -771,7 +778,7 @@
@@ -771,7 +778,7 @@ static int tg3_writephy(struct tg3 *tp,
udelay(80);
}
@ -968,7 +968,7 @@
MI_COM_PHY_ADDR_MASK);
frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
MI_COM_REG_ADDR_MASK);
@@ -804,6 +811,11 @@
@@ -804,6 +811,11 @@ static int tg3_writephy(struct tg3 *tp,
return ret;
}
@ -980,7 +980,7 @@
static void tg3_phydsp_write(struct tg3 *tp, u32 reg, u32 val)
{
tg3_writephy(tp, MII_TG3_DSP_ADDRESS, reg);
@@ -2250,6 +2262,14 @@
@@ -2250,6 +2262,14 @@ static int tg3_setup_copper_phy(struct t
}
}
@ -995,7 +995,7 @@
if (current_link_up == 1 &&
tp->link_config.active_duplex == DUPLEX_FULL)
tg3_setup_flow_control(tp, lcl_adv, rmt_adv);
@@ -5197,6 +5217,11 @@
@@ -5197,6 +5217,11 @@ static int tg3_poll_fw(struct tg3 *tp)
int i;
u32 val;
@ -1007,7 +1007,7 @@
if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
/* Wait up to 20ms for init done. */
for (i = 0; i < 200; i++) {
@@ -5435,6 +5460,14 @@
@@ -5435,6 +5460,14 @@ static int tg3_chip_reset(struct tg3 *tp
tw32(0x5000, 0x400);
}
@ -1022,7 +1022,7 @@
tw32(GRC_MODE, tp->grc_mode);
if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
@@ -5704,9 +5737,12 @@
@@ -5704,9 +5737,12 @@ static int tg3_halt_cpu(struct tg3 *tp,
return -ENODEV;
}
@ -1038,7 +1038,7 @@
return 0;
}
@@ -5787,6 +5823,11 @@
@@ -5787,6 +5823,11 @@ static int tg3_load_5701_a0_firmware_fix
struct fw_info info;
int err, i;
@ -1050,7 +1050,7 @@
info.text_base = TG3_FW_TEXT_ADDR;
info.text_len = TG3_FW_TEXT_LEN;
info.text_data = &tg3FwText[0];
@@ -6345,6 +6386,11 @@
@@ -6345,6 +6386,11 @@ static int tg3_load_tso_firmware(struct
unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
int err, i;
@ -1062,7 +1062,7 @@
if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
return 0;
@@ -7306,6 +7352,11 @@
@@ -7306,6 +7352,11 @@ static void tg3_timer(unsigned long __op
spin_lock(&tp->lock);
@ -1074,7 +1074,7 @@
if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) {
/* All of this garbage is because when using non-tagged
* IRQ status the mailbox/status_block protocol the chip
@@ -8906,6 +8957,11 @@
@@ -8906,6 +8957,11 @@ static int tg3_test_nvram(struct tg3 *tp
__le32 *buf;
int i, j, k, err = 0, size;
@ -1086,7 +1086,7 @@
if (tg3_nvram_read_swab(tp, 0, &magic) != 0)
return -EIO;
@@ -9689,7 +9745,7 @@
@@ -9689,7 +9745,7 @@ static int tg3_ioctl(struct net_device *
return -EAGAIN;
spin_lock_bh(&tp->lock);
@ -1095,7 +1095,7 @@
spin_unlock_bh(&tp->lock);
data->val_out = mii_regval;
@@ -9708,7 +9764,7 @@
@@ -9708,7 +9764,7 @@ static int tg3_ioctl(struct net_device *
return -EAGAIN;
spin_lock_bh(&tp->lock);
@ -1104,7 +1104,7 @@
spin_unlock_bh(&tp->lock);
return err;
@@ -10177,6 +10233,12 @@
@@ -10177,6 +10233,12 @@ static void __devinit tg3_get_5906_nvram
/* Chips other than 5700/5701 use the NVRAM for fetching info. */
static void __devinit tg3_nvram_init(struct tg3 *tp)
{
@ -1117,7 +1117,7 @@
tw32_f(GRC_EEPROM_ADDR,
(EEPROM_ADDR_FSM_RESET |
(EEPROM_DEFAULT_CLOCK_PERIOD <<
@@ -10317,6 +10379,9 @@
@@ -10317,6 +10379,9 @@ static int tg3_nvram_read(struct tg3 *tp
{
int ret;
@ -1127,7 +1127,7 @@
if (!(tp->tg3_flags & TG3_FLAG_NVRAM))
return tg3_nvram_read_using_eeprom(tp, offset, val);
@@ -10563,6 +10628,9 @@
@@ -10563,6 +10628,9 @@ static int tg3_nvram_write_block(struct
{
int ret;
@ -1137,7 +1137,7 @@
if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl &
~GRC_LCLCTRL_GPIO_OUTPUT1);
@@ -11610,7 +11678,6 @@
@@ -11610,7 +11678,6 @@ static int __devinit tg3_get_invariants(
tp->write32 = tg3_write_flush_reg32;
}
@ -1145,7 +1145,7 @@
if ((tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) ||
(tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)) {
tp->write32_tx_mbox = tg3_write32_tx_mbox;
@@ -11646,6 +11713,11 @@
@@ -11646,6 +11713,11 @@ static int __devinit tg3_get_invariants(
GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)))
tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
@ -1157,7 +1157,7 @@
/* Get eeprom hw config before calling tg3_set_power_state().
* In particular, the TG3_FLG2_IS_NIC flag must be
* determined before calling tg3_set_power_state() so that
@@ -12017,6 +12089,10 @@
@@ -12017,6 +12089,10 @@ static int __devinit tg3_get_device_addr
}
if (!is_valid_ether_addr(&dev->dev_addr[0])) {
@ -1168,7 +1168,7 @@
#ifdef CONFIG_SPARC
if (!tg3_get_default_macaddr_sparc(tp))
return 0;
@@ -12508,6 +12584,7 @@
@@ -12508,6 +12584,7 @@ static char * __devinit tg3_phy_string(s
case PHY_ID_BCM5704: return "5704";
case PHY_ID_BCM5705: return "5705";
case PHY_ID_BCM5750: return "5750";
@ -1176,7 +1176,7 @@
case PHY_ID_BCM5752: return "5752";
case PHY_ID_BCM5714: return "5714";
case PHY_ID_BCM5780: return "5780";
@@ -12695,6 +12772,13 @@
@@ -12695,6 +12772,13 @@ static int __devinit tg3_init_one(struct
tp->msg_enable = tg3_debug;
else
tp->msg_enable = TG3_DEF_MSG_ENABLE;
@ -1192,7 +1192,7 @@
* swapping. DMA data byte swapping is controlled in the GRC_MODE
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2477,6 +2477,9 @@
@@ -2477,6 +2477,9 @@ struct tg3 {
#define TG3_FLG3_ENABLE_APE 0x00000002
#define TG3_FLG3_5761_5784_AX_FIXES 0x00000004
#define TG3_FLG3_5701_DMA_BUG 0x00000008
@ -1202,7 +1202,7 @@
struct timer_list timer;
u16 timer_counter;
@@ -2532,6 +2535,7 @@
@@ -2532,6 +2535,7 @@ struct tg3 {
#define PHY_ID_BCM5714 0x60008340
#define PHY_ID_BCM5780 0x60008350
#define PHY_ID_BCM5755 0xbc050cc0
@ -1210,7 +1210,7 @@
#define PHY_ID_BCM5787 0xbc050ce0
#define PHY_ID_BCM5756 0xbc050ed0
#define PHY_ID_BCM5784 0xbc050fa0
@@ -2568,7 +2572,7 @@
@@ -2568,7 +2572,7 @@ struct tg3 {
(X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \
(X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \
(X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \
@ -1221,7 +1221,7 @@
dma_addr_t stats_mapping;
--- a/drivers/ssb/driver_mipscore.c
+++ b/drivers/ssb/driver_mipscore.c
@@ -212,6 +212,7 @@
@@ -212,6 +212,7 @@ void ssb_mipscore_init(struct ssb_mipsco
/* fallthrough */
case SSB_DEV_PCI:
case SSB_DEV_ETHERNET:

6
target/linux/brcm47xx/patches-2.6.25/710-add-gpio-is-valid.patch
View file

@ -1,7 +1,7 @@
Add gpio_is_valid() for bcm47xx
--- a/arch/mips/bcm47xx/gpio.c
+++ b/arch/mips/bcm47xx/gpio.c
@@ -77,3 +77,15 @@
@@ -77,3 +77,15 @@ int bcm47xx_gpio_direction_output(unsign
}
EXPORT_SYMBOL_GPL(bcm47xx_gpio_direction_output);
@ -19,7 +19,7 @@ Add gpio_is_valid() for bcm47xx
+EXPORT_SYMBOL_GPL(bcm47xx_gpio_is_valid);
--- a/include/asm-mips/mach-bcm47xx/gpio.h
+++ b/include/asm-mips/mach-bcm47xx/gpio.h
@@ -17,6 +17,7 @@
@@ -17,6 +17,7 @@ extern int bcm47xx_gpio_get_value(unsign
extern void bcm47xx_gpio_set_value(unsigned gpio, int value);
extern int bcm47xx_gpio_direction_input(unsigned gpio);
extern int bcm47xx_gpio_direction_output(unsigned gpio, int value);
@ -27,7 +27,7 @@ Add gpio_is_valid() for bcm47xx
static inline int gpio_request(unsigned gpio, const char *label)
{
@@ -52,6 +53,8 @@
@@ -52,6 +53,8 @@ static inline int gpio_direction_output(
return bcm47xx_gpio_direction_output(gpio, value);
}

4
target/linux/brcm47xx/patches-2.6.25/800-fix_cfe_detection.patch
View file

@ -8,7 +8,7 @@
const char *get_system_type(void)
{
@@ -40,65 +41,40 @@
@@ -40,65 +41,40 @@ const char *get_system_type(void)
void prom_putchar(char c)
{
@ -90,7 +90,7 @@
{
char buf[CL_SIZE];
@@ -146,9 +122,12 @@
@@ -146,9 +122,12 @@ static __init void prom_init_mem(void)
void __init prom_init(void)
{

2
target/linux/etrax/Makefile
View file

@ -10,7 +10,7 @@ ARCH:=cris
BOARD:=etrax
BOARDNAME:=Foxboard (ETRAX 100LX)
FEATURES:=squashfs jffs2 broken
LINUX_VERSION:=2.6.25.17
LINUX_VERSION:=2.6.25.19
include $(INCLUDE_DIR)/target.mk

18
target/linux/etrax/patches/100-compile_fixes.patch
View file

@ -1,6 +1,6 @@
--- a/arch/cris/Makefile
+++ b/arch/cris/Makefile
@@ -33,7 +33,7 @@
@@ -33,7 +33,7 @@ endif
LD = $(CROSS_COMPILE)ld -mcrislinux
@ -21,7 +21,7 @@
subdir- := compressed rescue
targets := Image
@@ -14,7 +11,6 @@
@@ -14,7 +11,6 @@ $(obj)/Image: vmlinux FORCE
$(obj)/compressed/vmlinux: $(obj)/Image FORCE
$(Q)$(MAKE) $(build)=$(obj)/compressed $@
@ -45,7 +45,7 @@
quiet_cmd_image = BUILD $@
cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
@@ -22,10 +18,10 @@
@@ -22,10 +18,10 @@ $(obj)/decompress.bin: $(obj)/decompress
$(call if_changed,objcopy)
$(obj)/head.o: $(obj)/head.S .config
@ -93,7 +93,7 @@
beq dram_init_finished
nop
@@ -36,91 +37,91 @@
@@ -36,91 +37,91 @@ dram_init_finished:
;; Initiate the PA and PB ports
@ -233,7 +233,7 @@
* adaptation for Linux/CRIS Axis Communications AB, 1999
*
*/
@@ -99,12 +99,12 @@
@@ -99,12 +99,12 @@ static void error(char *m);
static void gzip_mark(void **);
static void gzip_release(void **);
@ -249,7 +249,7 @@
#include "../../../../../lib/inflate.c"
@@ -139,7 +139,7 @@
@@ -139,7 +139,7 @@ static void gzip_release(void **ptr)
/* decompressor info and error messages to serial console */
static void
@ -258,7 +258,7 @@
{
#ifndef CONFIG_ETRAX_DEBUG_PORT_NULL
while(*s) {
@@ -209,9 +209,9 @@
@@ -209,9 +209,9 @@ flush_window()
static void
error(char *x)
{
@ -271,7 +271,7 @@
while(1); /* Halt */
}
@@ -257,14 +257,7 @@
@@ -257,14 +257,7 @@ decompress_kernel()
makecrc();
@ -290,7 +290,7 @@
}
--- a/arch/cris/arch-v10/mm/init.c
+++ b/arch/cris/arch-v10/mm/init.c
@@ -184,6 +184,9 @@
@@ -184,6 +184,9 @@ paging_init(void)
free_area_init_node(0, &contig_page_data, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
}

2
target/linux/etrax/patches/101-cris-eth-driver.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -1707,7 +1707,7 @@
@@ -1707,7 +1707,7 @@ e100_set_network_leds(int active)
static void
e100_netpoll(struct net_device* netdev)
{

2
target/linux/etrax/patches/200-samsung_flash.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -297,8 +297,8 @@
@@ -297,8 +297,8 @@ struct mtd_info *cfi_cmdset_0002(struct
return NULL;
}

8
target/linux/etrax/patches/201-flashsize.patch
View file

@ -8,7 +8,7 @@
+ .dword 0xdeadc0de
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
@@ -113,7 +113,7 @@
@@ -113,7 +113,7 @@ static struct map_info map_cse1 = {
/* If no partition-table was found, we use this default-set. */
#define MAX_PARTITIONS 7
@ -17,7 +17,7 @@
/*
* Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the
@@ -122,19 +122,14 @@
@@ -122,19 +122,14 @@ static struct map_info map_cse1 = {
*/
static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = {
{
@ -42,7 +42,7 @@
}
};
@@ -281,6 +276,11 @@
@@ -281,6 +276,11 @@ static int __init init_axis_flash(void)
struct partitiontable_entry *ptable;
int use_default_ptable = 1; /* Until proven otherwise. */
const char pmsg[] = " /dev/flash%d at 0x%08x, size 0x%08x\n";
@ -54,7 +54,7 @@
if (!(mymtd = flash_probe())) {
/* There's no reason to use this module if no flash chip can
@@ -292,6 +292,31 @@
@@ -292,6 +292,31 @@ static int __init init_axis_flash(void)
mymtd->name, mymtd->size);
axisflash_mtd = mymtd;
}

6
target/linux/etrax/patches/300-sysfs.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -27,6 +27,7 @@
@@ -27,6 +27,7 @@ static char *serial_version = "$Revision
#include <linux/kernel.h>
#include <linux/mutex.h>
#include <linux/bitops.h>
@ -8,7 +8,7 @@
#include <asm/io.h>
#include <asm/irq.h>
@@ -4384,6 +4385,7 @@
@@ -4384,6 +4385,7 @@ static const struct tty_operations rs_op
.tiocmset = rs_tiocmset
};
@ -16,7 +16,7 @@
static int __init
rs_init(void)
{
@@ -4518,6 +4520,24 @@
@@ -4518,6 +4520,24 @@ rs_init(void)
#endif
#endif /* CONFIG_SVINTO_SIM */

4
target/linux/etrax/patches/301-usb_support.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/usb/Makefile
+++ b/drivers/usb/Makefile
@@ -16,6 +16,7 @@
@@ -16,6 +16,7 @@ obj-$(CONFIG_USB_UHCI_HCD) += host/
obj-$(CONFIG_USB_SL811_HCD) += host/
obj-$(CONFIG_USB_U132_HCD) += host/
obj-$(CONFIG_USB_R8A66597_HCD) += host/
@ -10,7 +10,7 @@
obj-$(CONFIG_USB_PRINTER) += class/
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -17,3 +17,5 @@
@@ -17,3 +17,5 @@ obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o
obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o
obj-$(CONFIG_USB_R8A66597_HCD) += r8a66597-hcd.o

12
target/linux/generic-2.6/patches-2.6.25/001-squashfs.patch
View file

@ -1,6 +1,6 @@
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1367,6 +1367,71 @@
@@ -1367,6 +1367,71 @@ config CRAMFS
If unsure, say N.
@ -74,7 +74,7 @@
depends on BLOCK
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -73,6 +73,7 @@
@@ -73,6 +73,7 @@ obj-$(CONFIG_JBD) += jbd/
obj-$(CONFIG_JBD2) += jbd2/
obj-$(CONFIG_EXT2_FS) += ext2/
obj-$(CONFIG_CRAMFS) += cramfs/
@ -4128,7 +4128,7 @@
#include <linux/initrd.h>
#include <linux/string.h>
@@ -39,6 +40,7 @@
@@ -39,6 +40,7 @@ static int __init crd_load(int in_fd, in
* numbers could not be found.
*
* We currently check for the following magic numbers:
@ -4136,7 +4136,7 @@
* minix
* ext2
* romfs
@@ -53,6 +55,7 @@
@@ -53,6 +55,7 @@ identify_ramdisk_image(int fd, int start
struct ext2_super_block *ext2sb;
struct romfs_super_block *romfsb;
struct cramfs_super *cramfsb;
@ -4144,7 +4144,7 @@
int nblocks = -1;
unsigned char *buf;
@@ -64,6 +67,7 @@
@@ -64,6 +67,7 @@ identify_ramdisk_image(int fd, int start
ext2sb = (struct ext2_super_block *) buf;
romfsb = (struct romfs_super_block *) buf;
cramfsb = (struct cramfs_super *) buf;
@ -4152,7 +4152,7 @@
memset(buf, 0xe5, size);
/*
@@ -101,6 +105,15 @@
@@ -101,6 +105,15 @@ identify_ramdisk_image(int fd, int start
goto done;
}

2
target/linux/generic-2.6/patches-2.6.25/002-lzma_decompress.patch
View file

@ -769,7 +769,7 @@
+}
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -14,7 +14,7 @@
@@ -14,7 +14,7 @@ lib-$(CONFIG_SMP) += cpumask.o
lib-y += kobject.o kref.o klist.o
obj-y += div64.o sort.o parser.o halfmd4.o debug_locks.o random32.o \

10
target/linux/generic-2.6/patches-2.6.25/003-squashfs_lzma.patch
View file

@ -38,7 +38,7 @@
static void squashfs_put_super(struct super_block *);
static int squashfs_statfs(struct dentry *, struct kstatfs *);
static int squashfs_symlink_readpage(struct file *file, struct page *page);
@@ -64,7 +81,11 @@
@@ -64,7 +81,11 @@ static int squashfs_get_sb(struct file_s
const char *, void *, struct vfsmount *);
@ -50,7 +50,7 @@
static struct file_system_type squashfs_fs_type = {
.owner = THIS_MODULE,
@@ -249,6 +270,15 @@
@@ -249,6 +270,15 @@ SQSH_EXTERN unsigned int squashfs_read_d
if (compressed) {
int zlib_err;
@ -66,7 +66,7 @@
stream.next_in = c_buffer;
stream.avail_in = c_byte;
stream.next_out = buffer;
@@ -263,7 +293,7 @@
@@ -263,7 +293,7 @@ SQSH_EXTERN unsigned int squashfs_read_d
bytes = 0;
} else
bytes = stream.total_out;
@ -75,7 +75,7 @@
up(&msblk->read_data_mutex);
}
@@ -2045,15 +2075,19 @@
@@ -2045,15 +2075,19 @@ static int __init init_squashfs_fs(void)
printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
"Phillip Lougher\n");
@ -95,7 +95,7 @@
destroy_inodecache();
}
@@ -2064,7 +2098,9 @@
@@ -2064,7 +2098,9 @@ out:
static void __exit exit_squashfs_fs(void)
{

2
target/linux/generic-2.6/patches-2.6.25/004-extra_optimization.patch
View file

@ -1,6 +1,6 @@
--- a/Makefile
+++ b/Makefile
@@ -533,6 +533,9 @@
@@ -533,6 +533,9 @@ endif
NOSTDINC_FLAGS += -nostdinc -isystem $(shell $(CC) -print-file-name=include)
CHECKFLAGS += $(NOSTDINC_FLAGS)

2
target/linux/generic-2.6/patches-2.6.25/005-squashfs_fix.patch
View file

@ -8,7 +8,7 @@
#include <linux/squashfs_fs_sb.h>
#include <linux/squashfs_fs_i.h>
#include <linux/buffer_head.h>
@@ -2125,7 +2126,7 @@
@@ -2125,7 +2126,7 @@ static void squashfs_destroy_inode(struc
}

2
target/linux/generic-2.6/patches-2.6.25/006-gcc4_inline_fix.patch
View file

@ -1,6 +1,6 @@
--- a/include/asm-mips/system.h
+++ b/include/asm-mips/system.h
@@ -185,7 +185,7 @@
@@ -185,7 +185,7 @@ extern __u64 __xchg_u64_unsupported_on_3
if something tries to do an invalid xchg(). */
extern void __xchg_called_with_bad_pointer(void);

2
target/linux/generic-2.6/patches-2.6.25/007-samsung_flash.patch
View file

@ -8,7 +8,7 @@
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
@@ -298,12 +299,19 @@
@@ -298,12 +299,19 @@ struct mtd_info *cfi_cmdset_0002(struct
if (extp->MajorVersion != '1' ||
(extp->MinorVersion < '0' || extp->MinorVersion > '4')) {

16
target/linux/generic-2.6/patches-2.6.25/009-revert_intel_flash_breakage.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/chips/cfi_cmdset_0001.c
+++ b/drivers/mtd/chips/cfi_cmdset_0001.c
@@ -1008,7 +1008,7 @@
@@ -1008,7 +1008,7 @@ static void __xipram xip_enable(struct m
static int __xipram xip_wait_for_operation(
struct map_info *map, struct flchip *chip,
@ -9,7 +9,7 @@
{
struct cfi_private *cfi = map->fldrv_priv;
struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
@@ -1017,7 +1017,7 @@
@@ -1017,7 +1017,7 @@ static int __xipram xip_wait_for_operati
flstate_t oldstate, newstate;
start = xip_currtime();
@ -18,7 +18,7 @@
if (usec == 0)
usec = 500000;
done = 0;
@@ -1127,8 +1127,8 @@
@@ -1127,8 +1127,8 @@ static int __xipram xip_wait_for_operati
#define XIP_INVAL_CACHED_RANGE(map, from, size) \
INVALIDATE_CACHED_RANGE(map, from, size)
@ -29,7 +29,7 @@
#else
@@ -1140,65 +1140,65 @@
@@ -1140,65 +1140,65 @@ static int __xipram xip_wait_for_operati
static int inval_cache_and_wait_for_operation(
struct map_info *map, struct flchip *chip,
unsigned long cmd_adr, unsigned long inval_adr, int inval_len,
@ -130,7 +130,7 @@
/* Done and happy. */
chip->state = FL_STATUS;
return 0;
@@ -1207,7 +1207,8 @@
@@ -1207,7 +1207,8 @@ static int inval_cache_and_wait_for_oper
#endif
#define WAIT_TIMEOUT(map, chip, adr, udelay) \
@ -140,7 +140,7 @@
static int do_point_onechip (struct map_info *map, struct flchip *chip, loff_t adr, size_t len)
@@ -1438,7 +1439,7 @@
@@ -1438,7 +1439,7 @@ static int __xipram do_write_oneword(str
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
adr, map_bankwidth(map),
@ -149,7 +149,7 @@
if (ret) {
xip_enable(map, chip, adr);
printk(KERN_ERR "%s: word write error (status timeout)\n", map->name);
@@ -1678,7 +1679,7 @@
@@ -1678,7 +1679,7 @@ static int __xipram do_write_buffer(stru
ret = INVAL_CACHE_AND_WAIT(map, chip, cmd_adr,
initial_adr, initial_len,
@ -158,7 +158,7 @@
if (ret) {
map_write(map, CMD(0x70), cmd_adr);
chip->state = FL_STATUS;
@@ -1813,7 +1814,7 @@
@@ -1813,7 +1814,7 @@ static int __xipram do_erase_oneblock(st
ret = INVAL_CACHE_AND_WAIT(map, chip, adr,
adr, len,

14
target/linux/generic-2.6/patches-2.6.25/060-block2mtd_init.patch
View file

@ -8,7 +8,7 @@
#include <linux/buffer_head.h>
#include <linux/mutex.h>
#include <linux/mount.h>
@@ -237,10 +238,11 @@
@@ -237,10 +238,11 @@ static void block2mtd_free_device(struct
/* FIXME: ensure that mtd->size % erase_size == 0 */
@ -21,7 +21,7 @@
if (!devname)
return NULL;
@@ -279,14 +281,18 @@
@@ -279,14 +281,18 @@ static struct block2mtd_dev *add_device(
/* Setup the MTD structure */
/* make the name contain the block device in */
@ -45,7 +45,7 @@
dev->mtd.erasesize = erase_size;
dev->mtd.writesize = 1;
dev->mtd.type = MTD_RAM;
@@ -298,15 +304,18 @@
@@ -298,15 +304,18 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@ -68,7 +68,7 @@
return dev;
devinit_err:
@@ -379,9 +388,9 @@
@@ -379,9 +388,9 @@ static char block2mtd_paramline[80 + 12]
static int block2mtd_setup2(const char *val)
{
@ -80,7 +80,7 @@
char *name;
size_t erase_size = PAGE_SIZE;
int i, ret;
@@ -392,7 +401,7 @@
@@ -392,7 +401,7 @@ static int block2mtd_setup2(const char *
strcpy(str, val);
kill_final_newline(str);
@ -89,7 +89,7 @@
token[i] = strsep(&str, ",");
if (str)
@@ -411,8 +420,10 @@
@@ -411,8 +420,10 @@ static int block2mtd_setup2(const char *
parse_err("illegal erase size");
}
}
@ -101,7 +101,7 @@
return 0;
}
@@ -446,7 +457,7 @@
@@ -446,7 +457,7 @@ static int block2mtd_setup(const char *v
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);

44
target/linux/generic-2.6/patches-2.6.25/065-rootfs_split.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -47,6 +47,16 @@
@@ -47,6 +47,16 @@ config MTD_PARTITIONS
devices. Partitioning on NFTL 'devices' is a different - that's the
'normal' form of partitioning used on a block device.
@ -28,7 +28,7 @@
/* Our partition linked list */
static LIST_HEAD(mtd_partitions);
@@ -39,7 +41,7 @@
@@ -39,7 +41,7 @@ struct mtd_part {
* the pointer to that structure with this macro.
*/
#define PART(x) ((struct mtd_part *)(x))
@ -37,7 +37,7 @@
/*
* MTD methods which simply translate the effective address and pass through
@@ -322,6 +324,316 @@
@@ -322,6 +324,316 @@ int del_mtd_partitions(struct mtd_info *
return 0;
}
@ -354,7 +354,7 @@
/*
* This function, given a master MTD object and a partition table, creates
* and registers slave MTD objects which are bound to the master according to
@@ -334,171 +646,31 @@
@@ -334,171 +646,31 @@ int add_mtd_partitions(struct mtd_info *
int nbparts)
{
struct mtd_part *slave;
@ -547,7 +547,7 @@
}
}
@@ -574,6 +746,32 @@
@@ -574,6 +746,32 @@ int parse_mtd_partitions(struct mtd_info
return ret;
}
@ -582,7 +582,7 @@
EXPORT_SYMBOL_GPL(deregister_mtd_parser);
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
@@ -34,6 +34,8 @@
@@ -34,6 +34,8 @@ struct block2mtd_dev {
struct block_device *blkdev;
struct mtd_info mtd;
struct mutex write_mutex;
@ -591,7 +591,7 @@
};
@@ -86,6 +88,12 @@
@@ -86,6 +88,12 @@ static int block2mtd_erase(struct mtd_in
size_t len = instr->len;
int err;
@ -604,7 +604,7 @@
instr->state = MTD_ERASING;
mutex_lock(&dev->write_mutex);
err = _block2mtd_erase(dev, from, len);
@@ -98,6 +106,10 @@
@@ -98,6 +106,10 @@ static int block2mtd_erase(struct mtd_in
instr->state = MTD_ERASE_DONE;
mtd_erase_callback(instr);
@ -615,7 +615,7 @@
return err;
}
@@ -109,10 +121,14 @@
@@ -109,10 +121,14 @@ static int block2mtd_read(struct mtd_inf
struct page *page;
int index = from >> PAGE_SHIFT;
int offset = from & (PAGE_SIZE-1);
@ -633,7 +633,7 @@
if (from + len > mtd->size)
len = mtd->size - from;
@@ -127,10 +143,14 @@
@@ -127,10 +143,14 @@ static int block2mtd_read(struct mtd_inf
len = len - cpylen;
page = page_read(dev->blkdev->bd_inode->i_mapping, index);
@ -652,7 +652,7 @@
memcpy(buf, page_address(page) + offset, cpylen);
page_cache_release(page);
@@ -141,7 +161,10 @@
@@ -141,7 +161,10 @@ static int block2mtd_read(struct mtd_inf
offset = 0;
index++;
}
@ -664,7 +664,7 @@
}
@@ -193,12 +216,22 @@
@@ -193,12 +216,22 @@ static int block2mtd_write(struct mtd_in
size_t *retlen, const u_char *buf)
{
struct block2mtd_dev *dev = mtd->priv;
@ -691,7 +691,7 @@
if (to + len > mtd->size)
len = mtd->size - to;
@@ -207,6 +240,9 @@
@@ -207,6 +240,9 @@ static int block2mtd_write(struct mtd_in
mutex_unlock(&dev->write_mutex);
if (err > 0)
err = 0;
@ -701,7 +701,7 @@
return err;
}
@@ -215,51 +251,29 @@
@@ -215,51 +251,29 @@ static int block2mtd_write(struct mtd_in
static void block2mtd_sync(struct mtd_info *mtd)
{
struct block2mtd_dev *dev = mtd->priv;
@ -761,7 +761,7 @@
if (devt) {
bdev = open_by_devnum(devt, FMODE_WRITE | FMODE_READ);
}
@@ -267,17 +281,96 @@
@@ -267,17 +281,96 @@ static struct block2mtd_dev *add_device(
#endif
if (IS_ERR(bdev)) {
@ -861,7 +861,7 @@
/* Setup the MTD structure */
/* make the name contain the block device in */
@@ -304,6 +397,7 @@
@@ -304,6 +397,7 @@ static struct block2mtd_dev *add_device(
dev->mtd.read = block2mtd_read;
dev->mtd.priv = dev;
dev->mtd.owner = THIS_MODULE;
@ -879,7 +879,7 @@
#include <asm/uaccess.h>
@@ -756,6 +757,13 @@
@@ -756,6 +757,13 @@ static int mtd_ioctl(struct inode *inode
file->f_pos = 0;
break;
}
@ -895,7 +895,7 @@
ret = -ENOTTY;
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -98,6 +98,7 @@
@@ -98,6 +98,7 @@ struct mtd_oob_ops {
uint8_t *oobbuf;
};
@ -903,7 +903,7 @@
struct mtd_info {
u_char type;
u_int32_t flags;
@@ -211,6 +212,9 @@
@@ -211,6 +212,9 @@ struct mtd_info {
struct module *owner;
int usecount;
@ -923,7 +923,7 @@
struct mtd_partition {
char *name; /* identifier string */
u_int32_t size; /* partition size */
@@ -43,6 +44,7 @@
@@ -43,6 +44,7 @@ struct mtd_partition {
u_int32_t mask_flags; /* master MTD flags to mask out for this partition */
struct nand_ecclayout *ecclayout; /* out of band layout for this partition (NAND only)*/
struct mtd_info **mtdp; /* pointer to store the MTD object */
@ -931,7 +931,7 @@
};
#define MTDPART_OFS_NXTBLK (-2)
@@ -52,6 +54,7 @@
@@ -52,6 +54,7 @@ struct mtd_partition {
int add_mtd_partitions(struct mtd_info *, const struct mtd_partition *, int);
int del_mtd_partitions(struct mtd_info *);
@ -941,7 +941,7 @@
* Functions dealing with the various ways of partitioning the space
--- a/include/mtd/mtd-abi.h
+++ b/include/mtd/mtd-abi.h
@@ -95,6 +95,7 @@
@@ -95,6 +95,7 @@ struct otp_info {
#define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout)
#define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats)
#define MTDFILEMODE _IO('M', 19)

2
target/linux/generic-2.6/patches-2.6.25/070-redboot_space.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/mtd/redboot.c
+++ b/drivers/mtd/redboot.c
@@ -251,14 +251,21 @@
@@ -251,14 +251,21 @@ static int parse_redboot_partitions(stru
#endif
names += strlen(names)+1;

4
target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch
View file

@ -1,6 +1,6 @@
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -573,6 +573,7 @@
@@ -573,6 +573,7 @@ struct platform_nand_chip {
int chip_delay;
unsigned int options;
const char **part_probe_types;
@ -10,7 +10,7 @@
--- a/drivers/mtd/nand/plat_nand.c
+++ b/drivers/mtd/nand/plat_nand.c
@@ -70,7 +70,18 @@
@@ -70,7 +70,18 @@ static int __init plat_nand_probe(struct
platform_set_drvdata(pdev, data);
/* Scan to find existance of the device */

10
target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.17.patch
View file

@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -735,6 +735,27 @@
@@ -735,6 +735,27 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N.
@ -30,7 +30,7 @@
depends on NETFILTER_XTABLES
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -77,6 +77,7 @@
@@ -77,6 +77,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RATEEST)
obj-$(CONFIG_NETFILTER_XT_MATCH_REALM) += xt_realm.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
@ -2027,7 +2027,7 @@
+}
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -208,6 +208,14 @@
@@ -208,6 +208,14 @@ destroy_conntrack(struct nf_conntrack *n
* too. */
nf_ct_remove_expectations(ct);
@ -2044,7 +2044,7 @@
BUG_ON(hlist_unhashed(&ct->tuplehash[IP_CT_DIR_ORIGINAL].hnode));
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -181,7 +181,12 @@
@@ -181,7 +181,12 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC;
#endif
@ -2060,7 +2060,7 @@
return 0;
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -124,6 +124,22 @@
@@ -124,6 +124,22 @@ struct nf_conn
u_int32_t secmark;
#endif

10
target/linux/generic-2.6/patches-2.6.25/101-netfilter_layer7_pktmatch.patch
View file

@ -1,6 +1,6 @@
--- a/include/linux/netfilter/xt_layer7.h
+++ b/include/linux/netfilter/xt_layer7.h
@@ -8,6 +8,7 @@
@@ -8,6 +8,7 @@ struct xt_layer7_info {
char protocol[MAX_PROTOCOL_LEN];
char pattern[MAX_PATTERN_LEN];
u_int8_t invert;
@ -10,7 +10,7 @@
#endif /* _XT_LAYER7_H */
--- a/net/netfilter/xt_layer7.c
+++ b/net/netfilter/xt_layer7.c
@@ -297,34 +297,36 @@
@@ -297,34 +297,36 @@ static int match_no_append(struct nf_con
}
/* add the new app data to the conntrack. Return number of bytes added. */
@ -61,7 +61,7 @@
return length;
}
@@ -411,7 +413,7 @@
@@ -411,7 +413,7 @@ match(const struct sk_buff *skbin,
const struct xt_layer7_info * info = matchinfo;
enum ip_conntrack_info master_ctinfo, ctinfo;
struct nf_conn *master_conntrack, *conntrack;
@ -70,7 +70,7 @@
unsigned int pattern_result, appdatalen;
regexp * comppattern;
@@ -439,8 +441,8 @@
@@ -439,8 +441,8 @@ match(const struct sk_buff *skbin,
master_conntrack = master_ct(master_conntrack);
/* if we've classified it or seen too many packets */
@ -81,7 +81,7 @@
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
@@ -473,6 +475,25 @@
@@ -473,6 +475,25 @@ match(const struct sk_buff *skbin,
/* the return value gets checked later, when we're ready to use it */
comppattern = compile_and_cache(info->pattern, info->protocol);

4
target/linux/generic-2.6/patches-2.6.25/110-ipp2p_0.8.1rc1.patch
View file

@ -893,7 +893,7 @@
+
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -57,6 +57,12 @@
@@ -57,6 +57,12 @@ config IP_NF_IPTABLES
To compile it as a module, choose M here. If unsure, say N.
# The matches.
@ -908,7 +908,7 @@
depends on IP_NF_IPTABLES
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -47,6 +47,8 @@
@@ -47,6 +47,8 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o

6
target/linux/generic-2.6/patches-2.6.25/130-netfilter_ipset.patch
View file

@ -7517,7 +7517,7 @@
+module_exit(ipt_SET_fini);
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -385,5 +385,122 @@
@@ -385,5 +385,122 @@ config IP_NF_ARP_MANGLE
Allows altering the ARP packet payload: source and destination
hardware and network addresses.
@ -7642,7 +7642,7 @@
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -46,6 +46,7 @@
@@ -46,6 +46,7 @@ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
@ -7650,7 +7650,7 @@
obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_ipp2p.o
@@ -59,6 +60,18 @@
@@ -59,6 +60,18 @@ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += i
obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o

4
target/linux/generic-2.6/patches-2.6.25/140-netfilter_time.patch
View file

@ -204,7 +204,7 @@
+}
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -63,6 +63,22 @@
@@ -63,6 +63,22 @@ config IP_NF_MATCH_IPP2P
help
Module for matching traffic of various Peer-to-Peer applications
@ -229,7 +229,7 @@
depends on IP_NF_IPTABLES
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -47,6 +47,7 @@
@@ -47,6 +47,7 @@ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn
obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
obj-$(CONFIG_IP_NF_MATCH_SET) += ipt_set.o

18
target/linux/generic-2.6/patches-2.6.25/150-netfilter_imq.patch
View file

@ -477,7 +477,7 @@
+
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -117,6 +117,129 @@
@@ -117,6 +117,129 @@ config EQUALIZER
To compile this driver as a module, choose M here: the module
will be called eql. If unsure, say N.
@ -609,7 +609,7 @@
select CRC32
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -143,6 +143,7 @@
@@ -143,6 +143,7 @@ obj-$(CONFIG_SLHC) += slhc.o
obj-$(CONFIG_XEN_NETDEV_FRONTEND) += xen-netfront.o
obj-$(CONFIG_DUMMY) += dummy.o
@ -653,7 +653,7 @@
+#endif /* _IP6T_IMQ_H */
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -296,6 +296,10 @@
@@ -296,6 +296,10 @@ struct sk_buff {
struct nf_conntrack *nfct;
struct sk_buff *nfct_reasm;
#endif
@ -664,7 +664,7 @@
#ifdef CONFIG_BRIDGE_NETFILTER
struct nf_bridge_info *nf_bridge;
#endif
@@ -1736,6 +1740,10 @@
@@ -1736,6 +1740,10 @@ static inline void __nf_copy(struct sk_b
dst->nfct_reasm = src->nfct_reasm;
nf_conntrack_get_reasm(src->nfct_reasm);
#endif
@ -687,7 +687,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
@@ -1537,7 +1540,11 @@
@@ -1537,7 +1540,11 @@ static int dev_gso_segment(struct sk_buf
int dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
{
if (likely(!skb->next)) {
@ -774,7 +774,7 @@
+MODULE_LICENSE("GPL");
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -145,6 +145,17 @@
@@ -145,6 +145,17 @@ config IP_NF_FILTER
To compile it as a module, choose M here. If unsure, say N.
@ -794,7 +794,7 @@
depends on IP_NF_FILTER
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -55,6 +55,7 @@
@@ -55,6 +55,7 @@ obj-$(CONFIG_IP_NF_MATCH_IPP2P) += ipt_i
obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
@ -876,7 +876,7 @@
+MODULE_LICENSE("GPL");
--- a/net/ipv6/netfilter/Kconfig
+++ b/net/ipv6/netfilter/Kconfig
@@ -179,6 +179,15 @@
@@ -179,6 +179,15 @@ config IP6_NF_MANGLE
To compile it as a module, choose M here. If unsure, say N.
@ -904,7 +904,7 @@
--- a/net/sched/sch_generic.c
+++ b/net/sched/sch_generic.c
@@ -203,6 +203,7 @@
@@ -203,6 +203,7 @@ void __qdisc_run(struct net_device *dev)
clear_bit(__LINK_STATE_QDISC_RUNNING, &dev->state);
}

12
target/linux/generic-2.6/patches-2.6.25/170-netfilter_chaostables_0.8.patch
View file

@ -95,7 +95,7 @@
+#define xt_request_find_match xt_request_find_match_lo
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -276,6 +276,14 @@
@@ -276,6 +276,14 @@ config NETFILTER_XTABLES
# alphabetically ordered list of targets
@ -110,7 +110,7 @@
config NETFILTER_XT_TARGET_CLASSIFY
tristate '"CLASSIFY" target support'
depends on NETFILTER_XTABLES
@@ -305,6 +313,14 @@
@@ -305,6 +313,14 @@ config NETFILTER_XT_TARGET_CONNMARK
<file:Documentation/kbuild/modules.txt>. The module will be called
ipt_CONNMARK.ko. If unsure, say `N'.
@ -125,7 +125,7 @@
config NETFILTER_XT_TARGET_DSCP
tristate '"DSCP" and "TOS" target support'
depends on NETFILTER_XTABLES
@@ -640,6 +656,14 @@
@@ -640,6 +656,14 @@ config NETFILTER_XT_MATCH_POLICY
To compile it as a module, choose M here. If unsure, say N.
@ -142,7 +142,7 @@
depends on NETFILTER_XTABLES
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -50,6 +50,8 @@
@@ -50,6 +50,8 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPMSS) += xt_TCPMSS.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP) += xt_TCPOPTSTRIP.o
obj-$(CONFIG_NETFILTER_XT_TARGET_TRACE) += xt_TRACE.o
@ -151,7 +151,7 @@
# matches
obj-$(CONFIG_NETFILTER_XT_MATCH_COMMENT) += xt_comment.o
@@ -83,3 +85,4 @@
@@ -83,3 +85,4 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_STRING)
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
obj-$(CONFIG_NETFILTER_XT_MATCH_TIME) += xt_time.o
obj-$(CONFIG_NETFILTER_XT_MATCH_U32) += xt_u32.o
@ -833,7 +833,7 @@
+MODULE_ALIAS("ipt_portscan");
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1563,6 +1563,8 @@
@@ -1563,6 +1563,8 @@ __u32 secure_tcp_sequence_number(__be32
return seq;
}

4
target/linux/generic-2.6/patches-2.6.25/171-netfilter_tarpit.patch
View file

@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -437,6 +437,23 @@
@@ -437,6 +437,23 @@ config NETFILTER_XT_TARGET_CONNSECMARK
To compile it as a module, choose M here. If unsure, say N.
@ -26,7 +26,7 @@
depends on NETFILTER_XTABLES && (IPV6 || IPV6=n)
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -47,6 +47,7 @@
@@ -47,6 +47,7 @@ obj-$(CONFIG_NETFILTER_XT_TARGET_NFQUEUE
obj-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += xt_NOTRACK.o
obj-$(CONFIG_NETFILTER_XT_TARGET_RATEEST) += xt_RATEEST.o
obj-$(CONFIG_NETFILTER_XT_TARGET_SECMARK) += xt_SECMARK.o

4
target/linux/generic-2.6/patches-2.6.25/180-netfilter_depends.patch
View file

@ -1,6 +1,6 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -145,7 +145,7 @@
@@ -145,7 +145,7 @@ config NF_CONNTRACK_FTP
config NF_CONNTRACK_H323
tristate "H.323 protocol support"
@ -9,7 +9,7 @@
depends on NETFILTER_ADVANCED
help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
@@ -456,7 +456,7 @@
@@ -456,7 +456,7 @@ config NETFILTER_XT_TARGET_TARPIT
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'

8
target/linux/generic-2.6/patches-2.6.25/190-netfilter_rtsp.patch
View file

@ -294,7 +294,7 @@
+#endif /* _NETFILTER_MIME_H */
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -23,6 +23,7 @@
@@ -23,6 +23,7 @@ obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_am
obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
@ -304,7 +304,7 @@
obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -258,6 +258,16 @@
@@ -258,6 +258,16 @@ config NF_CONNTRACK_TFTP
To compile it as a module, choose M here. If unsure, say N.
@ -323,7 +323,7 @@
depends on NF_CONNTRACK
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -32,6 +32,7 @@
@@ -32,6 +32,7 @@ obj-$(CONFIG_NF_CONNTRACK_PPTP) += nf_co
obj-$(CONFIG_NF_CONNTRACK_SANE) += nf_conntrack_sane.o
obj-$(CONFIG_NF_CONNTRACK_SIP) += nf_conntrack_sip.o
obj-$(CONFIG_NF_CONNTRACK_TFTP) += nf_conntrack_tftp.o
@ -333,7 +333,7 @@
obj-$(CONFIG_NETFILTER_XTABLES) += x_tables.o xt_tcpudp.o
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -288,6 +288,11 @@
@@ -288,6 +288,11 @@ config NF_NAT_IRC
depends on IP_NF_IPTABLES && NF_CONNTRACK && NF_NAT
default NF_NAT && NF_CONNTRACK_IRC

6
target/linux/generic-2.6/patches-2.6.25/200-sched_esfq.patch
View file

@ -1,6 +1,6 @@
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -162,8 +162,37 @@
@@ -162,8 +162,37 @@ struct tc_sfq_xstats
*
* The only reason for this is efficiency, it is possible
* to change these parameters in compile time.
@ -40,7 +40,7 @@
enum
--- a/net/sched/Kconfig
+++ b/net/sched/Kconfig
@@ -139,6 +139,37 @@
@@ -139,6 +139,37 @@ config NET_SCH_SFQ
To compile this code as a module, choose M here: the
module will be called sch_sfq.
@ -80,7 +80,7 @@
---help---
--- a/net/sched/Makefile
+++ b/net/sched/Makefile
@@ -23,6 +23,7 @@
@@ -23,6 +23,7 @@ obj-$(CONFIG_NET_SCH_GRED) += sch_gred.o
obj-$(CONFIG_NET_SCH_INGRESS) += sch_ingress.o
obj-$(CONFIG_NET_SCH_DSMARK) += sch_dsmark.o
obj-$(CONFIG_NET_SCH_SFQ) += sch_sfq.o

2
target/linux/generic-2.6/patches-2.6.25/202-mips-freestanding.patch
View file

@ -1,6 +1,6 @@
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -593,6 +593,9 @@
@@ -593,6 +593,9 @@ core-$(CONFIG_TOSHIBA_RBTX4938) += arch/
cflags-$(CONFIG_TOSHIBA_RBTX4938) += -Iinclude/asm-mips/mach-tx49xx
load-$(CONFIG_TOSHIBA_RBTX4938) += 0xffffffff80100000

6
target/linux/generic-2.6/patches-2.6.25/204-jffs2_eofdetect.patch
View file

@ -1,6 +1,6 @@
--- a/fs/jffs2/build.c
+++ b/fs/jffs2/build.c
@@ -105,6 +105,17 @@
@@ -105,6 +105,17 @@ static int jffs2_build_filesystem(struct
dbg_fsbuild("scanned flash completely\n");
jffs2_dbg_dump_block_lists_nolock(c);
@ -20,7 +20,7 @@
/* Now scan the directory tree, increasing nlink according to every dirent found. */
--- a/fs/jffs2/scan.c
+++ b/fs/jffs2/scan.c
@@ -142,9 +142,12 @@
@@ -142,9 +142,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
/* reset summary info for next eraseblock scan */
jffs2_sum_reset_collected(s);
@ -36,7 +36,7 @@
if (ret < 0)
goto out;
@@ -545,6 +548,17 @@
@@ -545,6 +548,17 @@ static int jffs2_scan_eraseblock (struct
return err;
}

8
target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1539,7 +1539,7 @@
@@ -1539,7 +1539,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8169,
.region = 1,
.align = 0,
@ -9,7 +9,7 @@
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.msi = 0
@@ -1548,7 +1548,7 @@
@@ -1548,7 +1548,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8168,
.region = 2,
.align = 8,
@ -18,7 +18,7 @@
TxErr | TxOK | RxOK | RxErr,
.napi_event = TxErr | TxOK | RxOK | RxOverflow,
.msi = RTL_FEATURE_MSI
@@ -1557,7 +1557,7 @@
@@ -1557,7 +1557,7 @@ static const struct rtl_cfg_info {
.hw_start = rtl_hw_start_8101,
.region = 2,
.align = 8,
@ -27,7 +27,7 @@
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.msi = RTL_FEATURE_MSI
@@ -2905,10 +2905,12 @@
@@ -2905,10 +2905,12 @@ static irqreturn_t rtl8169_interrupt(int
break;
}

4
target/linux/generic-2.6/patches-2.6.25/209-mini_fo.patch
View file

@ -1,6 +1,6 @@
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1449,6 +1449,9 @@
@@ -1449,6 +1449,9 @@ config VXFS_FS
To compile this as a module, choose M here: the module will be
called freevxfs. If unsure, say N.
@ -12,7 +12,7 @@
depends on BLOCK
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -77,6 +77,7 @@
@@ -77,6 +77,7 @@ obj-$(CONFIG_SQUASHFS) += squashfs/
obj-y += ramfs/
obj-$(CONFIG_HUGETLBFS) += hugetlbfs/
obj-$(CONFIG_CODA_FS) += coda/

16
target/linux/generic-2.6/patches-2.6.25/210-mini_fo_2.6.25_fixes.patch
View file

@ -1,6 +1,6 @@
--- a/fs/mini_fo/main.c
+++ b/fs/mini_fo/main.c
@@ -79,6 +79,7 @@
@@ -79,6 +79,7 @@ mini_fo_tri_interpose(dentry_t *hidden_d
* of the new inode's fields
*/
@ -8,7 +8,7 @@
/*
* original: inode = iget(sb, hidden_inode->i_ino);
*/
@@ -87,6 +88,13 @@
@@ -87,6 +88,13 @@ mini_fo_tri_interpose(dentry_t *hidden_d
err = -EACCES; /* should be impossible??? */
goto out;
}
@ -22,7 +22,7 @@
/*
* interpose the inode if not already interposed
@@ -184,9 +192,9 @@
@@ -184,9 +192,9 @@ mini_fo_parse_options(super_block_t *sb,
hidden_root = ERR_PTR(err);
goto out;
}
@ -35,7 +35,7 @@
} else if(!strncmp("sto=", options, 4)) {
/* parse the storage dir */
@@ -204,9 +212,9 @@
@@ -204,9 +212,9 @@ mini_fo_parse_options(super_block_t *sb,
hidden_root2 = ERR_PTR(err);
goto out;
}
@ -50,7 +50,7 @@
/* validate storage dir, this is done in
--- a/fs/mini_fo/mini_fo.h
+++ b/fs/mini_fo/mini_fo.h
@@ -302,6 +302,10 @@
@@ -302,6 +302,10 @@ extern int mini_fo_tri_interpose(dentry_
extern int mini_fo_cp_cont(dentry_t *tgt_dentry, struct vfsmount *tgt_mnt,
dentry_t *src_dentry, struct vfsmount *src_mnt);
@ -61,7 +61,7 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
extern int mini_fo_create(inode_t *dir, dentry_t *dentry, int mode, struct nameidata *nd);
@@ -501,6 +505,29 @@
@@ -501,6 +505,29 @@ static inline void double_unlock(struct
#endif /* if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
#endif /* __KERNEL__ */
@ -93,7 +93,7 @@
*/
--- a/fs/mini_fo/super.c
+++ b/fs/mini_fo/super.c
@@ -262,10 +262,31 @@
@@ -262,10 +262,31 @@ mini_fo_umount_begin(super_block_t *sb)
}
#endif
@ -127,7 +127,7 @@
#endif /* defined(FIST_DEBUG) || defined(FIST_FILTER_SCA) */
--- a/fs/mini_fo/aux.c
+++ b/fs/mini_fo/aux.c
@@ -164,11 +164,11 @@
@@ -164,11 +164,11 @@ dentry_t *bpath_walk(super_block_t *sb,
err = vfs_path_lookup(mnt->mnt_root, mnt, bpath+1, 0, &nd);
/* validate */

8
target/linux/generic-2.6/patches-2.6.25/211-mini_fo_2.6.25_dentry_open_war.patch
View file

@ -1,6 +1,6 @@
--- a/fs/mini_fo/meta.c
+++ b/fs/mini_fo/meta.c
@@ -442,6 +442,11 @@
@@ -442,6 +442,11 @@ int meta_write_d_entry(dentry_t *dentry,
S_IRUSR | S_IWUSR);
#endif
}
@ -12,7 +12,7 @@
/* open META-file for writing */
meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
if(!meta_file || IS_ERR(meta_file)) {
@@ -535,6 +540,11 @@
@@ -535,6 +540,11 @@ int meta_write_r_entry(dentry_t *dentry,
meta_dentry, S_IRUSR | S_IWUSR);
#endif
}
@ -24,7 +24,7 @@
/* open META-file for writing */
meta_file = dentry_open(meta_dentry, meta_mnt, 0x1);
if(!meta_file || IS_ERR(meta_file)) {
@@ -671,14 +681,16 @@
@@ -671,14 +681,16 @@ int meta_sync_d_list(dentry_t *dentry, i
}
}
@ -44,7 +44,7 @@
dput(meta_dentry);
err = -1;
goto out;
@@ -811,14 +823,16 @@
@@ -811,14 +823,16 @@ int meta_sync_r_list(dentry_t *dentry, i
}
}

6
target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
View file

@ -1,6 +1,6 @@
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -27,7 +27,8 @@
@@ -27,7 +27,8 @@ u64 uevent_seqnum;
char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
static DEFINE_SPINLOCK(sequence_lock);
#if defined(CONFIG_NET)
@ -10,7 +10,7 @@
#endif
/* the strings here must match the enum in include/linux/kobject.h */
@@ -40,6 +41,18 @@
@@ -40,6 +41,18 @@ static const char *kobject_actions[] = {
[KOBJ_OFFLINE] = "offline",
};
@ -29,7 +29,7 @@
/**
* kobject_action_type - translate action string to numeric type
*
@@ -192,9 +205,7 @@
@@ -192,9 +205,7 @@ int kobject_uevent_env(struct kobject *k
kobj->state_remove_uevent_sent = 1;
/* we will send an event, so request a new sequence number */

2
target/linux/generic-2.6/patches-2.6.25/220-sound_kconfig.patch
View file

@ -1,6 +1,6 @@
--- a/sound/core/Kconfig
+++ b/sound/core/Kconfig
@@ -9,7 +9,7 @@
@@ -9,7 +9,7 @@ config SND_PCM
depends on SND
config SND_HWDEP

4
target/linux/generic-2.6/patches-2.6.25/400-ledtrig_morse.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -181,4 +181,8 @@
@@ -181,4 +181,8 @@ config LEDS_TRIGGER_HEARTBEAT
load average.
If unsure, say Y.
@ -11,7 +11,7 @@
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -26,3 +26,4 @@
@@ -26,3 +26,4 @@ obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o

4
target/linux/generic-2.6/patches-2.6.25/401-led_alix.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -79,6 +79,12 @@
@@ -79,6 +79,12 @@ config LEDS_WRAP
help
This option enables support for the PCEngines WRAP programmable LEDs.
@ -15,7 +15,7 @@
depends on LEDS_CLASS && ARCH_H1940
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -14,6 +14,7 @@
@@ -14,6 +14,7 @@ obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c2
obj-$(CONFIG_LEDS_AMS_DELTA) += leds-ams-delta.o
obj-$(CONFIG_LEDS_NET48XX) += leds-net48xx.o
obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o

4
target/linux/generic-2.6/patches-2.6.25/402-ledtrig_default_on.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -191,4 +191,11 @@
@@ -191,4 +191,11 @@ config LEDS_TRIGGER_MORSE
tristate "LED Morse Trigger"
depends on LEDS_TRIGGERS
@ -14,7 +14,7 @@
endif # NEW_LEDS
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -28,3 +28,4 @@
@@ -28,3 +28,4 @@ obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledt
obj-$(CONFIG_LEDS_TRIGGER_IDE_DISK) += ledtrig-ide-disk.o
obj-$(CONFIG_LEDS_TRIGGER_HEARTBEAT) += ledtrig-heartbeat.o
obj-$(CONFIG_LEDS_TRIGGER_MORSE) += ledtrig-morse.o

4
target/linux/generic-2.6/patches-2.6.25/410-gpio_buttons.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -197,4 +197,20 @@
@@ -197,4 +197,20 @@ config HP_SDC_RTC
Say Y here if you want to support the built-in real time clock
of the HP SDC controller.
@ -23,7 +23,7 @@
endif
--- a/drivers/input/misc/Makefile
+++ b/drivers/input/misc/Makefile
@@ -19,3 +19,4 @@
@@ -19,3 +19,4 @@ obj-$(CONFIG_INPUT_YEALINK) += yealink.
obj-$(CONFIG_HP_SDC_RTC) += hp_sdc_rtc.o
obj-$(CONFIG_INPUT_UINPUT) += uinput.o
obj-$(CONFIG_INPUT_APANEL) += apanel.o

4
target/linux/generic-2.6/patches-2.6.25/420-gpiodev.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -955,6 +955,13 @@
@@ -955,6 +955,13 @@ config CS5535_GPIO
If compiled as a module, it will be called cs5535_gpio.
@ -16,7 +16,7 @@
depends on CPU_VR41XX
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -94,6 +94,7 @@
@@ -94,6 +94,7 @@ obj-$(CONFIG_SCx200_GPIO) += scx200_gpio
obj-$(CONFIG_PC8736x_GPIO) += pc8736x_gpio.o
obj-$(CONFIG_NSC_GPIO) += nsc_gpio.o
obj-$(CONFIG_CS5535_GPIO) += cs5535_gpio.o

4
target/linux/generic-2.6/patches-2.6.25/510-yaffs_support.patch
View file

@ -1,6 +1,6 @@
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -421,6 +421,7 @@
@@ -421,6 +421,7 @@ config FS_POSIX_ACL
source "fs/xfs/Kconfig"
source "fs/gfs2/Kconfig"
@ -10,7 +10,7 @@
tristate "OCFS2 file system support"
--- a/fs/Makefile
+++ b/fs/Makefile
@@ -121,3 +121,4 @@
@@ -121,3 +121,4 @@ obj-$(CONFIG_HPPFS) += hppfs/
obj-$(CONFIG_DEBUG_FS) += debugfs/
obj-$(CONFIG_OCFS2_FS) += ocfs2/
obj-$(CONFIG_GFS2_FS) += gfs2/

10
target/linux/generic-2.6/patches-2.6.25/512-yaffs_2.6.25_fix.patch
View file

@ -1,6 +1,6 @@
--- a/fs/yaffs2/yaffs_fs.c
+++ b/fs/yaffs2/yaffs_fs.c
@@ -181,7 +181,13 @@
@@ -181,7 +181,13 @@ static int yaffs_statfs(struct super_blo
#else
static int yaffs_statfs(struct super_block *sb, struct statfs *buf);
#endif
@ -14,7 +14,7 @@
static void yaffs_put_inode(struct inode *inode);
static void yaffs_delete_inode(struct inode *);
@@ -284,7 +290,9 @@
@@ -284,7 +290,9 @@ static struct file_operations yaffs_dir_
static struct super_operations yaffs_super_ops = {
.statfs = yaffs_statfs,
@ -24,7 +24,7 @@
.put_inode = yaffs_put_inode,
.put_super = yaffs_put_super,
.delete_inode = yaffs_delete_inode,
@@ -844,11 +852,17 @@
@@ -844,11 +852,17 @@ struct inode *yaffs_get_inode(struct sup
T(YAFFS_TRACE_OS,
(KERN_DEBUG "yaffs_get_inode for object %d\n", obj->objectId));
@ -42,7 +42,7 @@
return inode;
}
@@ -1427,6 +1441,39 @@
@@ -1427,6 +1441,39 @@ static int yaffs_sync_fs(struct super_bl
}
@ -82,7 +82,7 @@
static void yaffs_read_inode(struct inode *inode)
{
/* NB This is called as a side effect of other functions, but
@@ -1448,6 +1495,7 @@
@@ -1448,6 +1495,7 @@ static void yaffs_read_inode(struct inod
yaffs_GrossUnlock(dev);
}

4
target/linux/generic-2.6/patches-2.6.25/600-phy_extension.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -348,6 +348,50 @@
@@ -348,6 +348,50 @@ int phy_ethtool_gset(struct phy_device *
}
EXPORT_SYMBOL(phy_ethtool_gset);
@ -53,7 +53,7 @@
* @phydev: the phy_device struct
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -399,6 +399,7 @@
@@ -399,6 +399,7 @@ void phy_start_machine(struct phy_device
void phy_stop_machine(struct phy_device *phydev);
int phy_ethtool_sset(struct phy_device *phydev, struct ethtool_cmd *cmd);
int phy_ethtool_gset(struct phy_device *phydev, struct ethtool_cmd *cmd);

4
target/linux/generic-2.6/patches-2.6.25/610-phy_detect.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -132,6 +132,9 @@
@@ -132,6 +132,9 @@ static int mdio_bus_match(struct device
struct phy_device *phydev = to_phy_device(dev);
struct phy_driver *phydrv = to_phy_driver(drv);
@ -12,7 +12,7 @@
}
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -325,6 +325,11 @@
@@ -325,6 +325,11 @@ struct phy_driver {
u32 features;
u32 flags;

4
target/linux/generic-2.6/patches-2.6.25/620-phy_adm6996.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -65,6 +65,11 @@
@@ -65,6 +65,11 @@ config REALTEK_PHY
---help---
Supports the Realtek 821x PHY.
@ -14,7 +14,7 @@
depends on PHYLIB=y
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -12,6 +12,7 @@
@@ -12,6 +12,7 @@ obj-$(CONFIG_SMSC_PHY) += smsc.o
obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
obj-$(CONFIG_ICPLUS_PHY) += icplus.o

8
target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -53,6 +53,18 @@
@@ -53,6 +53,18 @@ static void phy_device_release(struct de
phy_device_free(to_phy_device(dev));
}
@ -19,7 +19,7 @@
struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
{
struct phy_device *dev;
@@ -78,6 +90,8 @@
@@ -78,6 +90,8 @@ struct phy_device* phy_device_create(str
dev->bus = bus;
dev->state = PHY_DOWN;
@ -30,7 +30,7 @@
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -295,6 +295,17 @@
@@ -295,6 +295,17 @@ struct phy_device {
void (*adjust_link)(struct net_device *dev);
void (*adjust_state)(struct net_device *dev);
@ -50,7 +50,7 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -595,6 +595,7 @@
@@ -595,6 +595,7 @@ struct net_device
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */

6
target/linux/generic-2.6/patches-2.6.25/640-mvswitch.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -70,6 +70,12 @@
@@ -70,6 +70,12 @@ config ADM6996_PHY
---help---
Currently supports the ADM6996F switch
@ -15,7 +15,7 @@
depends on PHYLIB=y
--- a/drivers/net/phy/Makefile
+++ b/drivers/net/phy/Makefile
@@ -13,6 +13,7 @@
@@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY) += vitesse.o
obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
obj-$(CONFIG_ICPLUS_PHY) += icplus.o
obj-$(CONFIG_ADM6996_PHY) += adm6996.o
@ -38,7 +38,7 @@
/**
* mdiobus_register - bring up all the PHYs on a given bus and attach them to bus
* @bus: target mii_bus
@@ -85,6 +91,7 @@
@@ -85,6 +91,7 @@ int mdiobus_register(struct mii_bus *bus
phydev->dev.parent = bus->dev;
phydev->dev.bus = &mdio_bus_type;

1388
target/linux/generic-2.6/patches-2.6.25/700-powerpc_git.patch
View file

File diff suppressed because it is too large Load diff

6
target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch
View file

@ -1,6 +1,6 @@
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -58,6 +58,7 @@
@@ -58,6 +58,7 @@ static struct usb_driver usb_serial_driv
drivers depend on it.
*/
@ -8,7 +8,7 @@
static int debug;
static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; /* initially all NULL */
static DEFINE_MUTEX(table_lock);
@@ -903,7 +904,7 @@
@@ -903,7 +904,7 @@ int usb_serial_probe(struct usb_interfac
dev_err(&interface->dev, "No free urbs available\n");
goto probe_error;
}
@ -17,7 +17,7 @@
port->bulk_in_size = buffer_size;
port->bulk_in_endpointAddress = endpoint->bEndpointAddress;
port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL);
@@ -1315,3 +1316,5 @@
@@ -1315,3 +1316,5 @@ MODULE_LICENSE("GPL");
module_param(debug, bool, S_IRUGO | S_IWUSR);
MODULE_PARM_DESC(debug, "Debug enabled or not");

2
target/linux/generic-2.6/patches-2.6.25/840-unable_to_open_console.patch
View file

@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
@@ -775,7 +775,7 @@
@@ -775,7 +775,7 @@ static int noinline init_post(void)
numa_default_policy();
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)

4
target/linux/generic-2.6/patches-2.6.25/850-jffs2_erase_progress_indicator.patch
View file

@ -1,6 +1,6 @@
--- a/fs/jffs2/erase.c
+++ b/fs/jffs2/erase.c
@@ -35,6 +35,8 @@
@@ -35,6 +35,8 @@ static void jffs2_erase_block(struct jff
{
int ret;
uint32_t bad_offset;
@ -9,7 +9,7 @@
#ifdef __ECOS
ret = jffs2_flash_erase(c, jeb);
if (!ret) {
@@ -47,6 +49,11 @@
@@ -47,6 +49,11 @@ static void jffs2_erase_block(struct jff
D1(printk(KERN_DEBUG "jffs2_erase_block(): erase block %#08x (range %#08x-%#08x)\n",
jeb->offset, jeb->offset, jeb->offset + c->sector_size));

4
target/linux/generic-2.6/patches-2.6.25/900-headers_type_and_time.patch
View file

@ -11,7 +11,7 @@
#include <linux/types.h>
#ifdef __KERNEL__
@@ -232,4 +236,6 @@
@@ -232,4 +236,6 @@ struct itimerval {
*/
#define TIMER_ABSTIME 0x01
@ -35,7 +35,7 @@
#ifdef __KERNEL__
#define DECLARE_BITMAP(name,bits) \
@@ -161,6 +169,8 @@
@@ -161,6 +169,8 @@ typedef unsigned long blkcnt_t;
#endif /* __KERNEL_STRICT_NAMES */

Some files were not shown because too many files have changed in this diff Show more