qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-25 11:02:26 +02:00
Code

[ar7] refresh kernel patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11196 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2008-05-19 07:06:35 +00:00
parent efe0e0af7d
commit 2b43286d28
30 changed files with 286 additions and 275 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
target/linux/ar7/patches-2.6.23/100-board_support.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/arch/mips/Kconfig Index: linux-2.6.23.17/arch/mips/Kconfig
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/arch/mips/Kconfig 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.23.17.orig/arch/mips/Kconfig
+++ linux-2.6.23-rc6/arch/mips/Kconfig 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.23.17/arch/mips/Kconfig
@@ -15,6 +15,22 @@ @@ -15,6 +15,22 @@ choice
prompt "System type" prompt "System type"
default SGI_IP22 default SGI_IP22
@ -25,11 +25,11 @@ Index: linux-2.6.23-rc6/arch/mips/Kconfig
config MACH_ALCHEMY config MACH_ALCHEMY
bool "Alchemy processor based machines" bool "Alchemy processor based machines"
Index: linux-2.6.23-rc6/arch/mips/kernel/traps.c Index: linux-2.6.23.17/arch/mips/kernel/traps.c
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/arch/mips/kernel/traps.c 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.23.17.orig/arch/mips/kernel/traps.c
+++ linux-2.6.23-rc6/arch/mips/kernel/traps.c 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.23.17/arch/mips/kernel/traps.c
@@ -1075,10 +1075,23 @@ @@ -1075,10 +1075,23 @@ void *set_except_vector(int n, void *add
exception_handlers[n] = handler; exception_handlers[n] = handler;
if (n == 0 && cpu_has_divec) { if (n == 0 && cpu_has_divec) {
@ -57,11 +57,11 @@ Index: linux-2.6.23-rc6/arch/mips/kernel/traps.c
return (void *)old_handler; return (void *)old_handler;
} }
Index: linux-2.6.23-rc6/arch/mips/Makefile Index: linux-2.6.23.17/arch/mips/Makefile
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/arch/mips/Makefile 2007-09-21 16:24:05.000000000 +0800 --- linux-2.6.23.17.orig/arch/mips/Makefile
+++ linux-2.6.23-rc6/arch/mips/Makefile 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.23.17/arch/mips/Makefile
@@ -161,6 +161,13 @@ @@ -161,6 +161,13 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/s
# #
# #
@ -75,11 +75,11 @@ Index: linux-2.6.23-rc6/arch/mips/Makefile
# Acer PICA 61, Mips Magnum 4000 and Olivetti M700. # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
# #
core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/ core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
Index: linux-2.6.23-rc6/include/asm-mips/page.h Index: linux-2.6.23.17/include/asm-mips/page.h
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/include/asm-mips/page.h 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.23.17.orig/include/asm-mips/page.h
+++ linux-2.6.23-rc6/include/asm-mips/page.h 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.23.17/include/asm-mips/page.h
@@ -184,8 +184,10 @@ @@ -184,8 +184,10 @@ typedef struct { unsigned long pgprot; }
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

24
target/linux/ar7/patches-2.6.23/110-flash.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/drivers/mtd/Kconfig Index: linux-2.6.23.17/drivers/mtd/Kconfig
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/Kconfig 2007-09-21 16:23:59.000000000 +0800 --- linux-2.6.23.17.orig/drivers/mtd/Kconfig
+++ linux-2.6.23-rc6/drivers/mtd/Kconfig 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.23.17/drivers/mtd/Kconfig
@@ -160,6 +160,12 @@ @@ -160,6 +160,12 @@ config MTD_AFS_PARTS
for your particular device. It won't happen automatically. The for your particular device. It won't happen automatically. The
'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example. 'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
@ -15,11 +15,11 @@ Index: linux-2.6.23-rc6/drivers/mtd/Kconfig
comment "User Modules And Translation Layers" comment "User Modules And Translation Layers"
config MTD_CHAR config MTD_CHAR
Index: linux-2.6.23-rc6/drivers/mtd/Makefile Index: linux-2.6.23.17/drivers/mtd/Makefile
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/Makefile 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.23.17.orig/drivers/mtd/Makefile
+++ linux-2.6.23-rc6/drivers/mtd/Makefile 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.23.17/drivers/mtd/Makefile
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
@ -27,11 +27,11 @@ Index: linux-2.6.23-rc6/drivers/mtd/Makefile
# 'Users' - code which presents functionality to userspace. # 'Users' - code which presents functionality to userspace.
obj-$(CONFIG_MTD_CHAR) += mtdchar.o obj-$(CONFIG_MTD_CHAR) += mtdchar.o
Index: linux-2.6.23-rc6/drivers/mtd/maps/physmap.c Index: linux-2.6.23.17/drivers/mtd/maps/physmap.c
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/maps/physmap.c 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.23.17.orig/drivers/mtd/maps/physmap.c
+++ linux-2.6.23-rc6/drivers/mtd/maps/physmap.c 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.23.17/drivers/mtd/maps/physmap.c
@@ -74,7 +74,8 @@ @@ -74,7 +74,8 @@ static int physmap_flash_remove(struct p
static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL }; static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS

16
target/linux/ar7/patches-2.6.23/120-gpio_chrdev.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/drivers/char/Kconfig Index: linux-2.6.23.17/drivers/char/Kconfig
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/char/Kconfig 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.23.17.orig/drivers/char/Kconfig
+++ linux-2.6.23-rc6/drivers/char/Kconfig 2007-09-21 16:24:12.000000000 +0800 +++ linux-2.6.23.17/drivers/char/Kconfig
@@ -928,6 +928,15 @@ @@ -928,6 +928,15 @@ config MWAVE
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called mwave. module will be called mwave.
@ -18,11 +18,11 @@ Index: linux-2.6.23-rc6/drivers/char/Kconfig
config SCx200_GPIO config SCx200_GPIO
tristate "NatSemi SCx200 GPIO Support" tristate "NatSemi SCx200 GPIO Support"
depends on SCx200 depends on SCx200
Index: linux-2.6.23-rc6/drivers/char/Makefile Index: linux-2.6.23.17/drivers/char/Makefile
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/char/Makefile 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.23.17.orig/drivers/char/Makefile
+++ linux-2.6.23-rc6/drivers/char/Makefile 2007-09-21 16:24:12.000000000 +0800 +++ linux-2.6.23.17/drivers/char/Makefile
@@ -89,6 +89,7 @@ @@ -89,6 +89,7 @@ obj-$(CONFIG_COBALT_LCD) += lcd.o
obj-$(CONFIG_PPDEV) += ppdev.o obj-$(CONFIG_PPDEV) += ppdev.o
obj-$(CONFIG_NWBUTTON) += nwbutton.o obj-$(CONFIG_NWBUTTON) += nwbutton.o
obj-$(CONFIG_NWFLASH) += nwflash.o obj-$(CONFIG_NWFLASH) += nwflash.o

18
target/linux/ar7/patches-2.6.23/130-vlynq.patch
View File

@ -1,17 +1,19 @@
diff -urN linux-2.6.23.1.orig/drivers/Kconfig linux-2.6.23.1/drivers/Kconfig Index: linux-2.6.23.17/drivers/Kconfig
--- linux-2.6.23.1.orig/drivers/Kconfig 2008-01-29 00:49:27.000000000 +0100 ===================================================================
+++ linux-2.6.23.1/drivers/Kconfig 2008-01-29 00:50:39.000000000 +0100 --- linux-2.6.23.17.orig/drivers/Kconfig
@@ -91,4 +91,6 @@ +++ linux-2.6.23.17/drivers/Kconfig
@@ -93,4 +93,6 @@ source "drivers/kvm/Kconfig"
source "drivers/uio/Kconfig" source "drivers/uio/Kconfig"
source "drivers/lguest/Kconfig" source "drivers/lguest/Kconfig"
+ +
+source "drivers/vlynq/Kconfig" +source "drivers/vlynq/Kconfig"
endmenu endmenu
diff -urN linux-2.6.23.1.orig/drivers/Makefile linux-2.6.23.1/drivers/Makefile Index: linux-2.6.23.17/drivers/Makefile
--- linux-2.6.23.1.orig/drivers/Makefile 2008-01-29 00:49:27.000000000 +0100 ===================================================================
+++ linux-2.6.23.1/drivers/Makefile 2008-01-29 00:51:20.000000000 +0100 --- linux-2.6.23.17.orig/drivers/Makefile
@@ -88,4 +88,5 @@ +++ linux-2.6.23.17/drivers/Makefile
@@ -89,4 +89,5 @@ obj-$(CONFIG_DMA_ENGINE) += dma/
obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_HID) += hid/
obj-$(CONFIG_PPC_PS3) += ps3/ obj-$(CONFIG_PPC_PS3) += ps3/
obj-$(CONFIG_OF) += of/ obj-$(CONFIG_OF) += of/

16
target/linux/ar7/patches-2.6.23/140-watchdog.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/drivers/char/watchdog/Kconfig Index: linux-2.6.23.17/drivers/char/watchdog/Kconfig
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/char/watchdog/Kconfig 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.23.17.orig/drivers/char/watchdog/Kconfig
+++ linux-2.6.23-rc6/drivers/char/watchdog/Kconfig 2007-09-21 16:24:12.000000000 +0800 +++ linux-2.6.23.17/drivers/char/watchdog/Kconfig
@@ -583,6 +583,12 @@ @@ -583,6 +583,12 @@ config SBC_EPX_C3_WATCHDOG
# MIPS Architecture # MIPS Architecture
@ -15,11 +15,11 @@ Index: linux-2.6.23-rc6/drivers/char/watchdog/Kconfig
config INDYDOG config INDYDOG
tristate "Indy/I2 Hardware Watchdog" tristate "Indy/I2 Hardware Watchdog"
depends on SGI_IP22 depends on SGI_IP22
Index: linux-2.6.23-rc6/drivers/char/watchdog/Makefile Index: linux-2.6.23.17/drivers/char/watchdog/Makefile
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/char/watchdog/Makefile 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.23.17.orig/drivers/char/watchdog/Makefile
+++ linux-2.6.23-rc6/drivers/char/watchdog/Makefile 2007-09-21 16:24:12.000000000 +0800 +++ linux-2.6.23.17/drivers/char/watchdog/Makefile
@@ -87,6 +87,7 @@ @@ -87,6 +87,7 @@ obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc
# M68KNOMMU Architecture # M68KNOMMU Architecture
# MIPS Architecture # MIPS Architecture

16
target/linux/ar7/patches-2.6.23/200-ethernet_driver.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.23/drivers/net/Kconfig Index: linux-2.6.23.17/drivers/net/Kconfig
=================================================================== ===================================================================
--- linux-2.6.23.orig/drivers/net/Kconfig 2007-10-10 13:52:54.000000000 +0800 --- linux-2.6.23.17.orig/drivers/net/Kconfig
+++ linux-2.6.23/drivers/net/Kconfig 2007-10-10 13:53:54.000000000 +0800 +++ linux-2.6.23.17/drivers/net/Kconfig
@@ -1965,6 +1965,15 @@ @@ -1965,6 +1965,15 @@ config SC92031
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called sc92031. This is recommended. will be called sc92031. This is recommended.
@ -18,11 +18,11 @@ Index: linux-2.6.23/drivers/net/Kconfig
config NET_POCKET config NET_POCKET
bool "Pocket and portable adapters" bool "Pocket and portable adapters"
depends on PARPORT depends on PARPORT
Index: linux-2.6.23/drivers/net/Makefile Index: linux-2.6.23.17/drivers/net/Makefile
=================================================================== ===================================================================
--- linux-2.6.23.orig/drivers/net/Makefile 2007-10-10 13:52:54.000000000 +0800 --- linux-2.6.23.17.orig/drivers/net/Makefile
+++ linux-2.6.23/drivers/net/Makefile 2007-10-10 13:53:54.000000000 +0800 +++ linux-2.6.23.17/drivers/net/Makefile
@@ -156,6 +156,7 @@ @@ -156,6 +156,7 @@ obj-$(CONFIG_8139CP) += 8139cp.o
obj-$(CONFIG_8139TOO) += 8139too.o obj-$(CONFIG_8139TOO) += 8139too.o
obj-$(CONFIG_ZNET) += znet.o obj-$(CONFIG_ZNET) += znet.o
obj-$(CONFIG_LAN_SAA9730) += saa9730.o obj-$(CONFIG_LAN_SAA9730) += saa9730.o

16
target/linux/ar7/patches-2.6.23/210-phy_fixed.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/drivers/net/phy/fixed.c Index: linux-2.6.23.17/drivers/net/phy/fixed.c
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/net/phy/fixed.c 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.23.17.orig/drivers/net/phy/fixed.c
+++ linux-2.6.23-rc6/drivers/net/phy/fixed.c 2007-09-21 16:24:13.000000000 +0800 +++ linux-2.6.23.17/drivers/net/phy/fixed.c
@@ -189,6 +189,19 @@ @@ -189,6 +189,19 @@ static struct phy_driver fixed_mdio_driv
.driver = { .owner = THIS_MODULE,}, .driver = { .owner = THIS_MODULE,},
}; };
@ -22,7 +22,7 @@ Index: linux-2.6.23-rc6/drivers/net/phy/fixed.c
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
* This func is used to create all the necessary stuff, bind * This func is used to create all the necessary stuff, bind
* the fixed phy driver and register all it on the mdio_bus_type. * the fixed phy driver and register all it on the mdio_bus_type.
@@ -224,6 +237,12 @@ @@ -224,6 +237,12 @@ static int fixed_mdio_register_device(in
} }
fixed->regs = kzalloc(MII_REGS_NUM*sizeof(int), GFP_KERNEL); fixed->regs = kzalloc(MII_REGS_NUM*sizeof(int), GFP_KERNEL);
@ -35,7 +35,7 @@ Index: linux-2.6.23-rc6/drivers/net/phy/fixed.c
fixed->regs_num = MII_REGS_NUM; fixed->regs_num = MII_REGS_NUM;
fixed->phy_status.speed = speed; fixed->phy_status.speed = speed;
fixed->phy_status.duplex = duplex; fixed->phy_status.duplex = duplex;
@@ -252,8 +271,11 @@ @@ -252,8 +271,11 @@ static int fixed_mdio_register_device(in
fixed->phydev = phydev; fixed->phydev = phydev;
if(NULL == phydev) { if(NULL == phydev) {
@ -49,7 +49,7 @@ Index: linux-2.6.23-rc6/drivers/net/phy/fixed.c
} }
phydev->irq = PHY_IGNORE_INTERRUPT; phydev->irq = PHY_IGNORE_INTERRUPT;
@@ -265,8 +287,33 @@ @@ -265,8 +287,33 @@ static int fixed_mdio_register_device(in
else else
snprintf(phydev->dev.bus_id, BUS_ID_SIZE, snprintf(phydev->dev.bus_id, BUS_ID_SIZE,
"fixed@%d:%d", speed, duplex); "fixed@%d:%d", speed, duplex);
@ -83,7 +83,7 @@ Index: linux-2.6.23-rc6/drivers/net/phy/fixed.c
err = device_register(&phydev->dev); err = device_register(&phydev->dev);
if(err) { if(err) {
printk(KERN_ERR "Phy %s failed to register\n", printk(KERN_ERR "Phy %s failed to register\n",
@@ -303,6 +350,7 @@ @@ -303,6 +350,7 @@ device_create_fail:
kfree(fixed); kfree(fixed);
return err; return err;

24
target/linux/ar7/patches-2.6.23/500-serial_kludge.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/drivers/serial/8250.c Index: linux-2.6.23.17/drivers/serial/8250.c
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/serial/8250.c 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.23.17.orig/drivers/serial/8250.c
+++ linux-2.6.23-rc6/drivers/serial/8250.c 2007-09-21 16:24:14.000000000 +0800 +++ linux-2.6.23.17/drivers/serial/8250.c
@@ -267,6 +267,13 @@ @@ -267,6 +267,13 @@ static const struct serial8250_config ua
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
.flags = UART_CAP_FIFO, .flags = UART_CAP_FIFO,
}, },
@ -16,7 +16,7 @@ Index: linux-2.6.23-rc6/drivers/serial/8250.c
}; };
#if defined (CONFIG_SERIAL_8250_AU1X00) #if defined (CONFIG_SERIAL_8250_AU1X00)
@@ -2453,7 +2460,11 @@ @@ -2455,7 +2462,11 @@ static void serial8250_console_putchar(s
{ {
struct uart_8250_port *up = (struct uart_8250_port *)port; struct uart_8250_port *up = (struct uart_8250_port *)port;
@ -28,10 +28,10 @@ Index: linux-2.6.23-rc6/drivers/serial/8250.c
serial_out(up, UART_TX, ch); serial_out(up, UART_TX, ch);
} }
Index: linux-2.6.23-rc6/include/linux/serial_core.h Index: linux-2.6.23.17/include/linux/serial_core.h
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/include/linux/serial_core.h 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.23.17.orig/include/linux/serial_core.h
+++ linux-2.6.23-rc6/include/linux/serial_core.h 2007-09-21 16:24:14.000000000 +0800 +++ linux-2.6.23.17/include/linux/serial_core.h
@@ -40,6 +40,7 @@ @@ -40,6 +40,7 @@
#define PORT_NS16550A 14 #define PORT_NS16550A 14
#define PORT_XSCALE 15 #define PORT_XSCALE 15
@ -40,11 +40,11 @@ Index: linux-2.6.23-rc6/include/linux/serial_core.h
#define PORT_MAX_8250 16 /* max port ID */ #define PORT_MAX_8250 16 /* max port ID */
/* /*
Index: linux-2.6.23-rc6/include/linux/serialP.h Index: linux-2.6.23.17/include/linux/serialP.h
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/include/linux/serialP.h 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.23.17.orig/include/linux/serialP.h
+++ linux-2.6.23-rc6/include/linux/serialP.h 2007-09-21 16:24:14.000000000 +0800 +++ linux-2.6.23.17/include/linux/serialP.h
@@ -135,6 +135,10 @@ @@ -135,6 +135,10 @@ struct rs_multiport_struct {
* the interrupt line _up_ instead of down, so if we register the IRQ * the interrupt line _up_ instead of down, so if we register the IRQ
* while the UART is in that state, we die in an IRQ storm. */ * while the UART is in that state, we die in an IRQ storm. */
#define ALPHA_KLUDGE_MCR (UART_MCR_OUT2) #define ALPHA_KLUDGE_MCR (UART_MCR_OUT2)

32
target/linux/ar7/patches-2.6.24/100-board_support.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/arch/mips/Kconfig Index: linux-2.6.24.7/arch/mips/Kconfig
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/arch/mips/Kconfig 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.24.7.orig/arch/mips/Kconfig
+++ linux-2.6.23-rc6/arch/mips/Kconfig 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.24.7/arch/mips/Kconfig
@@ -15,6 +15,24 @@ @@ -16,6 +16,24 @@ choice
prompt "System type" prompt "System type"
default SGI_IP22 default SGI_IP22
@ -27,11 +27,11 @@ Index: linux-2.6.23-rc6/arch/mips/Kconfig
config MACH_ALCHEMY config MACH_ALCHEMY
bool "Alchemy processor based machines" bool "Alchemy processor based machines"
Index: linux-2.6.23-rc6/arch/mips/kernel/traps.c Index: linux-2.6.24.7/arch/mips/kernel/traps.c
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/arch/mips/kernel/traps.c 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.24.7.orig/arch/mips/kernel/traps.c
+++ linux-2.6.23-rc6/arch/mips/kernel/traps.c 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.24.7/arch/mips/kernel/traps.c
@@ -1093,9 +1093,22 @@ void *set_except_vector(int n, void *addr) @@ -1093,9 +1093,22 @@ void *set_except_vector(int n, void *add
exception_handlers[n] = handler; exception_handlers[n] = handler;
if (n == 0 && cpu_has_divec) { if (n == 0 && cpu_has_divec) {
@ -57,11 +57,11 @@ Index: linux-2.6.23-rc6/arch/mips/kernel/traps.c
} }
return (void *)old_handler; return (void *)old_handler;
} }
Index: linux-2.6.23-rc6/arch/mips/Makefile Index: linux-2.6.24.7/arch/mips/Makefile
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/arch/mips/Makefile 2007-09-21 16:24:05.000000000 +0800 --- linux-2.6.24.7.orig/arch/mips/Makefile
+++ linux-2.6.23-rc6/arch/mips/Makefile 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.24.7/arch/mips/Makefile
@@ -161,6 +161,13 @@ @@ -159,6 +159,13 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/s
# #
# #
@ -75,11 +75,11 @@ Index: linux-2.6.23-rc6/arch/mips/Makefile
# Acer PICA 61, Mips Magnum 4000 and Olivetti M700. # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
# #
core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/ core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
Index: linux-2.6.23-rc6/include/asm-mips/page.h Index: linux-2.6.24.7/include/asm-mips/page.h
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/include/asm-mips/page.h 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.24.7.orig/include/asm-mips/page.h
+++ linux-2.6.23-rc6/include/asm-mips/page.h 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.24.7/include/asm-mips/page.h
@@ -184,8 +184,10 @@ @@ -184,8 +184,10 @@ typedef struct { unsigned long pgprot; }
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

24
target/linux/ar7/patches-2.6.24/110-flash.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/drivers/mtd/Kconfig Index: linux-2.6.24.7/drivers/mtd/Kconfig
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/Kconfig 2007-09-21 16:23:59.000000000 +0800 --- linux-2.6.24.7.orig/drivers/mtd/Kconfig
+++ linux-2.6.23-rc6/drivers/mtd/Kconfig 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.24.7/drivers/mtd/Kconfig
@@ -160,6 +160,12 @@ @@ -160,6 +160,12 @@ config MTD_AFS_PARTS
for your particular device. It won't happen automatically. The for your particular device. It won't happen automatically. The
'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example. 'armflash' map driver (CONFIG_MTD_ARMFLASH) does this, for example.
@ -15,11 +15,11 @@ Index: linux-2.6.23-rc6/drivers/mtd/Kconfig
comment "User Modules And Translation Layers" comment "User Modules And Translation Layers"
config MTD_CHAR config MTD_CHAR
Index: linux-2.6.23-rc6/drivers/mtd/Makefile Index: linux-2.6.24.7/drivers/mtd/Makefile
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/Makefile 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.24.7.orig/drivers/mtd/Makefile
+++ linux-2.6.23-rc6/drivers/mtd/Makefile 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.24.7/drivers/mtd/Makefile
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@ obj-$(CONFIG_MTD_CONCAT) += mtdconcat.o
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
@ -27,11 +27,11 @@ Index: linux-2.6.23-rc6/drivers/mtd/Makefile
# 'Users' - code which presents functionality to userspace. # 'Users' - code which presents functionality to userspace.
obj-$(CONFIG_MTD_CHAR) += mtdchar.o obj-$(CONFIG_MTD_CHAR) += mtdchar.o
Index: linux-2.6.23-rc6/drivers/mtd/maps/physmap.c Index: linux-2.6.24.7/drivers/mtd/maps/physmap.c
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/mtd/maps/physmap.c 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.24.7.orig/drivers/mtd/maps/physmap.c
+++ linux-2.6.23-rc6/drivers/mtd/maps/physmap.c 2007-09-21 16:24:11.000000000 +0800 +++ linux-2.6.24.7/drivers/mtd/maps/physmap.c
@@ -74,7 +74,8 @@ @@ -74,7 +74,8 @@ static int physmap_flash_remove(struct p
static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL }; static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS

16
target/linux/ar7/patches-2.6.24/120-gpio_chrdev.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc6/drivers/char/Kconfig Index: linux-2.6.24.7/drivers/char/Kconfig
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/char/Kconfig 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.24.7.orig/drivers/char/Kconfig
+++ linux-2.6.23-rc6/drivers/char/Kconfig 2007-09-21 16:24:12.000000000 +0800 +++ linux-2.6.24.7/drivers/char/Kconfig
@@ -928,6 +928,15 @@ @@ -904,6 +904,15 @@ config MWAVE
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called mwave. module will be called mwave.
@ -18,11 +18,11 @@ Index: linux-2.6.23-rc6/drivers/char/Kconfig
config SCx200_GPIO config SCx200_GPIO
tristate "NatSemi SCx200 GPIO Support" tristate "NatSemi SCx200 GPIO Support"
depends on SCx200 depends on SCx200
Index: linux-2.6.23-rc6/drivers/char/Makefile Index: linux-2.6.24.7/drivers/char/Makefile
=================================================================== ===================================================================
--- linux-2.6.23-rc6.orig/drivers/char/Makefile 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.24.7.orig/drivers/char/Makefile
+++ linux-2.6.23-rc6/drivers/char/Makefile 2007-09-21 16:24:12.000000000 +0800 +++ linux-2.6.24.7/drivers/char/Makefile
@@ -89,6 +89,7 @@ @@ -89,6 +89,7 @@ obj-$(CONFIG_COBALT_LCD) += lcd.o
obj-$(CONFIG_PPDEV) += ppdev.o obj-$(CONFIG_PPDEV) += ppdev.o
obj-$(CONFIG_NWBUTTON) += nwbutton.o obj-$(CONFIG_NWBUTTON) += nwbutton.o
obj-$(CONFIG_NWFLASH) += nwflash.o obj-$(CONFIG_NWFLASH) += nwflash.o

17
target/linux/ar7/patches-2.6.24/130-vlynq.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.23-rc9/drivers/Kconfig Index: linux-2.6.24.7/drivers/Kconfig
=================================================================== ===================================================================
--- linux-2.6.23-rc9.orig/drivers/Kconfig 2007-10-05 20:47:14.000000000 +0800 --- linux-2.6.24.7.orig/drivers/Kconfig
+++ linux-2.6.23-rc9/drivers/Kconfig 2007-10-05 20:47:42.000000000 +0800 +++ linux-2.6.24.7/drivers/Kconfig
@@ -94,5 +94,7 @@ source "drivers/kvm/Kconfig" @@ -96,5 +96,7 @@ source "drivers/kvm/Kconfig"
source "drivers/uio/Kconfig" source "drivers/uio/Kconfig"
@ -10,14 +10,15 @@ Index: linux-2.6.23-rc9/drivers/Kconfig
+ +
source "drivers/virtio/Kconfig" source "drivers/virtio/Kconfig"
endmenu endmenu
Index: linux-2.6.23-rc9/drivers/Makefile Index: linux-2.6.24.7/drivers/Makefile
=================================================================== ===================================================================
--- linux-2.6.23-rc9.orig/drivers/Makefile 2007-10-05 20:47:09.000000000 +0800 --- linux-2.6.24.7.orig/drivers/Makefile
+++ linux-2.6.23-rc9/drivers/Makefile 2007-10-05 20:47:30.000000000 +0800 +++ linux-2.6.24.7/drivers/Makefile
@@ -89,5 +89,6 @@ obj-$(CONFIG_DCA) += dca/ @@ -89,6 +89,7 @@ obj-$(CONFIG_DCA) += dca/
obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_HID) += hid/
obj-$(CONFIG_PPC_PS3) += ps3/ obj-$(CONFIG_PPC_PS3) += ps3/
obj-$(CONFIG_OF) += of/ obj-$(CONFIG_OF) += of/
+obj-$(CONFIG_VLYNQ) += vlynq/ +obj-$(CONFIG_VLYNQ) += vlynq/
obj-$(CONFIG_SSB) += ssb/ obj-$(CONFIG_SSB) += ssb/
obj-$(CONFIG_VIRTIO) += virtio/ obj-$(CONFIG_VIRTIO) += virtio/
obj-$(CONFIG_GPIO_DEVICE) += gpio/

28
target/linux/ar7/patches-2.6.24/140-cpmac_fix.patch
View File

@ -1,5 +1,7 @@
--- linux-2.6.24/drivers/net/cpmac.c 2008-01-25 02:20:37.000000000 +0100 Index: linux-2.6.24.7/drivers/net/cpmac.c
+++ linux-2.6.24/drivers/net/cpmac.c 2008-04-06 21:30:03.000000000 +0200 ===================================================================
--- linux-2.6.24.7.orig/drivers/net/cpmac.c
+++ linux-2.6.24.7/drivers/net/cpmac.c
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
@ -8,7 +10,7 @@
MODULE_AUTHOR("Eugene Konev <ejka@imfi.kspu.ru>"); MODULE_AUTHOR("Eugene Konev <ejka@imfi.kspu.ru>");
MODULE_DESCRIPTION("TI AR7 ethernet driver (CPMAC)"); MODULE_DESCRIPTION("TI AR7 ethernet driver (CPMAC)");
@@ -207,6 +208,7 @@ @@ -207,6 +208,7 @@ struct cpmac_priv {
struct work_struct reset_work; struct work_struct reset_work;
struct platform_device *pdev; struct platform_device *pdev;
struct napi_struct napi; struct napi_struct napi;
@ -16,7 +18,7 @@
}; };
static irqreturn_t cpmac_irq(int, void *); static irqreturn_t cpmac_irq(int, void *);
@@ -455,6 +457,9 @@ @@ -455,6 +457,9 @@ static int cpmac_start_xmit(struct sk_bu
struct cpmac_desc *desc; struct cpmac_desc *desc;
struct cpmac_priv *priv = netdev_priv(dev); struct cpmac_priv *priv = netdev_priv(dev);
@ -26,7 +28,7 @@
if (unlikely(skb_padto(skb, ETH_ZLEN))) if (unlikely(skb_padto(skb, ETH_ZLEN)))
return NETDEV_TX_OK; return NETDEV_TX_OK;
@@ -634,14 +639,14 @@ @@ -634,14 +639,14 @@ static void cpmac_clear_tx(struct net_de
priv->desc_ring[i].dataflags = 0; priv->desc_ring[i].dataflags = 0;
if (priv->desc_ring[i].skb) { if (priv->desc_ring[i].skb) {
dev_kfree_skb_any(priv->desc_ring[i].skb); dev_kfree_skb_any(priv->desc_ring[i].skb);
@ -43,7 +45,7 @@
struct cpmac_priv *priv = struct cpmac_priv *priv =
container_of(work, struct cpmac_priv, reset_work); container_of(work, struct cpmac_priv, reset_work);
@@ -650,8 +655,47 @@ @@ -650,8 +655,47 @@ static void cpmac_hw_error(struct work_s
spin_unlock(&priv->rx_lock); spin_unlock(&priv->rx_lock);
cpmac_clear_tx(priv->dev); cpmac_clear_tx(priv->dev);
cpmac_hw_start(priv->dev); cpmac_hw_start(priv->dev);
@ -93,7 +95,7 @@
} }
static irqreturn_t cpmac_irq(int irq, void *dev_id) static irqreturn_t cpmac_irq(int irq, void *dev_id)
@@ -661,9 +705,6 @@ @@ -661,9 +705,6 @@ static irqreturn_t cpmac_irq(int irq, vo
int queue; int queue;
u32 status; u32 status;
@ -103,7 +105,7 @@
priv = netdev_priv(dev); priv = netdev_priv(dev);
status = cpmac_read(priv->regs, CPMAC_MAC_INT_VECTOR); status = cpmac_read(priv->regs, CPMAC_MAC_INT_VECTOR);
@@ -685,49 +726,33 @@ @@ -685,49 +726,33 @@ static irqreturn_t cpmac_irq(int irq, vo
cpmac_write(priv->regs, CPMAC_MAC_EOI_VECTOR, 0); cpmac_write(priv->regs, CPMAC_MAC_EOI_VECTOR, 0);
@ -167,7 +169,7 @@
} }
static int cpmac_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) static int cpmac_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@ -848,15 +873,6 @@ @@ -848,15 +873,6 @@ static void cpmac_adjust_link(struct net
spin_unlock(&priv->lock); spin_unlock(&priv->lock);
} }
@ -183,7 +185,7 @@
static int cpmac_open(struct net_device *dev) static int cpmac_open(struct net_device *dev)
{ {
int i, size, res; int i, size, res;
@@ -923,6 +939,7 @@ @@ -923,6 +939,7 @@ static int cpmac_open(struct net_device
goto fail_irq; goto fail_irq;
} }
@ -191,7 +193,7 @@
INIT_WORK(&priv->reset_work, cpmac_hw_error); INIT_WORK(&priv->reset_work, cpmac_hw_error);
cpmac_hw_start(dev); cpmac_hw_start(dev);
@@ -999,11 +1016,11 @@ @@ -999,11 +1016,11 @@ static int external_switch;
static int __devinit cpmac_probe(struct platform_device *pdev) static int __devinit cpmac_probe(struct platform_device *pdev)
{ {
int rc, phy_id, i; int rc, phy_id, i;
@ -204,7 +206,7 @@
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
pdata = pdev->dev.platform_data; pdata = pdev->dev.platform_data;
@@ -1017,9 +1034,23 @@ @@ -1017,9 +1034,23 @@ static int __devinit cpmac_probe(struct
} }
if (phy_id == PHY_MAX_ADDR) { if (phy_id == PHY_MAX_ADDR) {
@ -230,7 +232,7 @@
printk(KERN_ERR "cpmac: no PHY present\n"); printk(KERN_ERR "cpmac: no PHY present\n");
return -ENODEV; return -ENODEV;
} }
@@ -1063,32 +1094,8 @@ @@ -1063,32 +1094,8 @@ static int __devinit cpmac_probe(struct
priv->msg_enable = netif_msg_init(debug_level, 0xff); priv->msg_enable = netif_msg_init(debug_level, 0xff);
memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr)); memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));

29
target/linux/ar7/patches-2.6.24/150-cpmac_up_and_running.diff
View File

@ -13,11 +13,11 @@ Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
drivers/net/cpmac.c | 19 +++---------------- drivers/net/cpmac.c | 19 +++----------------
2 files changed, 20 insertions(+), 16 deletions(-) 2 files changed, 20 insertions(+), 16 deletions(-)
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c Index: linux-2.6.24.7/arch/mips/ar7/platform.c
index 22c79f5..02bd574 100644 ===================================================================
--- a/arch/mips/ar7/platform.c --- linux-2.6.24.7.orig/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c +++ linux-2.6.24.7/arch/mips/ar7/platform.c
@@ -32,6 +32,8 @@ @@ -33,6 +33,8 @@
#include <linux/vlynq.h> #include <linux/vlynq.h>
#include <linux/leds.h> #include <linux/leds.h>
#include <linux/string.h> #include <linux/string.h>
@ -26,7 +26,7 @@ index 22c79f5..02bd574 100644
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/ar7/ar7.h> #include <asm/ar7/ar7.h>
@@ -204,6 +206,13 @@ static struct physmap_flash_data physmap_flash_data = { @@ -205,6 +207,13 @@ static struct physmap_flash_data physmap
.width = 2, .width = 2,
}; };
@ -40,7 +40,7 @@ index 22c79f5..02bd574 100644
static struct plat_cpmac_data cpmac_low_data = { static struct plat_cpmac_data cpmac_low_data = {
.reset_bit = 17, .reset_bit = 17,
.power_bit = 20, .power_bit = 20,
@@ -505,6 +514,10 @@ static int __init ar7_register_devices(void) @@ -506,6 +515,10 @@ static int __init ar7_register_devices(v
} }
if (ar7_has_high_cpmac()) { if (ar7_has_high_cpmac()) {
@ -51,7 +51,7 @@ index 22c79f5..02bd574 100644
cpmac_get_mac(1, cpmac_high_data.dev_addr); cpmac_get_mac(1, cpmac_high_data.dev_addr);
res = platform_device_register(&cpmac_high); res = platform_device_register(&cpmac_high);
if (res) if (res)
@@ -513,6 +526,10 @@ static int __init ar7_register_devices(void) @@ -514,6 +527,10 @@ static int __init ar7_register_devices(v
cpmac_low_data.phy_mask = 0xffffffff; cpmac_low_data.phy_mask = 0xffffffff;
} }
@ -62,11 +62,11 @@ index 22c79f5..02bd574 100644
cpmac_get_mac(0, cpmac_low_data.dev_addr); cpmac_get_mac(0, cpmac_low_data.dev_addr);
res = platform_device_register(&cpmac_low); res = platform_device_register(&cpmac_low);
if (res) if (res)
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c Index: linux-2.6.24.7/drivers/net/cpmac.c
index ac5a8c4..dbac01d 100644 ===================================================================
--- a/drivers/net/cpmac.c --- linux-2.6.24.7.orig/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c +++ linux-2.6.24.7/drivers/net/cpmac.c
@@ -1034,23 +1034,10 @@ static int __devinit cpmac_probe(struct platform_device *pdev) @@ -1035,23 +1035,10 @@ static int __devinit cpmac_probe(struct
if (phy_id == PHY_MAX_ADDR) { if (phy_id == PHY_MAX_ADDR) {
if (external_switch || dumb_switch) { if (external_switch || dumb_switch) {
@ -93,6 +93,3 @@ index ac5a8c4..dbac01d 100644
return -ENODEV; return -ENODEV;
} }
} }
--
1.5.2.2

18
target/linux/ar7/patches-2.6.24/160-cpmac-rx-ring-use-eoq.diff
View File

@ -1,6 +1,8 @@
--- linux-2.6.24.3/drivers/net/cpmac.c.orig 2008-03-10 23:59:56.000000000 +0000 Index: linux-2.6.24.7/drivers/net/cpmac.c
+++ linux-2.6.24.3/drivers/net/cpmac.c 2008-03-11 00:13:04.000000000 +0000 ===================================================================
@@ -187,6 +187,7 @@ --- linux-2.6.24.7.orig/drivers/net/cpmac.c
+++ linux-2.6.24.7/drivers/net/cpmac.c
@@ -187,6 +187,7 @@ struct cpmac_desc {
#define CPMAC_EOQ 0x1000 #define CPMAC_EOQ 0x1000
struct sk_buff *skb; struct sk_buff *skb;
struct cpmac_desc *next; struct cpmac_desc *next;
@ -8,7 +10,7 @@
dma_addr_t mapping; dma_addr_t mapping;
dma_addr_t data_mapping; dma_addr_t data_mapping;
}; };
@@ -242,6 +243,16 @@ @@ -242,6 +243,16 @@ static void cpmac_dump_desc(struct net_d
printk("\n"); printk("\n");
} }
@ -25,7 +27,7 @@
static void cpmac_dump_skb(struct net_device *dev, struct sk_buff *skb) static void cpmac_dump_skb(struct net_device *dev, struct sk_buff *skb)
{ {
int i; int i;
@@ -413,21 +424,40 @@ @@ -413,21 +424,40 @@ static struct sk_buff *cpmac_rx_one(stru
static int cpmac_poll(struct napi_struct *napi, int budget) static int cpmac_poll(struct napi_struct *napi, int budget)
{ {
struct sk_buff *skb; struct sk_buff *skb;
@ -68,7 +70,7 @@
skb = cpmac_rx_one(priv, desc); skb = cpmac_rx_one(priv, desc);
if (likely(skb)) { if (likely(skb)) {
netif_receive_skb(skb); netif_receive_skb(skb);
@@ -436,19 +466,81 @@ @@ -436,19 +466,81 @@ static int cpmac_poll(struct napi_struct
desc = desc->next; desc = desc->next;
} }
@ -152,7 +154,7 @@
} }
static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev) static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -625,8 +717,10 @@ @@ -625,8 +717,10 @@ static void cpmac_clear_rx(struct net_de
desc->dataflags = CPMAC_OWN; desc->dataflags = CPMAC_OWN;
dev->stats.rx_dropped++; dev->stats.rx_dropped++;
} }
@ -163,7 +165,7 @@
} }
static void cpmac_clear_tx(struct net_device *dev) static void cpmac_clear_tx(struct net_device *dev)
@@ -927,9 +1021,12 @@ @@ -928,9 +1022,12 @@ static int cpmac_open(struct net_device
desc->buflen = CPMAC_SKB_SIZE; desc->buflen = CPMAC_SKB_SIZE;
desc->dataflags = CPMAC_OWN; desc->dataflags = CPMAC_OWN;
desc->next = &priv->rx_head[(i + 1) % priv->ring_size]; desc->next = &priv->rx_head[(i + 1) % priv->ring_size];

9
target/linux/ar7/patches-2.6.24/170-cpmac_eth_fix.patch
View File

@ -1,7 +1,8 @@
diff -pruN linux-2.6.24.2.old/drivers/net/cpmac.c linux-2.6.24.2/drivers/net/cpmac.c Index: linux-2.6.24.7/drivers/net/cpmac.c
--- linux-2.6.24.2.old/drivers/net/cpmac.c 2008-03-20 20:33:01.000000000 +0100 ===================================================================
+++ linux-2.6.24.2/drivers/net/cpmac.c 2008-03-20 20:47:31.000000000 +0100 --- linux-2.6.24.7.orig/drivers/net/cpmac.c
@@ -1178,9 +1179,7 @@ static int __devinit cpmac_probe(struct +++ linux-2.6.24.7/drivers/net/cpmac.c
@@ -1178,9 +1178,7 @@ static int __devinit cpmac_probe(struct
priv->msg_enable = netif_msg_init(debug_level, 0xff); priv->msg_enable = netif_msg_init(debug_level, 0xff);
memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr)); memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));

16
target/linux/ar7/patches-2.6.24/500-serial_kludge.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.24/drivers/serial/8250.c Index: linux-2.6.24.7/drivers/serial/8250.c
=================================================================== ===================================================================
--- linux-2.6.24/drivers/serial/8250.c 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.24.7.orig/drivers/serial/8250.c
+++ linux-2.6.24/drivers/serial/8250.c 2007-09-21 16:24:14.000000000 +0800 +++ linux-2.6.24.7/drivers/serial/8250.c
@@ -267,6 +267,13 @@ @@ -267,6 +267,13 @@ static const struct serial8250_config ua
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
.flags = UART_CAP_FIFO, .flags = UART_CAP_FIFO,
}, },
@ -16,7 +16,7 @@ Index: linux-2.6.24/drivers/serial/8250.c
}; };
#if defined (CONFIG_SERIAL_8250_AU1X00) #if defined (CONFIG_SERIAL_8250_AU1X00)
@@ -2453,7 +2460,11 @@ @@ -2453,7 +2460,11 @@ static void serial8250_console_putchar(s
{ {
struct uart_8250_port *up = (struct uart_8250_port *)port; struct uart_8250_port *up = (struct uart_8250_port *)port;
@ -28,10 +28,10 @@ Index: linux-2.6.24/drivers/serial/8250.c
serial_out(up, UART_TX, ch); serial_out(up, UART_TX, ch);
} }
Index: linux-2.6.24/include/linux/serial_core.h Index: linux-2.6.24.7/include/linux/serial_core.h
=================================================================== ===================================================================
--- linux-2.6.24/include/linux/serial_core.h 2007-09-21 16:23:51.000000000 +0800 --- linux-2.6.24.7.orig/include/linux/serial_core.h
+++ linux-2.6.24/include/linux/serial_core.h 2007-09-21 16:24:14.000000000 +0800 +++ linux-2.6.24.7/include/linux/serial_core.h
@@ -40,7 +40,8 @@ @@ -40,7 +40,8 @@
#define PORT_NS16550A 14 #define PORT_NS16550A 14
#define PORT_XSCALE 15 #define PORT_XSCALE 15

10
target/linux/ar7/patches-2.6.24/900-temporary_cpmac_hack.diff
View File

@ -1,6 +1,8 @@
--- linux-2.6.24.2/drivers/net/cpmac.c 2008-03-10 22:13:50.000000000 +0100 Index: linux-2.6.24.7/drivers/net/cpmac.c
+++ linux-2.6.24.2/drivers/net/cpmac.c 2008-03-05 15:13:27.000000000 +0100 ===================================================================
@@ -841,7 +841,8 @@ --- linux-2.6.24.7.orig/drivers/net/cpmac.c
+++ linux-2.6.24.7/drivers/net/cpmac.c
@@ -936,7 +936,8 @@ static void cpmac_adjust_link(struct net
int new_state = 0; int new_state = 0;
spin_lock(&priv->lock); spin_lock(&priv->lock);
@ -10,7 +12,7 @@
netif_start_queue(dev); netif_start_queue(dev);
if (priv->phy->duplex != priv->oldduplex) { if (priv->phy->duplex != priv->oldduplex) {
new_state = 1; new_state = 1;
@@ -853,11 +854,11 @@ @@ -948,11 +949,11 @@ static void cpmac_adjust_link(struct net
priv->oldspeed = priv->phy->speed; priv->oldspeed = priv->phy->speed;
} }

32
target/linux/ar7/patches-2.6.25/100-board_support.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.25.1/arch/mips/Kconfig Index: linux-2.6.25.4/arch/mips/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/arch/mips/Kconfig 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/arch/mips/Kconfig
+++ linux-2.6.25.1/arch/mips/Kconfig 2008-05-03 16:17:54.000000000 +0200 +++ linux-2.6.25.4/arch/mips/Kconfig
@@ -18,6 +18,24 @@ @@ -18,6 +18,24 @@ choice
prompt "System type" prompt "System type"
default SGI_IP22 default SGI_IP22
@ -27,11 +27,11 @@ Index: linux-2.6.25.1/arch/mips/Kconfig
config MACH_ALCHEMY config MACH_ALCHEMY
bool "Alchemy processor based machines" bool "Alchemy processor based machines"
Index: linux-2.6.25.1/arch/mips/kernel/traps.c Index: linux-2.6.25.4/arch/mips/kernel/traps.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/arch/mips/kernel/traps.c 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/arch/mips/kernel/traps.c
+++ linux-2.6.25.1/arch/mips/kernel/traps.c 2008-05-03 16:17:54.000000000 +0200 +++ linux-2.6.25.4/arch/mips/kernel/traps.c
@@ -1112,9 +1112,22 @@ @@ -1112,9 +1112,22 @@ void *set_except_vector(int n, void *add
exception_handlers[n] = handler; exception_handlers[n] = handler;
if (n == 0 && cpu_has_divec) { if (n == 0 && cpu_has_divec) {
@ -57,11 +57,11 @@ Index: linux-2.6.25.1/arch/mips/kernel/traps.c
} }
return (void *)old_handler; return (void *)old_handler;
} }
Index: linux-2.6.25.1/arch/mips/Makefile Index: linux-2.6.25.4/arch/mips/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/arch/mips/Makefile 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/arch/mips/Makefile
+++ linux-2.6.25.1/arch/mips/Makefile 2008-05-03 16:17:54.000000000 +0200 +++ linux-2.6.25.4/arch/mips/Makefile
@@ -167,6 +167,13 @@ @@ -167,6 +167,13 @@ libs-$(CONFIG_SIBYTE_CFE) += arch/mips/s
# #
# #
@ -75,11 +75,11 @@ Index: linux-2.6.25.1/arch/mips/Makefile
# Acer PICA 61, Mips Magnum 4000 and Olivetti M700. # Acer PICA 61, Mips Magnum 4000 and Olivetti M700.
# #
core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/ core-$(CONFIG_MACH_JAZZ) += arch/mips/jazz/
Index: linux-2.6.25.1/include/asm-mips/page.h Index: linux-2.6.25.4/include/asm-mips/page.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/asm-mips/page.h 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/include/asm-mips/page.h
+++ linux-2.6.25.1/include/asm-mips/page.h 2008-05-03 16:17:54.000000000 +0200 +++ linux-2.6.25.4/include/asm-mips/page.h
@@ -182,8 +182,10 @@ @@ -182,8 +182,10 @@ typedef struct { unsigned long pgprot; }
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)

24
target/linux/ar7/patches-2.6.25/110-flash.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.25.1/drivers/mtd/Kconfig Index: linux-2.6.25.4/drivers/mtd/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/mtd/Kconfig 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/drivers/mtd/Kconfig
+++ linux-2.6.25.1/drivers/mtd/Kconfig 2008-05-03 16:18:06.000000000 +0200 +++ linux-2.6.25.4/drivers/mtd/Kconfig
@@ -158,6 +158,12 @@ @@ -168,6 +168,12 @@ config MTD_OF_PARTS
the partition map from the children of the flash node, the partition map from the children of the flash node,
as described in Documentation/powerpc/booting-without-of.txt. as described in Documentation/powerpc/booting-without-of.txt.
@ -15,11 +15,11 @@ Index: linux-2.6.25.1/drivers/mtd/Kconfig
comment "User Modules And Translation Layers" comment "User Modules And Translation Layers"
config MTD_CHAR config MTD_CHAR
Index: linux-2.6.25.1/drivers/mtd/Makefile Index: linux-2.6.25.4/drivers/mtd/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/mtd/Makefile 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/drivers/mtd/Makefile
+++ linux-2.6.25.1/drivers/mtd/Makefile 2008-05-03 16:18:06.000000000 +0200 +++ linux-2.6.25.4/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_CMDLINE_PARTS) += cmdlinepart.o
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o obj-$(CONFIG_MTD_OF_PARTS) += ofpart.o
@ -27,11 +27,11 @@ Index: linux-2.6.25.1/drivers/mtd/Makefile
# 'Users' - code which presents functionality to userspace. # 'Users' - code which presents functionality to userspace.
obj-$(CONFIG_MTD_CHAR) += mtdchar.o obj-$(CONFIG_MTD_CHAR) += mtdchar.o
Index: linux-2.6.25.1/drivers/mtd/maps/physmap.c Index: linux-2.6.25.4/drivers/mtd/maps/physmap.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/mtd/maps/physmap.c 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/drivers/mtd/maps/physmap.c
+++ linux-2.6.25.1/drivers/mtd/maps/physmap.c 2008-05-03 16:18:06.000000000 +0200 +++ linux-2.6.25.4/drivers/mtd/maps/physmap.c
@@ -87,7 +87,8 @@ @@ -87,7 +87,8 @@ static int physmap_flash_remove(struct p
static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL }; static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
#ifdef CONFIG_MTD_PARTITIONS #ifdef CONFIG_MTD_PARTITIONS

16
target/linux/ar7/patches-2.6.25/120-gpio_chrdev.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.25.1/drivers/char/Kconfig Index: linux-2.6.25.4/drivers/char/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/char/Kconfig 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/drivers/char/Kconfig
+++ linux-2.6.25.1/drivers/char/Kconfig 2008-05-03 16:18:26.000000000 +0200 +++ linux-2.6.25.4/drivers/char/Kconfig
@@ -913,6 +913,15 @@ @@ -913,6 +913,15 @@ config MWAVE
To compile this driver as a module, choose M here: the To compile this driver as a module, choose M here: the
module will be called mwave. module will be called mwave.
@ -18,11 +18,11 @@ Index: linux-2.6.25.1/drivers/char/Kconfig
config SCx200_GPIO config SCx200_GPIO
tristate "NatSemi SCx200 GPIO Support" tristate "NatSemi SCx200 GPIO Support"
depends on SCx200 depends on SCx200
Index: linux-2.6.25.1/drivers/char/Makefile Index: linux-2.6.25.4/drivers/char/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/char/Makefile 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/drivers/char/Makefile
+++ linux-2.6.25.1/drivers/char/Makefile 2008-05-03 16:18:26.000000000 +0200 +++ linux-2.6.25.4/drivers/char/Makefile
@@ -90,6 +90,7 @@ @@ -90,6 +90,7 @@ obj-$(CONFIG_COBALT_LCD) += lcd.o
obj-$(CONFIG_PPDEV) += ppdev.o obj-$(CONFIG_PPDEV) += ppdev.o
obj-$(CONFIG_NWBUTTON) += nwbutton.o obj-$(CONFIG_NWBUTTON) += nwbutton.o
obj-$(CONFIG_NWFLASH) += nwflash.o obj-$(CONFIG_NWFLASH) += nwflash.o

16
target/linux/ar7/patches-2.6.25/130-vlynq.patch
View File

@ -1,19 +1,19 @@
Index: linux-2.6.25.1/drivers/Kconfig Index: linux-2.6.25.4/drivers/Kconfig
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/Kconfig 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/drivers/Kconfig
+++ linux-2.6.25.1/drivers/Kconfig 2008-05-03 16:19:06.000000000 +0200 +++ linux-2.6.25.4/drivers/Kconfig
@@ -97,4 +97,6 @@ @@ -97,4 +97,6 @@ source "drivers/dca/Kconfig"
source "drivers/auxdisplay/Kconfig" source "drivers/auxdisplay/Kconfig"
source "drivers/uio/Kconfig" source "drivers/uio/Kconfig"
+ +
+source "drivers/vlynq/Kconfig" +source "drivers/vlynq/Kconfig"
endmenu endmenu
Index: linux-2.6.25.1/drivers/Makefile Index: linux-2.6.25.4/drivers/Makefile
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/Makefile 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/drivers/Makefile
+++ linux-2.6.25.1/drivers/Makefile 2008-05-03 16:18:37.000000000 +0200 +++ linux-2.6.25.4/drivers/Makefile
@@ -91,5 +91,6 @@ @@ -91,5 +91,6 @@ obj-$(CONFIG_DCA) += dca/
obj-$(CONFIG_HID) += hid/ obj-$(CONFIG_HID) += hid/
obj-$(CONFIG_PPC_PS3) += ps3/ obj-$(CONFIG_PPC_PS3) += ps3/
obj-$(CONFIG_OF) += of/ obj-$(CONFIG_OF) += of/

18
target/linux/ar7/patches-2.6.25/140-cpmac_fix.patch
View File

@ -1,7 +1,7 @@
Index: linux-2.6.25.1/drivers/net/cpmac.c Index: linux-2.6.25.4/drivers/net/cpmac.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/cpmac.c 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/drivers/net/cpmac.c
+++ linux-2.6.25.1/drivers/net/cpmac.c 2008-05-03 16:21:17.000000000 +0200 +++ linux-2.6.25.4/drivers/net/cpmac.c
@@ -38,6 +38,7 @@ @@ -38,6 +38,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
@ -10,7 +10,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c
MODULE_AUTHOR("Eugene Konev <ejka@imfi.kspu.ru>"); MODULE_AUTHOR("Eugene Konev <ejka@imfi.kspu.ru>");
MODULE_DESCRIPTION("TI AR7 ethernet driver (CPMAC)"); MODULE_DESCRIPTION("TI AR7 ethernet driver (CPMAC)");
@@ -207,6 +208,7 @@ @@ -207,6 +208,7 @@ struct cpmac_priv {
struct work_struct reset_work; struct work_struct reset_work;
struct platform_device *pdev; struct platform_device *pdev;
struct napi_struct napi; struct napi_struct napi;
@ -18,7 +18,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c
}; };
static irqreturn_t cpmac_irq(int, void *); static irqreturn_t cpmac_irq(int, void *);
@@ -455,6 +457,9 @@ @@ -455,6 +457,9 @@ static int cpmac_start_xmit(struct sk_bu
struct cpmac_desc *desc; struct cpmac_desc *desc;
struct cpmac_priv *priv = netdev_priv(dev); struct cpmac_priv *priv = netdev_priv(dev);
@ -28,7 +28,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c
if (unlikely(skb_padto(skb, ETH_ZLEN))) if (unlikely(skb_padto(skb, ETH_ZLEN)))
return NETDEV_TX_OK; return NETDEV_TX_OK;
@@ -634,14 +639,14 @@ @@ -634,14 +639,14 @@ static void cpmac_clear_tx(struct net_de
priv->desc_ring[i].dataflags = 0; priv->desc_ring[i].dataflags = 0;
if (priv->desc_ring[i].skb) { if (priv->desc_ring[i].skb) {
dev_kfree_skb_any(priv->desc_ring[i].skb); dev_kfree_skb_any(priv->desc_ring[i].skb);
@ -45,7 +45,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c
struct cpmac_priv *priv = struct cpmac_priv *priv =
container_of(work, struct cpmac_priv, reset_work); container_of(work, struct cpmac_priv, reset_work);
@@ -650,8 +655,47 @@ @@ -650,8 +655,47 @@ static void cpmac_hw_error(struct work_s
spin_unlock(&priv->rx_lock); spin_unlock(&priv->rx_lock);
cpmac_clear_tx(priv->dev); cpmac_clear_tx(priv->dev);
cpmac_hw_start(priv->dev); cpmac_hw_start(priv->dev);
@ -95,7 +95,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c
} }
static irqreturn_t cpmac_irq(int irq, void *dev_id) static irqreturn_t cpmac_irq(int irq, void *dev_id)
@@ -682,49 +726,33 @@ @@ -682,49 +726,33 @@ static irqreturn_t cpmac_irq(int irq, vo
cpmac_write(priv->regs, CPMAC_MAC_EOI_VECTOR, 0); cpmac_write(priv->regs, CPMAC_MAC_EOI_VECTOR, 0);
@ -159,7 +159,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c
} }
static int cpmac_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) static int cpmac_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
@@ -911,6 +939,7 @@ @@ -911,6 +939,7 @@ static int cpmac_open(struct net_device
goto fail_irq; goto fail_irq;
} }

8
target/linux/ar7/patches-2.6.25/150-cpmac_not_broken.patch
View File

@ -1,6 +1,8 @@
--- linux-2.6.25.1/drivers/net/Kconfig 2008-05-03 17:23:40.000000000 +0200 Index: linux-2.6.25.4/drivers/net/Kconfig
+++ linux-2.6.25.1/drivers/net/Kconfig 2008-05-03 17:23:53.000000000 +0200 ===================================================================
@@ -1874,7 +1874,7 @@ --- linux-2.6.25.4.orig/drivers/net/Kconfig
+++ linux-2.6.25.4/drivers/net/Kconfig
@@ -1874,7 +1874,7 @@ config SC92031
config CPMAC config CPMAC
tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)" tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"

20
target/linux/ar7/patches-2.6.25/150-cpmac_up_and_running.diff
View File

@ -13,10 +13,10 @@ Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
drivers/net/cpmac.c | 19 +++---------------- drivers/net/cpmac.c | 19 +++----------------
2 files changed, 20 insertions(+), 16 deletions(-) 2 files changed, 20 insertions(+), 16 deletions(-)
Index: linux-2.6.25.1/arch/mips/ar7/platform.c Index: linux-2.6.25.4/arch/mips/ar7/platform.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/arch/mips/ar7/platform.c 2008-05-03 16:17:30.000000000 +0200 --- linux-2.6.25.4.orig/arch/mips/ar7/platform.c
+++ linux-2.6.25.1/arch/mips/ar7/platform.c 2008-05-03 16:24:08.000000000 +0200 +++ linux-2.6.25.4/arch/mips/ar7/platform.c
@@ -33,6 +33,8 @@ @@ -33,6 +33,8 @@
#include <linux/vlynq.h> #include <linux/vlynq.h>
#include <linux/leds.h> #include <linux/leds.h>
@ -26,7 +26,7 @@ Index: linux-2.6.25.1/arch/mips/ar7/platform.c
#include <asm/addrspace.h> #include <asm/addrspace.h>
#include <asm/ar7/ar7.h> #include <asm/ar7/ar7.h>
@@ -205,6 +207,13 @@ @@ -205,6 +207,13 @@ static struct physmap_flash_data physmap
.width = 2, .width = 2,
}; };
@ -40,7 +40,7 @@ Index: linux-2.6.25.1/arch/mips/ar7/platform.c
static struct plat_cpmac_data cpmac_low_data = { static struct plat_cpmac_data cpmac_low_data = {
.reset_bit = 17, .reset_bit = 17,
.power_bit = 20, .power_bit = 20,
@@ -506,6 +515,10 @@ @@ -506,6 +515,10 @@ static int __init ar7_register_devices(v
} }
if (ar7_has_high_cpmac()) { if (ar7_has_high_cpmac()) {
@ -51,7 +51,7 @@ Index: linux-2.6.25.1/arch/mips/ar7/platform.c
cpmac_get_mac(1, cpmac_high_data.dev_addr); cpmac_get_mac(1, cpmac_high_data.dev_addr);
res = platform_device_register(&cpmac_high); res = platform_device_register(&cpmac_high);
if (res) if (res)
@@ -514,6 +527,10 @@ @@ -514,6 +527,10 @@ static int __init ar7_register_devices(v
cpmac_low_data.phy_mask = 0xffffffff; cpmac_low_data.phy_mask = 0xffffffff;
} }
@ -62,11 +62,11 @@ Index: linux-2.6.25.1/arch/mips/ar7/platform.c
cpmac_get_mac(0, cpmac_low_data.dev_addr); cpmac_get_mac(0, cpmac_low_data.dev_addr);
res = platform_device_register(&cpmac_low); res = platform_device_register(&cpmac_low);
if (res) if (res)
Index: linux-2.6.25.1/drivers/net/cpmac.c Index: linux-2.6.25.4/drivers/net/cpmac.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/cpmac.c 2008-05-03 16:21:17.000000000 +0200 --- linux-2.6.25.4.orig/drivers/net/cpmac.c
+++ linux-2.6.25.1/drivers/net/cpmac.c 2008-05-03 16:24:08.000000000 +0200 +++ linux-2.6.25.4/drivers/net/cpmac.c
@@ -1035,23 +1035,10 @@ @@ -1035,23 +1035,10 @@ static int __devinit cpmac_probe(struct
if (phy_id == PHY_MAX_ADDR) { if (phy_id == PHY_MAX_ADDR) {
if (external_switch || dumb_switch) { if (external_switch || dumb_switch) {

18
target/linux/ar7/patches-2.6.25/160-cpmac-rx-ring-use-eoq.diff
View File

@ -1,8 +1,8 @@
Index: linux-2.6.25.1/drivers/net/cpmac.c Index: linux-2.6.25.4/drivers/net/cpmac.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/cpmac.c 2008-05-03 16:24:08.000000000 +0200 --- linux-2.6.25.4.orig/drivers/net/cpmac.c
+++ linux-2.6.25.1/drivers/net/cpmac.c 2008-05-03 16:24:37.000000000 +0200 +++ linux-2.6.25.4/drivers/net/cpmac.c
@@ -187,6 +187,7 @@ @@ -187,6 +187,7 @@ struct cpmac_desc {
#define CPMAC_EOQ 0x1000 #define CPMAC_EOQ 0x1000
struct sk_buff *skb; struct sk_buff *skb;
struct cpmac_desc *next; struct cpmac_desc *next;
@ -10,7 +10,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c
dma_addr_t mapping; dma_addr_t mapping;
dma_addr_t data_mapping; dma_addr_t data_mapping;
}; };
@@ -242,6 +243,16 @@ @@ -242,6 +243,16 @@ static void cpmac_dump_desc(struct net_d
printk("\n"); printk("\n");
} }
@ -27,7 +27,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c
static void cpmac_dump_skb(struct net_device *dev, struct sk_buff *skb) static void cpmac_dump_skb(struct net_device *dev, struct sk_buff *skb)
{ {
int i; int i;
@@ -413,21 +424,40 @@ @@ -413,21 +424,40 @@ static struct sk_buff *cpmac_rx_one(stru
static int cpmac_poll(struct napi_struct *napi, int budget) static int cpmac_poll(struct napi_struct *napi, int budget)
{ {
struct sk_buff *skb; struct sk_buff *skb;
@ -70,7 +70,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c
skb = cpmac_rx_one(priv, desc); skb = cpmac_rx_one(priv, desc);
if (likely(skb)) { if (likely(skb)) {
netif_receive_skb(skb); netif_receive_skb(skb);
@@ -436,19 +466,81 @@ @@ -436,19 +466,81 @@ static int cpmac_poll(struct napi_struct
desc = desc->next; desc = desc->next;
} }
@ -154,7 +154,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c
} }
static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev) static int cpmac_start_xmit(struct sk_buff *skb, struct net_device *dev)
@@ -625,8 +717,10 @@ @@ -625,8 +717,10 @@ static void cpmac_clear_rx(struct net_de
desc->dataflags = CPMAC_OWN; desc->dataflags = CPMAC_OWN;
dev->stats.rx_dropped++; dev->stats.rx_dropped++;
} }
@ -165,7 +165,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c
} }
static void cpmac_clear_tx(struct net_device *dev) static void cpmac_clear_tx(struct net_device *dev)
@@ -928,9 +1022,12 @@ @@ -928,9 +1022,12 @@ static int cpmac_open(struct net_device
desc->buflen = CPMAC_SKB_SIZE; desc->buflen = CPMAC_SKB_SIZE;
desc->dataflags = CPMAC_OWN; desc->dataflags = CPMAC_OWN;
desc->next = &priv->rx_head[(i + 1) % priv->ring_size]; desc->next = &priv->rx_head[(i + 1) % priv->ring_size];

8
target/linux/ar7/patches-2.6.25/170-cpmac_eth_fix.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.25.1/drivers/net/cpmac.c Index: linux-2.6.25.4/drivers/net/cpmac.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/cpmac.c 2008-05-03 16:24:37.000000000 +0200 --- linux-2.6.25.4.orig/drivers/net/cpmac.c
+++ linux-2.6.25.1/drivers/net/cpmac.c 2008-05-03 16:24:49.000000000 +0200 +++ linux-2.6.25.4/drivers/net/cpmac.c
@@ -1178,9 +1178,7 @@ @@ -1178,9 +1178,7 @@ static int __devinit cpmac_probe(struct
priv->msg_enable = netif_msg_init(debug_level, 0xff); priv->msg_enable = netif_msg_init(debug_level, 0xff);
memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr)); memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));

14
target/linux/ar7/patches-2.6.25/200-mtd_fixes.patch
View File

@ -1,5 +1,7 @@
--- linux/drivers/mtd/ar7part.c 2007-09-20 21:47:22.000000000 +0200 Index: linux-2.6.25.4/drivers/mtd/ar7part.c
+++ linux-mips/drivers/mtd/ar7part.c 2008-05-04 18:49:04.000000000 +0200 ===================================================================
--- linux-2.6.25.4.orig/drivers/mtd/ar7part.c
+++ linux-2.6.25.4/drivers/mtd/ar7part.c
@@ -34,6 +34,10 @@ @@ -34,6 +34,10 @@
#define LOADER_MAGIC1 le32_to_cpu(0xfeedfa42) #define LOADER_MAGIC1 le32_to_cpu(0xfeedfa42)
#define LOADER_MAGIC2 le32_to_cpu(0xfeed1281) #define LOADER_MAGIC2 le32_to_cpu(0xfeed1281)
@ -11,7 +13,7 @@
struct ar7_bin_rec { struct ar7_bin_rec {
unsigned int checksum; unsigned int checksum;
unsigned int length; unsigned int length;
@@ -47,7 +51,8 @@ @@ -47,7 +51,8 @@ static int create_mtd_partitions(struct
unsigned long origin) unsigned long origin)
{ {
struct ar7_bin_rec header; struct ar7_bin_rec header;
@ -21,7 +23,7 @@
unsigned int pre_size = master->erasesize, post_size = 0; unsigned int pre_size = master->erasesize, post_size = 0;
unsigned int root_offset = ROOT_OFFSET; unsigned int root_offset = ROOT_OFFSET;
@@ -66,7 +71,7 @@ @@ -66,7 +71,7 @@ static int create_mtd_partitions(struct
do { /* Try 10 blocks starting from master->erasesize */ do { /* Try 10 blocks starting from master->erasesize */
offset = pre_size; offset = pre_size;
master->read(master, offset, master->read(master, offset,
@ -30,7 +32,7 @@
if (!strncmp((char *)&header, "TIENV0.8", 8)) if (!strncmp((char *)&header, "TIENV0.8", 8))
ar7_parts[1].offset = pre_size; ar7_parts[1].offset = pre_size;
if (header.checksum == LOADER_MAGIC1) if (header.checksum == LOADER_MAGIC1)
@@ -88,7 +93,7 @@ @@ -88,7 +93,7 @@ static int create_mtd_partitions(struct
while (header.length) { while (header.length) {
offset += sizeof(header) + header.length; offset += sizeof(header) + header.length;
master->read(master, offset, sizeof(header), master->read(master, offset, sizeof(header),
@ -39,7 +41,7 @@
} }
root_offset = offset + sizeof(header) + 4; root_offset = offset + sizeof(header) + 4;
break; break;
@@ -96,10 +101,10 @@ @@ -96,10 +101,10 @@ static int create_mtd_partitions(struct
while (header.length) { while (header.length) {
offset += sizeof(header) + header.length; offset += sizeof(header) + header.length;
master->read(master, offset, sizeof(header), master->read(master, offset, sizeof(header),

16
target/linux/ar7/patches-2.6.25/500-serial_kludge.patch
View File

@ -1,8 +1,8 @@
Index: linux-2.6.25.1/drivers/serial/8250.c Index: linux-2.6.25.4/drivers/serial/8250.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/serial/8250.c 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/drivers/serial/8250.c
+++ linux-2.6.25.1/drivers/serial/8250.c 2008-05-03 16:25:06.000000000 +0200 +++ linux-2.6.25.4/drivers/serial/8250.c
@@ -267,6 +267,13 @@ @@ -267,6 +267,13 @@ static const struct serial8250_config ua
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10, .fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
.flags = UART_CAP_FIFO, .flags = UART_CAP_FIFO,
}, },
@ -16,7 +16,7 @@ Index: linux-2.6.25.1/drivers/serial/8250.c
}; };
#if defined (CONFIG_SERIAL_8250_AU1X00) #if defined (CONFIG_SERIAL_8250_AU1X00)
@@ -2455,7 +2462,11 @@ @@ -2455,7 +2462,11 @@ static void serial8250_console_putchar(s
{ {
struct uart_8250_port *up = (struct uart_8250_port *)port; struct uart_8250_port *up = (struct uart_8250_port *)port;
@ -28,10 +28,10 @@ Index: linux-2.6.25.1/drivers/serial/8250.c
serial_out(up, UART_TX, ch); serial_out(up, UART_TX, ch);
} }
Index: linux-2.6.25.1/include/linux/serial_core.h Index: linux-2.6.25.4/include/linux/serial_core.h
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/include/linux/serial_core.h 2008-05-01 23:45:25.000000000 +0200 --- linux-2.6.25.4.orig/include/linux/serial_core.h
+++ linux-2.6.25.1/include/linux/serial_core.h 2008-05-03 16:25:06.000000000 +0200 +++ linux-2.6.25.4/include/linux/serial_core.h
@@ -40,7 +40,8 @@ @@ -40,7 +40,8 @@
#define PORT_NS16550A 14 #define PORT_NS16550A 14
#define PORT_XSCALE 15 #define PORT_XSCALE 15

10
target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
View File

@ -1,8 +1,8 @@
Index: linux-2.6.25.1/drivers/net/cpmac.c Index: linux-2.6.25.4/drivers/net/cpmac.c
=================================================================== ===================================================================
--- linux-2.6.25.1.orig/drivers/net/cpmac.c 2008-05-03 16:24:49.000000000 +0200 --- linux-2.6.25.4.orig/drivers/net/cpmac.c
+++ linux-2.6.25.1/drivers/net/cpmac.c 2008-05-03 16:25:17.000000000 +0200 +++ linux-2.6.25.4/drivers/net/cpmac.c
@@ -936,7 +936,8 @@ @@ -936,7 +936,8 @@ static void cpmac_adjust_link(struct net
int new_state = 0; int new_state = 0;
spin_lock(&priv->lock); spin_lock(&priv->lock);
@ -12,7 +12,7 @@ Index: linux-2.6.25.1/drivers/net/cpmac.c
netif_start_queue(dev); netif_start_queue(dev);
if (priv->phy->duplex != priv->oldduplex) { if (priv->phy->duplex != priv->oldduplex) {
new_state = 1; new_state = 1;
@@ -948,11 +949,11 @@ @@ -948,11 +949,11 @@ static void cpmac_adjust_link(struct net
priv->oldspeed = priv->phy->speed; priv->oldspeed = priv->phy->speed;
} }