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

refresh patches

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15581 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
kaloz 2009-05-04 11:35:08 +00:00
parent 0bf753274a
commit 2f1b56443c
61 changed files with 697 additions and 855 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/brcm47xx/patches-2.6.28/100-board_support.patch
View File

@ -15,7 +15,7 @@
extern char *system_type;
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2068,6 +2068,7 @@
@@ -2069,6 +2069,7 @@
#define PCI_DEVICE_ID_TIGON3_5906M 0x1713
#define PCI_DEVICE_ID_BCM4401 0x4401
#define PCI_DEVICE_ID_BCM4401B0 0x4402

2
target/linux/brcm47xx/patches-2.6.28/270-ehci-ssb.patch
View File

@ -22,7 +22,7 @@
depends on USB
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -1034,8 +1034,16 @@ MODULE_LICENSE ("GPL");
@@ -1036,8 +1036,16 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ixp4xx_ehci_driver
#endif

36
target/linux/brcm47xx/patches-2.6.28/400-arch-bcm47xx.patch
View File

@ -1,7 +1,5 @@
Index: linux-2.6.28.7/arch/mips/Kconfig
===================================================================
--- linux-2.6.28.7.orig/arch/mips/Kconfig 2009-03-17 17:26:23.000000000 +0100
+++ linux-2.6.28.7/arch/mips/Kconfig 2009-03-17 17:27:33.000000000 +0100
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -53,6 +53,7 @@ config BCM47XX
select SSB_DRIVER_MIPS
select SSB_DRIVER_EXTIF
@ -10,20 +8,16 @@ Index: linux-2.6.28.7/arch/mips/Kconfig
select SSB_PCICORE_HOSTMODE if PCI
select GENERIC_GPIO
select SYS_HAS_EARLY_PRINTK
Index: linux-2.6.28.7/arch/mips/bcm47xx/Makefile
===================================================================
--- linux-2.6.28.7.orig/arch/mips/bcm47xx/Makefile 2009-03-17 17:26:19.000000000 +0100
+++ linux-2.6.28.7/arch/mips/bcm47xx/Makefile 2009-03-17 17:26:56.000000000 +0100
--- a/arch/mips/bcm47xx/Makefile
+++ b/arch/mips/bcm47xx/Makefile
@@ -3,4 +3,4 @@
# under Linux.
#
-obj-y := gpio.o irq.o prom.o serial.o setup.o time.o wgt634u.o
+obj-y := cfe_env.o gpio.o irq.o nvram.o prom.o serial.o setup.o time.o wgt634u.o
Index: linux-2.6.28.7/arch/mips/bcm47xx/irq.c
===================================================================
--- linux-2.6.28.7.orig/arch/mips/bcm47xx/irq.c 2009-03-17 17:26:19.000000000 +0100
+++ linux-2.6.28.7/arch/mips/bcm47xx/irq.c 2009-03-17 17:26:23.000000000 +0100
--- a/arch/mips/bcm47xx/irq.c
+++ b/arch/mips/bcm47xx/irq.c
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
@ -51,10 +45,8 @@ Index: linux-2.6.28.7/arch/mips/bcm47xx/irq.c
void plat_irq_dispatch(void)
{
u32 cause;
Index: linux-2.6.28.7/arch/mips/bcm47xx/nvram.c
===================================================================
--- linux-2.6.28.7.orig/arch/mips/bcm47xx/nvram.c 2009-03-17 17:26:19.000000000 +0100
+++ linux-2.6.28.7/arch/mips/bcm47xx/nvram.c 2009-03-17 17:26:23.000000000 +0100
--- a/arch/mips/bcm47xx/nvram.c
+++ b/arch/mips/bcm47xx/nvram.c
@@ -24,10 +24,10 @@
#include <asm/io.h>
#include <asm/uaccess.h>
@ -77,10 +69,8 @@ Index: linux-2.6.28.7/arch/mips/bcm47xx/nvram.c
struct nvram_header *header;
int i;
u32 base, lim, off;
Index: linux-2.6.28.7/arch/mips/bcm47xx/setup.c
===================================================================
--- linux-2.6.28.7.orig/arch/mips/bcm47xx/setup.c 2009-03-17 17:26:19.000000000 +0100
+++ linux-2.6.28.7/arch/mips/bcm47xx/setup.c 2009-03-17 17:26:23.000000000 +0100
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -2,7 +2,7 @@
* Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
* Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>
@ -305,10 +295,8 @@ Index: linux-2.6.28.7/arch/mips/bcm47xx/setup.c
+ return 0;
+}
+device_initcall(bcm47xx_register_gpiodev);
Index: linux-2.6.28.7/arch/mips/bcm47xx/time.c
===================================================================
--- linux-2.6.28.7.orig/arch/mips/bcm47xx/time.c 2009-03-17 17:26:19.000000000 +0100
+++ linux-2.6.28.7/arch/mips/bcm47xx/time.c 2009-03-17 17:26:23.000000000 +0100
--- a/arch/mips/bcm47xx/time.c
+++ b/arch/mips/bcm47xx/time.c
@@ -22,11 +22,17 @@
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/

14
target/linux/brcm47xx/patches-2.6.28/500-lzma_initramfs.patch
View File

@ -1,5 +1,5 @@
--- a/init/initramfs.c 2009-03-23 22:55:52.000000000 +0100
+++ b/init/initramfs.c 2009-05-01 11:15:46.000000000 +0200
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -7,6 +7,7 @@
#include <linux/string.h>
#include <linux/syscalls.h>
@ -8,7 +8,7 @@
static __initdata char *message;
static void __init error(char *x)
@@ -475,6 +476,69 @@
@@ -475,6 +476,69 @@ static void __init flush_window(void)
outcnt = 0;
}
@ -78,7 +78,7 @@
static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
{
int written;
@@ -509,12 +573,28 @@
@@ -509,12 +573,28 @@ static char * __init unpack_to_rootfs(ch
inptr = 0;
outcnt = 0; /* bytes in output buffer */
bytes_out = 0;
@ -112,9 +112,9 @@
buf += inptr;
len -= inptr;
}
--- a/scripts/gen_initramfs_list.sh 2009-03-23 22:55:52.000000000 +0100
+++ b/scripts/gen_initramfs_list.sh 2009-05-01 11:12:45.000000000 +0200
@@ -287,7 +287,7 @@
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -287,7 +287,7 @@ if [ ! -z ${output_file} ]; then
if [ "${is_cpio_compressed}" = "compressed" ]; then
cat ${cpio_tfile} > ${output_file}
else

6
target/linux/brcm47xx/patches-2.6.28/900-disable_early_printk.patch
View File

@ -1,6 +1,6 @@
--- linux-2.6.28.9/arch/mips/Kconfig 2009-04-17 10:43:28.000000000 +0200
+++ linux-2.6.28.9.new/arch/mips/Kconfig 2009-04-17 10:43:51.000000000 +0200
@@ -56,7 +56,6 @@
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -56,7 +56,6 @@ config BCM47XX
select SSB_B43_PCI_BRIDGE if PCI
select SSB_PCICORE_HOSTMODE if PCI
select GENERIC_GPIO

2
target/linux/brcm63xx/patches-2.6.27/008-usb_ehci_support.patch
View File

@ -33,7 +33,7 @@ Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
#error "missing bus glue for ehci-hcd"
--- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h
@@ -761,6 +761,11 @@ ehci_port_speed(struct ehci_hcd *ehci, u
@@ -764,6 +764,11 @@ ehci_port_speed(struct ehci_hcd *ehci, u
#define writel_be(val, addr) __raw_writel(val, (__force unsigned *)addr)
#endif

26
target/linux/etrax/patches-2.6.29/100-cris-makefiles.patch
View File

@ -1,7 +1,6 @@
diff -urN linux-2.6.28.clean/arch/cris/Makefile linux-2.6.28.mod/arch/cris/Makefile
--- linux-2.6.28.clean/arch/cris/Makefile 2008-12-25 00:26:37.000000000 +0100
+++ linux-2.6.28.mod/arch/cris/Makefile 2009-04-07 11:52:30.000000000 +0200
@@ -40,7 +40,7 @@
--- a/arch/cris/Makefile
+++ b/arch/cris/Makefile
@@ -40,7 +40,7 @@ endif
LD = $(CROSS_COMPILE)ld -mcrislinux
@ -10,9 +9,8 @@ diff -urN linux-2.6.28.clean/arch/cris/Makefile linux-2.6.28.mod/arch/cris/Makef
CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
diff -urN linux-2.6.28.clean/arch/cris/arch-v10/boot/Makefile linux-2.6.28.mod/arch/cris/arch-v10/boot/Makefile
--- linux-2.6.28.clean/arch/cris/arch-v10/boot/Makefile 2008-12-25 00:26:37.000000000 +0100
+++ linux-2.6.28.mod/arch/cris/arch-v10/boot/Makefile 2009-04-07 11:55:01.000000000 +0200
--- a/arch/cris/arch-v10/boot/Makefile
+++ b/arch/cris/arch-v10/boot/Makefile
@@ -2,8 +2,6 @@
# arch/cris/arch-v10/boot/Makefile
#
@ -22,7 +20,7 @@ diff -urN linux-2.6.28.clean/arch/cris/arch-v10/boot/Makefile linux-2.6.28.mod/a
subdir- := compressed rescue
targets := Image
@@ -13,7 +11,7 @@
@@ -13,7 +11,7 @@ $(obj)/Image: vmlinux FORCE
$(obj)/compressed/vmlinux: $(obj)/Image FORCE
$(Q)$(MAKE) $(build)=$(obj)/compressed $@
@ -31,10 +29,9 @@ diff -urN linux-2.6.28.clean/arch/cris/arch-v10/boot/Makefile linux-2.6.28.mod/a
$(obj)/zImage: $(obj)/compressed/vmlinux
@cp $< $@
diff -urN linux-2.6.28.clean/arch/cris/arch-v10/boot/compressed/Makefile linux-2.6.28.mod/arch/cris/arch-v10/boot/compressed/Makefile
--- linux-2.6.28.clean/arch/cris/arch-v10/boot/compressed/Makefile 2008-12-25 00:26:37.000000000 +0100
+++ linux-2.6.28.mod/arch/cris/arch-v10/boot/compressed/Makefile 2009-04-07 11:53:02.000000000 +0200
@@ -6,7 +6,6 @@
--- a/arch/cris/arch-v10/boot/compressed/Makefile
+++ b/arch/cris/arch-v10/boot/compressed/Makefile
@@ -6,7 +6,6 @@ asflags-y += $(LINUXINCLUDE)
ccflags-y += -O2 $(LINUXINCLUDE)
ldflags-y += -T $(srctree)/$(src)/decompress.lds
OBJECTS = $(obj)/head.o $(obj)/misc.o
@ -42,9 +39,8 @@ diff -urN linux-2.6.28.clean/arch/cris/arch-v10/boot/compressed/Makefile linux-2
quiet_cmd_image = BUILD $@
cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
diff -urN linux-2.6.28.clean/arch/cris/arch-v10/boot/rescue/Makefile linux-2.6.28.mod/arch/cris/arch-v10/boot/rescue/Makefile
--- linux-2.6.28.clean/arch/cris/arch-v10/boot/rescue/Makefile 2008-12-25 00:26:37.000000000 +0100
+++ linux-2.6.28.mod/arch/cris/arch-v10/boot/rescue/Makefile 2009-04-07 11:53:09.000000000 +0200
--- a/arch/cris/arch-v10/boot/rescue/Makefile
+++ b/arch/cris/arch-v10/boot/rescue/Makefile
@@ -5,7 +5,6 @@
ccflags-y += -O2 $(LINUXINCLUDE)
asflags-y += $(LINUXINCLUDE)

12
target/linux/etrax/patches-2.6.29/200-samsung_flash.patch
View File

@ -1,10 +1,8 @@
Index: linux-2.6.28.2/drivers/mtd/chips/cfi_cmdset_0002.c
===================================================================
--- linux-2.6.28.2.orig/drivers/mtd/chips/cfi_cmdset_0002.c 2009-02-04 13:42:19.000000000 +0100
+++ linux-2.6.28.2/drivers/mtd/chips/cfi_cmdset_0002.c 2009-02-04 13:44:11.000000000 +0100
@@ -364,7 +364,7 @@
return NULL;
}
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -374,7 +374,7 @@ struct mtd_info *cfi_cmdset_0002(struct
cfi_fixup_major_minor(cfi, extp);
- if (extp->MajorVersion != '1' ||
+ if (extp->MajorVersion < '1' || extp->MajorVersion > '3' ||

20
target/linux/etrax/patches-2.6.29/201-flashsize.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.28.2/arch/cris/arch-v10/drivers/axisflashmap.c
===================================================================
--- linux-2.6.28.2.orig/arch/cris/arch-v10/drivers/axisflashmap.c 2009-02-04 13:49:34.000000000 +0100
+++ linux-2.6.28.2/arch/cris/arch-v10/drivers/axisflashmap.c 2009-02-04 13:55:30.000000000 +0100
@@ -113,7 +113,7 @@
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
@@ -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
@ -11,7 +9,7 @@ Index: linux-2.6.28.2/arch/cris/arch-v10/drivers/axisflashmap.c
/*
* 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] = {
{
@ -36,7 +34,7 @@ Index: linux-2.6.28.2/arch/cris/arch-v10/drivers/axisflashmap.c
}
};
@@ -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";
@ -48,7 +46,7 @@ Index: linux-2.6.28.2/arch/cris/arch-v10/drivers/axisflashmap.c
if (!(mymtd = flash_probe())) {
/* There's no reason to use this module if no flash chip can
@@ -293,6 +293,31 @@
@@ -293,6 +293,31 @@ static int __init init_axis_flash(void)
axisflash_mtd = mymtd;
}
@ -80,10 +78,8 @@ Index: linux-2.6.28.2/arch/cris/arch-v10/drivers/axisflashmap.c
if (mymtd) {
mymtd->owner = THIS_MODULE;
ptable_head = (struct partitiontable_head *)(FLASH_CACHED_ADDR +
Index: linux-2.6.28.2/arch/cris/arch-v10/lib/hw_settings.S
===================================================================
--- linux-2.6.28.2.orig/arch/cris/arch-v10/lib/hw_settings.S 2009-02-04 13:48:25.000000000 +0100
+++ linux-2.6.28.2/arch/cris/arch-v10/lib/hw_settings.S 2009-02-04 13:49:04.000000000 +0100
--- a/arch/cris/arch-v10/lib/hw_settings.S
+++ b/arch/cris/arch-v10/lib/hw_settings.S
@@ -60,3 +60,5 @@
.dword R_PORT_PB_SET
.dword PB_SET_VALUE

4
target/linux/etrax/patches-2.6.29/300-sysfs.patch
View File

@ -8,7 +8,7 @@
#include <asm/io.h>
#include <asm/irq.h>
@@ -4384,6 +4385,7 @@ static const struct tty_operations rs_op
@@ -4393,6 +4394,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 @@ rs_init(void)
@@ -4527,6 +4529,24 @@ rs_init(void)
#endif
#endif /* CONFIG_SVINTO_SIM */

8
target/linux/etrax/patches-2.6.29/400-Kconfig_source.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.28.9/arch/cris/Kconfig
===================================================================
--- linux-2.6.28.9.orig/arch/cris/Kconfig 2009-03-23 22:55:52.000000000 +0100
+++ linux-2.6.28.9/arch/cris/Kconfig 2009-04-08 16:53:30.000000000 +0200
@@ -662,6 +662,12 @@
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -662,6 +662,12 @@ source "drivers/block/Kconfig"
source "drivers/ide/Kconfig"

16
target/linux/etrax/patches-2.6.29/500-i2c_gvc.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.25.20/arch/cris/arch-v10/drivers/Kconfig
===================================================================
--- linux-2.6.25.20.orig/arch/cris/arch-v10/drivers/Kconfig 2009-02-09 09:30:40.000000000 +0100
+++ linux-2.6.25.20/arch/cris/arch-v10/drivers/Kconfig 2009-02-09 21:23:12.000000000 +0100
@@ -450,11 +450,18 @@
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -450,11 +450,18 @@ config ETRAX_I2C
i2c_arg = I2C_READARG(STA013_READ_ADDR, reg);
val = ioctl(fd, _IO(ETRAXI2C_IOCTYPE, I2C_READREG), i2c_arg);
@ -22,7 +20,7 @@ Index: linux-2.6.25.20/arch/cris/arch-v10/drivers/Kconfig
help
Select whether to use the special I2C mode in the PB I/O register or
not. This option needs to be selected in order to use some drivers
@@ -478,7 +485,7 @@
@@ -478,7 +485,7 @@ config ETRAX_I2C_CLK_PORT
config ETRAX_I2C_EEPROM
bool "I2C EEPROM (non-volatile RAM) support"
@ -31,10 +29,8 @@ Index: linux-2.6.25.20/arch/cris/arch-v10/drivers/Kconfig
help
Enables I2C EEPROM (non-volatile RAM) on PB0 and PB1 using the I2C
driver. Select size option: Probed, 2k, 8k, 16k.
Index: linux-2.6.25.20/arch/cris/arch-v10/drivers/Makefile
===================================================================
--- linux-2.6.25.20.orig/arch/cris/arch-v10/drivers/Makefile 2009-02-09 09:30:41.000000000 +0100
+++ linux-2.6.25.20/arch/cris/arch-v10/drivers/Makefile 2009-02-09 09:35:39.000000000 +0100
--- a/arch/cris/arch-v10/drivers/Makefile
+++ b/arch/cris/arch-v10/drivers/Makefile
@@ -4,6 +4,7 @@
obj-$(CONFIG_ETRAX_AXISFLASHMAP) += axisflashmap.o

14
target/linux/etrax/patches-2.6.29/600-fix_serial_cris.patch
View File

@ -1,8 +1,6 @@
Index: linux-2.6.28.9/drivers/serial/crisv10.c
===================================================================
--- linux-2.6.28.9.orig/drivers/serial/crisv10.c 2009-04-10 12:58:18.000000000 +0200
+++ linux-2.6.28.9/drivers/serial/crisv10.c 2009-04-10 12:58:22.000000000 +0200
@@ -28,12 +28,15 @@
--- a/drivers/serial/crisv10.c
+++ b/drivers/serial/crisv10.c
@@ -28,12 +28,15 @@ static char *serial_version = "$Revision
#include <linux/mutex.h>
#include <linux/bitops.h>
#include <linux/device.h>
@ -20,7 +18,7 @@ Index: linux-2.6.28.9/drivers/serial/crisv10.c
#include <arch/svinto.h>
@@ -457,7 +460,6 @@
@@ -457,7 +460,6 @@ static struct e100_serial rs_table[] = {
#define NR_PORTS (sizeof(rs_table)/sizeof(struct e100_serial))
@ -28,7 +26,7 @@ Index: linux-2.6.28.9/drivers/serial/crisv10.c
#ifdef CONFIG_ETRAX_SERIAL_FAST_TIMER
static struct fast_timer fast_timers[NR_PORTS];
#endif
@@ -4221,151 +4223,132 @@
@@ -4221,151 +4223,132 @@ rs_open(struct tty_struct *tty, struct f
return 0;
}
@ -249,7 +247,7 @@ Index: linux-2.6.28.9/drivers/serial/crisv10.c
&serial_version[11]); /* "$Revision: x.yy" */
}
@@ -4389,9 +4372,11 @@
@@ -4389,9 +4372,11 @@ static const struct tty_operations rs_op
.break_ctl = rs_break,
.send_xchar = rs_send_xchar,
.wait_until_sent = rs_wait_until_sent,

12
target/linux/generic-2.6/patches-2.6.21/100-netfilter_layer7_2.21.patch
View File

@ -16,7 +16,7 @@
+#endif /* _XT_LAYER7_H */
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -128,6 +128,22 @@
@@ -128,6 +128,22 @@ struct nf_conn
u_int32_t secmark;
#endif
@ -41,7 +41,7 @@
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
@@ -163,6 +163,12 @@
@@ -163,6 +163,12 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC;
#endif
@ -56,7 +56,7 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -640,6 +640,27 @@
@@ -640,6 +640,27 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N.
@ -86,7 +86,7 @@
depends on NETFILTER_XTABLES
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -68,6 +68,7 @@
@@ -68,6 +68,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) +
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
@ -96,7 +96,7 @@
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -352,6 +352,14 @@
@@ -352,6 +352,14 @@ destroy_conntrack(struct nf_conntrack *n
* too. */
nf_ct_remove_expectations(ct);
@ -113,7 +113,7 @@
BUG_ON(list_empty(&ct->tuplehash[IP_CT_DIR_ORIGINAL].list));
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -195,6 +195,11 @@
@@ -195,6 +195,11 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC;
#endif

10
target/linux/generic-2.6/patches-2.6.21/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 invert:1;
char pattern[MAX_PATTERN_LEN];
@ -10,7 +10,7 @@
#endif /* _XT_LAYER7_H */
--- a/net/netfilter/xt_layer7.c
+++ b/net/netfilter/xt_layer7.c
@@ -296,34 +296,36 @@
@@ -296,34 +296,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;
}
@@ -410,7 +412,7 @@
@@ -410,7 +412,7 @@ match(const struct sk_buff *skbin,
struct xt_layer7_info * info = (struct xt_layer7_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;
@@ -438,8 +440,8 @@
@@ -438,8 +440,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);
@@ -472,6 +474,25 @@
@@ -472,6 +474,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);

10
target/linux/generic-2.6/patches-2.6.23/100-netfilter_layer7_2.21.patch
View File

@ -16,7 +16,7 @@
+#endif /* _XT_LAYER7_H */
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -127,6 +127,22 @@
@@ -127,6 +127,22 @@ struct nf_conn
u_int32_t secmark;
#endif
@ -41,7 +41,7 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -633,6 +633,27 @@
@@ -633,6 +633,27 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N.
@ -71,7 +71,7 @@
depends on NETFILTER_XTABLES
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -71,6 +71,7 @@
@@ -71,6 +71,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_QUOTA) +
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
@ -81,7 +81,7 @@
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -207,6 +207,14 @@
@@ -207,6 +207,14 @@ destroy_conntrack(struct nf_conntrack *n
* too. */
nf_ct_remove_expectations(ct);
@ -98,7 +98,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
@@ -179,6 +179,11 @@
@@ -179,6 +179,11 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC;
#endif

10
target/linux/generic-2.6/patches-2.6.25/100-netfilter_layer7_2.21.patch
View File

@ -16,7 +16,7 @@
+#endif /* _XT_LAYER7_H */
--- 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
@ -41,7 +41,7 @@
--- 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.
@ -71,7 +71,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
@ -81,7 +81,7 @@
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
--- 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);
@ -98,7 +98,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,6 +181,12 @@
@@ -181,6 +181,12 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC;
#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
@@ -314,34 +314,36 @@
@@ -314,34 +314,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;
}
@@ -438,7 +440,7 @@
@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
enum ip_conntrack_info master_ctinfo, ctinfo;
struct nf_conn *master_conntrack, *conntrack;
@ -70,7 +70,7 @@
unsigned int pattern_result, appdatalen;
regexp * comppattern;
@@ -466,9 +468,8 @@
@@ -466,9 +468,8 @@ match(const struct sk_buff *skbin,
master_conntrack = master_ct(master_conntrack);
/* if we've classified it or seen too many packets */
@ -82,7 +82,7 @@
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
@@ -500,6 +501,25 @@
@@ -500,6 +501,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);

10
target/linux/generic-2.6/patches-2.6.26/100-netfilter_layer7_2.21.patch
View File

@ -16,7 +16,7 @@
+#endif /* _XT_LAYER7_H */
--- 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
@ -41,7 +41,7 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -749,6 +749,27 @@
@@ -749,6 +749,27 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N.
@ -71,7 +71,7 @@
depends on NETFILTER_XTABLES
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -78,6 +78,7 @@
@@ -78,6 +78,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
@ -81,7 +81,7 @@
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -205,6 +205,14 @@
@@ -205,6 +205,14 @@ destroy_conntrack(struct nf_conntrack *n
* too. */
nf_ct_remove_expectations(ct);
@ -98,7 +98,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
@@ -174,6 +174,12 @@
@@ -174,6 +174,12 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC;
#endif

10
target/linux/generic-2.6/patches-2.6.26/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
@@ -314,34 +314,36 @@
@@ -314,34 +314,36 @@ static int match_no_append(struct nf_con
}
/* add the new app data to the conntrack. Return number of bytes added. */
@ -60,7 +60,7 @@
return length;
}
@@ -438,7 +440,7 @@
@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
enum ip_conntrack_info master_ctinfo, ctinfo;
struct nf_conn *master_conntrack, *conntrack;
@ -69,7 +69,7 @@
unsigned int pattern_result, appdatalen;
regexp * comppattern;
@@ -466,8 +468,8 @@
@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
master_conntrack = master_ct(master_conntrack);
/* if we've classified it or seen too many packets */
@ -80,7 +80,7 @@
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
@@ -500,6 +502,25 @@
@@ -500,6 +502,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);

10
target/linux/generic-2.6/patches-2.6.27/100-netfilter_layer7_2.21.patch
View File

@ -16,7 +16,7 @@
+#endif /* _XT_LAYER7_H */
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -118,6 +118,22 @@
@@ -118,6 +118,22 @@ struct nf_conn
u_int32_t secmark;
#endif
@ -41,7 +41,7 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -757,6 +757,27 @@
@@ -757,6 +757,27 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N.
@ -71,7 +71,7 @@
depends on NETFILTER_XTABLES
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -78,6 +78,7 @@
@@ -78,6 +78,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
@ -81,7 +81,7 @@
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -206,6 +206,14 @@
@@ -206,6 +206,14 @@ destroy_conntrack(struct nf_conntrack *n
* too. */
nf_ct_remove_expectations(ct);
@ -98,7 +98,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
@@ -162,6 +162,12 @@
@@ -162,6 +162,12 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC;
#endif

10
target/linux/generic-2.6/patches-2.6.27/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
@@ -314,33 +314,35 @@
@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
}
/* add the new app data to the conntrack. Return number of bytes added. */
@ -60,7 +60,7 @@
return length;
}
@@ -438,7 +440,7 @@
@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
enum ip_conntrack_info master_ctinfo, ctinfo;
struct nf_conn *master_conntrack, *conntrack;
@ -69,7 +69,7 @@
unsigned int pattern_result, appdatalen;
regexp * comppattern;
@@ -466,8 +468,8 @@
@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
master_conntrack = master_ct(master_conntrack);
/* if we've classified it or seen too many packets */
@ -80,7 +80,7 @@
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
@@ -500,6 +502,25 @@
@@ -500,6 +502,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);

8
target/linux/generic-2.6/patches-2.6.27/208-rtl8110sb_fix.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@ -1507,7 +1507,7 @@ static const struct rtl_cfg_info {
@@ -1527,7 +1527,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,
.features = RTL_FEATURE_GMII
@@ -1516,7 +1516,7 @@ static const struct rtl_cfg_info {
@@ -1536,7 +1536,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,
.features = RTL_FEATURE_GMII | RTL_FEATURE_MSI
@@ -1525,7 +1525,7 @@ static const struct rtl_cfg_info {
@@ -1545,7 +1545,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,
.features = RTL_FEATURE_MSI
@@ -2866,10 +2866,12 @@ static irqreturn_t rtl8169_interrupt(int
@@ -2879,10 +2879,12 @@ static irqreturn_t rtl8169_interrupt(int
goto out;
}

6
target/linux/generic-2.6/patches-2.6.27/977-textsearch_kconfig_hacks.patch
View File

@ -1,6 +1,6 @@
--- a/lib/Kconfig 2009-03-23 23:04:09.000000000 +0100
+++ b/lib/Kconfig 2009-03-26 12:43:09.000000000 +0100
@@ -122,13 +122,13 @@
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -122,13 +122,13 @@ config TEXTSEARCH
boolean
config TEXTSEARCH_KMP

10
target/linux/generic-2.6/patches-2.6.29/100-netfilter_layer7_2.21.patch
View File

@ -16,7 +16,7 @@
+#endif /* _XT_LAYER7_H */
--- a/include/net/netfilter/nf_conntrack.h
+++ b/include/net/netfilter/nf_conntrack.h
@@ -118,6 +118,22 @@
@@ -118,6 +118,22 @@ struct nf_conn
u_int32_t secmark;
#endif
@ -41,7 +41,7 @@
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -794,6 +794,27 @@
@@ -794,6 +794,27 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N.
@ -71,7 +71,7 @@
depends on NETFILTER_ADVANCED
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -84,6 +84,7 @@
@@ -84,6 +84,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT)
obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o
obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o
obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o
@ -81,7 +81,7 @@
obj-$(CONFIG_NETFILTER_XT_MATCH_TCPMSS) += xt_tcpmss.o
--- a/net/netfilter/nf_conntrack_core.c
+++ b/net/netfilter/nf_conntrack_core.c
@@ -202,6 +202,14 @@
@@ -202,6 +202,14 @@ destroy_conntrack(struct nf_conntrack *n
* too. */
nf_ct_remove_expectations(ct);
@ -98,7 +98,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
@@ -165,6 +165,12 @@
@@ -165,6 +165,12 @@ static int ct_seq_show(struct seq_file *
return -ENOSPC;
#endif

10
target/linux/generic-2.6/patches-2.6.29/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
@@ -314,33 +314,35 @@
@@ -314,33 +314,35 @@ static int match_no_append(struct nf_con
}
/* add the new app data to the conntrack. Return number of bytes added. */
@ -60,7 +60,7 @@
return length;
}
@@ -438,7 +440,7 @@
@@ -438,7 +440,7 @@ match(const struct sk_buff *skbin,
enum ip_conntrack_info master_ctinfo, ctinfo;
struct nf_conn *master_conntrack, *conntrack;
@ -69,7 +69,7 @@
unsigned int pattern_result, appdatalen;
regexp * comppattern;
@@ -466,8 +468,8 @@
@@ -466,8 +468,8 @@ match(const struct sk_buff *skbin,
master_conntrack = master_ct(master_conntrack);
/* if we've classified it or seen too many packets */
@ -80,7 +80,7 @@
pattern_result = match_no_append(conntrack, master_conntrack,
ctinfo, master_ctinfo, info);
@@ -500,6 +502,25 @@
@@ -500,6 +502,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);

2
target/linux/generic-2.6/patches-2.6.29/208-rtl8110sb_fix.patch
View File

@ -27,7 +27,7 @@
RxFIFOOver | TxErr | TxOK | RxOK | RxErr,
.napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow,
.features = RTL_FEATURE_MSI
@@ -3581,10 +3581,12 @@ static irqreturn_t rtl8169_interrupt(int
@@ -3582,10 +3582,12 @@ static irqreturn_t rtl8169_interrupt(int
goto out;
}

2
target/linux/generic-2.6/patches-2.6.29/980-vm_exports.patch
View File

@ -68,7 +68,7 @@
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5121,6 +5121,7 @@ int can_nice(const struct task_struct *p
@@ -5178,6 +5178,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
capable(CAP_SYS_NICE));
}

15
target/linux/orion/patches/200-dt2_board_support.patch
View File

@ -1,7 +1,6 @@
diff -ruN linux-2.6.28.5.orig/arch/arm/mach-orion5x/Kconfig linux-2.6.28.5/arch/arm/mach-orion5x/Kconfig
--- linux-2.6.28.5.orig/arch/arm/mach-orion5x/Kconfig 2009-02-21 00:41:27.000000000 +0200
+++ linux-2.6.28.5/arch/arm/mach-orion5x/Kconfig 2009-02-28 10:06:24.000000000 +0200
@@ -16,6 +16,13 @@
--- a/arch/arm/mach-orion5x/Kconfig
+++ b/arch/arm/mach-orion5x/Kconfig
@@ -16,6 +16,13 @@ config MACH_RD88F5182
Say 'Y' here if you want your kernel to support the
Marvell Orion-NAS (88F5182) RD2
@ -15,12 +14,10 @@ diff -ruN linux-2.6.28.5.orig/arch/arm/mach-orion5x/Kconfig linux-2.6.28.5/arch/
config MACH_KUROBOX_PRO
bool "KuroBox Pro"
select I2C_BOARDINFO
diff -ruN linux-2.6.28.5.orig/arch/arm/mach-orion5x/Makefile linux-2.6.28.5/arch/arm/mach-orion5x/Makefile
--- linux-2.6.28.5.orig/arch/arm/mach-orion5x/Makefile 2009-02-21 00:41:27.000000000 +0200
+++ linux-2.6.28.5/arch/arm/mach-orion5x/Makefile 2009-02-28 10:07:35.000000000 +0200
@@ -17,3 +17,4 @@
--- a/arch/arm/mach-orion5x/Makefile
+++ b/arch/arm/mach-orion5x/Makefile
@@ -17,3 +17,4 @@ obj-$(CONFIG_MACH_WNR854T) += wnr854t-se
obj-$(CONFIG_MACH_RD88F5181L_GE) += rd88f5181l-ge-setup.o
obj-$(CONFIG_MACH_RD88F5181L_FXO) += rd88f5181l-fxo-setup.o
obj-$(CONFIG_MACH_RD88F6183AP_GE) += rd88f6183ap-ge-setup.o
+obj-$(CONFIG_MACH_DT2) += dt2-setup.o

8
target/linux/rb532/patches-2.6.28/002-pci_io_map_base.patch
View File

@ -7,11 +7,9 @@ Tested-by: Florian Fainelli <florian@openwrt.org>
arch/mips/pci/pci-rc32434.c | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/arch/mips/pci/pci-rc32434.c b/arch/mips/pci/pci-rc32434.c
index 1c2821e..71f7d27 100644
--- a/arch/mips/pci/pci-rc32434.c
+++ b/arch/mips/pci/pci-rc32434.c
@@ -205,6 +205,8 @@ static int __init rc32434_pcibridge_init(void)
@@ -205,6 +205,8 @@ static int __init rc32434_pcibridge_init
static int __init rc32434_pci_init(void)
{
@ -36,7 +34,3 @@ index 1c2821e..71f7d27 100644
register_pci_controller(&rc32434_controller);
rc32434_sync();
--
1.5.6.4

9
target/linux/rb532/patches-2.6.28/003-gpio_bit_setting.patch
View File

@ -8,11 +8,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
arch/mips/rb532/gpio.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c
index 0e84c8a..e35cb75 100644
--- a/arch/mips/rb532/gpio.c
+++ b/arch/mips/rb532/gpio.c
@@ -119,13 +119,11 @@ static inline void rb532_set_bit(unsigned bitval,
@@ -119,13 +119,11 @@ static inline void rb532_set_bit(unsigne
unsigned long flags;
u32 val;
@ -28,8 +26,3 @@ index 0e84c8a..e35cb75 100644
writel(val, ioaddr);
local_irq_restore(flags);
--
1.5.6.4

9
target/linux/rb532/patches-2.6.28/004-fix_pata_rb532_cf.patch
View File

@ -10,9 +10,8 @@ be cleared. This is being done at the end of rb532_pata_irq_handler.
Signed-off-by: Phil Sutter <n0-1@freewrt.org>
Acked-by: Florian Fainelli <florian@openwrt.org>
---
diff -urN linux-2.6.28.7/drivers/ata/pata_rb532_cf.c linux-2.6.28.7.new/drivers/ata/pata_rb532_cf.c
--- linux-2.6.28.7/drivers/ata/pata_rb532_cf.c 2009-02-20 23:41:27.000000000 +0100
+++ linux-2.6.28.7.new/drivers/ata/pata_rb532_cf.c 2009-03-15 13:21:06.000000000 +0100
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -31,6 +31,7 @@
#include <scsi/scsi_host.h>
@ -21,7 +20,7 @@ diff -urN linux-2.6.28.7/drivers/ata/pata_rb532_cf.c linux-2.6.28.7.new/drivers/
#define DRV_NAME "pata-rb532-cf"
#define DRV_VERSION "0.1.0"
@@ -63,8 +64,8 @@
@@ -63,8 +64,8 @@ static inline void rb532_pata_finish_io(
ata_sff_sync might be sufficient. */
ata_sff_dma_pause(ap);
ndelay(RB500_CF_IO_DELAY);
@ -32,7 +31,7 @@ diff -urN linux-2.6.28.7/drivers/ata/pata_rb532_cf.c linux-2.6.28.7.new/drivers/
}
static void rb532_pata_exec_command(struct ata_port *ap,
@@ -113,13 +114,15 @@
@@ -113,13 +114,15 @@ static irqreturn_t rb532_pata_irq_handle
struct rb532_cf_info *info = ah->private_data;
if (gpio_get_value(info->gpio_line)) {

7
target/linux/rb532/patches-2.6.28/005-pata_rb532_cf_4bytes_rw.patch
View File

@ -10,10 +10,9 @@ original driver always transfers 512 Bytes at once.
Signed-off-by: Phil Sutter <n0-1@freewrt.org>
Acked-by: Sergei Shtyltov <sshtylyov@ru.mvista.com>
---
diff -urN linux-2.6.28.7/drivers/ata/pata_rb532_cf.c linux-2.6.28.7.new/drivers/ata/pata_rb532_cf.c
--- linux-2.6.28.7/drivers/ata/pata_rb532_cf.c 2009-03-15 13:24:24.000000000 +0100
+++ linux-2.6.28.7.new/drivers/ata/pata_rb532_cf.c 2009-03-15 13:26:19.000000000 +0100
@@ -82,13 +82,10 @@
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -82,13 +82,10 @@ static unsigned int rb532_pata_data_xfer
void __iomem *ioaddr = ap->ioaddr.data_addr;
int retlen = buflen;

7
target/linux/rb532/patches-2.6.28/006-pata_rb532_cf_fix_prototype.patch
View File

@ -5,10 +5,9 @@ bytes, so alter the return value accordingly.
Signed-off-by: Phil Sutter <n0-1@freewrt.org>
---
diff -urN linux-2.6.28.7/drivers/ata/pata_rb532_cf.c linux-2.6.28.7.new/drivers/ata/pata_rb532_cf.c
--- linux-2.6.28.7/drivers/ata/pata_rb532_cf.c 2009-03-15 13:29:09.000000000 +0100
+++ linux-2.6.28.7.new/drivers/ata/pata_rb532_cf.c 2009-03-15 13:29:46.000000000 +0100
@@ -88,7 +88,7 @@
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
@@ -88,7 +88,7 @@ static unsigned int rb532_pata_data_xfer
readsl(ioaddr, buf, buflen / sizeof(u32));
rb532_pata_finish_io(adev->link->ap);

5
target/linux/rb532/patches-2.6.28/007-cmdline_hack.patch
View File

@ -1,6 +1,5 @@
diff -urN linux-2.6.27.5/arch/mips/kernel/head.S linux-2.6.27.5.new/arch/mips/kernel/head.S
--- linux-2.6.27.5/arch/mips/kernel/head.S 2008-11-15 19:24:03.000000000 +0100
+++ linux-2.6.27.5.new/arch/mips/kernel/head.S 2008-11-15 19:24:55.000000000 +0100
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -123,6 +123,11 @@
j kernel_entry

6
target/linux/rb532/patches-2.6.28/008-korina_reset_resource_buffer_size_1536.patch
View File

@ -9,8 +9,6 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
drivers/net/korina.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index fefb33d..e30c2f4 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -84,7 +84,10 @@
@ -25,7 +23,3 @@ index fefb33d..e30c2f4 100644
#define KORINA_RDS_MASK (KORINA_NUM_RDS - 1)
#define KORINA_TDS_MASK (KORINA_NUM_TDS - 1)
#define RD_RING_SIZE (KORINA_NUM_RDS * sizeof(struct dma_desc))
--
1.5.6.4

10
target/linux/rb532/patches-2.6.28/009-korina_disable_napi_on_close_and_restart.patch
View File

@ -5,11 +5,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
drivers/net/korina.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index e30c2f4..65b8487 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -904,6 +904,8 @@ static int korina_restart(struct net_device *dev)
@@ -905,6 +905,8 @@ static int korina_restart(struct net_dev
korina_free_ring(dev);
@ -18,7 +16,7 @@ index e30c2f4..65b8487 100644
ret = korina_init(dev);
if (ret < 0) {
printk(KERN_ERR DRV_NAME "%s: cannot restart device\n",
@@ -1070,6 +1072,8 @@ static int korina_close(struct net_device *dev)
@@ -1071,6 +1073,8 @@ static int korina_close(struct net_devic
korina_free_ring(dev);
@ -27,7 +25,3 @@ index e30c2f4..65b8487 100644
free_irq(lp->rx_irq, dev);
free_irq(lp->tx_irq, dev);
free_irq(lp->ovr_irq, dev);
--
1.5.6.4

8
target/linux/rb532/patches-2.6.28/010-korina_rework_korina_rx.patch
View File

@ -4,9 +4,9 @@ packets and korina_rx is called again (and again and again and ...).
Signed-off-by: Phil Sutter <n0-1@freewrt.org>
---
--- a/drivers/net/korina.c 2009-01-19 23:19:10.000000000 +0100
+++ b/drivers/net/korina.c 2009-01-19 23:25:31.000000000 +0100
@@ -353,15 +353,20 @@
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -353,15 +353,20 @@ static int korina_rx(struct net_device *
struct dma_desc *rd = &lp->rd_ring[lp->rx_next_done];
struct sk_buff *skb, *skb_new;
u8 *pkt_buf;
@ -28,7 +28,7 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
/* Update statistics counters */
if (devcs & ETH_RX_CRC)
dev->stats.rx_crc_errors++;
@@ -384,64 +389,53 @@
@@ -384,64 +389,53 @@ static int korina_rx(struct net_device *
* in Rc32434 (errata ref #077) */
dev->stats.rx_errors++;
dev->stats.rx_dropped++;

6
target/linux/rb532/patches-2.6.28/011-korina_do_schedule_napi_after_testing_it.patch
View File

@ -5,9 +5,9 @@ Before this change, the driver received absolutely nothing.
Signed-off-by: Phil Sutter <n0-1@freewrt.org>
---
--- a/drivers/net/korina.c 2009-01-19 23:26:19.000000000 +0100
+++ b/drivers/net/korina.c 2009-01-19 23:27:06.000000000 +0100
@@ -330,7 +330,7 @@
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -330,7 +330,7 @@ static irqreturn_t korina_rx_dma_interru
dmas = readl(&lp->rx_dma_regs->dmas);
if (dmas & (DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR)) {

8
target/linux/rb532/patches-2.6.28/012-korina_do_tx_at_right_position.patch
View File

@ -7,9 +7,9 @@ upstream.
Signed-off-by: Phil Sutter <n0-1@freewrt.org>
---
--- a/drivers/net/korina.c 2009-01-19 23:27:41.000000000 +0100
+++ b/drivers/net/korina.c 2009-01-19 23:29:08.000000000 +0100
@@ -330,12 +330,12 @@
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -330,12 +330,12 @@ static irqreturn_t korina_rx_dma_interru
dmas = readl(&lp->rx_dma_regs->dmas);
if (dmas & (DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR)) {
@ -24,7 +24,7 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
if (dmas & DMA_STAT_ERR)
printk(KERN_ERR DRV_NAME "%s: DMA error\n", dev->name);
@@ -621,11 +621,11 @@
@@ -621,11 +621,11 @@ korina_tx_dma_interrupt(int irq, void *d
dmas = readl(&lp->tx_dma_regs->dmas);
if (dmas & (DMA_STAT_FINI | DMA_STAT_ERR)) {

16
target/linux/rb532/patches-2.6.28/013-korina_fix_handling_tx_chain_tail.patch
View File

@ -10,11 +10,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
drivers/net/korina.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index dced5e7..f200175 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -199,7 +199,7 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
@@ -199,7 +199,7 @@ static int korina_send_packet(struct sk_
struct korina_private *lp = netdev_priv(dev);
unsigned long flags;
u32 length;
@ -23,7 +21,7 @@ index dced5e7..f200175 100644
struct dma_desc *td;
spin_lock_irqsave(&lp->lock, flags);
@@ -231,8 +231,8 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
@@ -231,8 +231,8 @@ static int korina_send_packet(struct sk_
/* Setup the transmit descriptor. */
dma_cache_inv((u32) td, sizeof(*td));
td->ca = CPHYSADDR(skb->data);
@ -34,7 +32,7 @@ index dced5e7..f200175 100644
if (readl(&(lp->tx_dma_regs->dmandptr)) == 0) {
if (lp->tx_chain_status == desc_empty) {
@@ -240,7 +240,7 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
@@ -240,7 +240,7 @@ static int korina_send_packet(struct sk_
td->control = DMA_COUNT(length) |
DMA_DESC_COF | DMA_DESC_IOF;
/* Move tail */
@ -43,7 +41,7 @@ index dced5e7..f200175 100644
/* Write to NDPTR */
writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]),
&lp->tx_dma_regs->dmandptr);
@@ -251,12 +251,12 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
@@ -251,12 +251,12 @@ static int korina_send_packet(struct sk_
td->control = DMA_COUNT(length) |
DMA_DESC_COF | DMA_DESC_IOF;
/* Link to prev */
@ -59,7 +57,7 @@ index dced5e7..f200175 100644
/* Write to NDPTR */
writel(CPHYSADDR(&lp->td_ring[lp->tx_chain_head]),
&(lp->tx_dma_regs->dmandptr));
@@ -270,17 +270,17 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
@@ -270,17 +270,17 @@ static int korina_send_packet(struct sk_
td->control = DMA_COUNT(length) |
DMA_DESC_COF | DMA_DESC_IOF;
/* Move tail */
@ -81,7 +79,3 @@ index dced5e7..f200175 100644
}
}
dma_cache_wback((u32) td, sizeof(*td));
--
1.5.6.4

8
target/linux/rb532/patches-2.6.28/014-korina_do_not_stop_queue_here.patch
View File

@ -7,11 +7,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
drivers/net/korina.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index f200175..bd33fa9 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -272,7 +272,6 @@ static int korina_send_packet(struct sk_buff *skb, struct net_device *dev)
@@ -272,7 +272,6 @@ static int korina_send_packet(struct sk_
/* Move tail */
lp->tx_chain_tail = chain_next;
lp->tx_chain_status = desc_filled;
@ -19,7 +17,3 @@ index f200175..bd33fa9 100644
} else {
/* Update tail */
td->control = DMA_COUNT(length) |
--
1.5.6.4

12
target/linux/rb532/patches-2.6.28/015-korina_irqf_flags.patch
View File

@ -8,11 +8,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
drivers/net/korina.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index bd33fa9..1d6e48e 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -1000,14 +1000,14 @@ static int korina_open(struct net_device *dev)
@@ -998,14 +998,14 @@ static int korina_open(struct net_device
* that handles the Done Finished
* Ovr and Und Events */
ret = request_irq(lp->rx_irq, &korina_rx_dma_interrupt,
@ -29,7 +27,7 @@ index bd33fa9..1d6e48e 100644
if (ret < 0) {
printk(KERN_ERR DRV_NAME "%s: unable to get Tx DMA IRQ %d\n",
dev->name, lp->tx_irq);
@@ -1016,7 +1016,7 @@ static int korina_open(struct net_device *dev)
@@ -1014,7 +1014,7 @@ static int korina_open(struct net_device
/* Install handler for overrun error. */
ret = request_irq(lp->ovr_irq, &korina_ovr_interrupt,
@ -38,7 +36,7 @@ index bd33fa9..1d6e48e 100644
if (ret < 0) {
printk(KERN_ERR DRV_NAME"%s: unable to get OVR IRQ %d\n",
dev->name, lp->ovr_irq);
@@ -1025,7 +1025,7 @@ static int korina_open(struct net_device *dev)
@@ -1023,7 +1023,7 @@ static int korina_open(struct net_device
/* Install handler for underflow error. */
ret = request_irq(lp->und_irq, &korina_und_interrupt,
@ -47,7 +45,3 @@ index bd33fa9..1d6e48e 100644
if (ret < 0) {
printk(KERN_ERR DRV_NAME "%s: unable to get UND IRQ %d\n",
dev->name, lp->und_irq);
--
1.5.6.4

10
target/linux/rb532/patches-2.6.28/016-korina_drop_left_over_assignment.patch
View File

@ -7,11 +7,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
drivers/net/korina.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index 60ae7bf..75010ca 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -743,6 +743,7 @@ static struct ethtool_ops netdev_ethtool_ops = {
@@ -738,6 +738,7 @@ static struct ethtool_ops netdev_ethtool
static void korina_alloc_ring(struct net_device *dev)
{
struct korina_private *lp = netdev_priv(dev);
@ -19,7 +17,7 @@ index 60ae7bf..75010ca 100644
int i;
/* Initialize the transmit descriptors */
@@ -758,8 +759,6 @@ static void korina_alloc_ring(struct net_device *dev)
@@ -753,8 +754,6 @@ static void korina_alloc_ring(struct net
/* Initialize the receive descriptors */
for (i = 0; i < KORINA_NUM_RDS; i++) {
@ -28,7 +26,3 @@ index 60ae7bf..75010ca 100644
skb = dev_alloc_skb(KORINA_RBSIZE + 2);
if (!skb)
break;
--
1.5.6.4

8
target/linux/rb532/patches-2.6.28/017-korina_fix_loop_back_rx_desc.patch
View File

@ -9,11 +9,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
drivers/net/korina.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index 1d6e48e..67fbdf4 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -769,11 +769,12 @@ static void korina_alloc_ring(struct net_device *dev)
@@ -766,11 +766,12 @@ static void korina_alloc_ring(struct net
lp->rd_ring[i].link = CPHYSADDR(&lp->rd_ring[i+1]);
}
@ -30,7 +28,3 @@ index 1d6e48e..67fbdf4 100644
lp->rx_chain_head = 0;
lp->rx_chain_tail = 0;
lp->rx_chain_status = desc_empty;
--
1.5.6.4

10
target/linux/rb532/patches-2.6.28/018-korina_adjust_headroom.patch
View File

@ -8,11 +8,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
drivers/net/korina.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index 67fbdf4..60ae7bf 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -416,6 +416,9 @@ static int korina_rx(struct net_device *dev, int limit)
@@ -415,6 +415,9 @@ static int korina_rx(struct net_device *
if (devcs & ETH_RX_MP)
dev->stats.multicast++;
@ -21,8 +19,4 @@ index 67fbdf4..60ae7bf 100644
+
lp->rx_skb[lp->rx_next_done] = skb_new;
}
--
1.5.6.4
rd->devcs = 0;

12
target/linux/rb532/patches-2.6.28/019-korina_set_dev_field_allocated_skb.patch
View File

@ -7,19 +7,17 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
drivers/net/korina.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index 75010ca..56b4db2 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -419,6 +419,7 @@ static int korina_rx(struct net_device *dev, int limit)
@@ -418,6 +418,7 @@ static int korina_rx(struct net_device *
/* 16 bit align */
skb_reserve(skb_new, 2);
+ skb_new->dev = dev;
lp->rx_skb[lp->rx_next_done] = skb_new;
}
@@ -763,6 +764,7 @@ static void korina_alloc_ring(struct net_device *dev)
rd->devcs = 0;
@@ -761,6 +762,7 @@ static void korina_alloc_ring(struct net
if (!skb)
break;
skb_reserve(skb, 2);
@ -27,7 +25,3 @@ index 75010ca..56b4db2 100644
lp->rx_skb[i] = skb;
lp->rd_ring[i].control = DMA_DESC_IOD |
DMA_COUNT(KORINA_RBSIZE);
--
1.5.6.4

8
target/linux/rb532/patches-2.6.28/021-rb532_driver_data.patch
View File

@ -7,11 +7,9 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
arch/mips/rb532/devices.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 9b6b744..3c74561 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -89,7 +89,7 @@ static struct korina_device korina_dev0_data = {
@@ -86,7 +86,7 @@ static struct korina_device korina_dev0_
static struct platform_device korina_dev0 = {
.id = -1,
.name = "korina",
@ -20,7 +18,3 @@ index 9b6b744..3c74561 100644
.resource = korina_dev0_res,
.num_resources = ARRAY_SIZE(korina_dev0_res),
};
--
1.5.6.4

12
target/linux/rb532/patches-2.6.28/022-rb532_uart_autodetect.patch
View File

@ -8,8 +8,6 @@ Signed-off-by: Phil Sutter <n0-1@freewrt.org>
arch/mips/rb532/serial.c | 2 +-
2 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index c1c2918..9b6b744 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -24,6 +24,7 @@
@ -29,7 +27,7 @@ index c1c2918..9b6b744 100644
static struct resource korina_dev0_res[] = {
{
.name = "korina_regs",
@@ -214,12 +217,32 @@ static struct platform_device rb532_wdt = {
@@ -214,12 +217,32 @@ static struct platform_device rb532_wdt
.num_resources = ARRAY_SIZE(rb532_wdt_res),
};
@ -62,7 +60,7 @@ index c1c2918..9b6b744 100644
&rb532_wdt
};
@@ -294,6 +317,9 @@ static int __init plat_setup_devices(void)
@@ -294,6 +317,9 @@ static int __init plat_setup_devices(voi
/* Initialise the NAND device */
rb532_nand_setup();
@ -72,8 +70,6 @@ index c1c2918..9b6b744 100644
return platform_add_devices(rb532_devs, ARRAY_SIZE(rb532_devs));
}
diff --git a/arch/mips/rb532/serial.c b/arch/mips/rb532/serial.c
index 3e0d7ec..00ed19f 100644
--- a/arch/mips/rb532/serial.c
+++ b/arch/mips/rb532/serial.c
@@ -36,7 +36,7 @@
@ -85,7 +81,3 @@ index 3e0d7ec..00ed19f 100644
.line = 0,
.irq = UART0_IRQ,
.iotype = UPIO_MEM,
--
1.5.6.4

10
target/linux/rb532/patches-2.6.28/023-rb532_fix_init_of_rb532_dev3_ctl_res.patch
View File

@ -3,11 +3,9 @@ initialisation has to be the same as cf_slot0_res and nand_slot0_res.
Signed-off-by: Phil Sutter <n0-1@freewrt.org>
---
diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c
index d75eb19..40deb11 100644
--- a/arch/mips/rb532/gpio.c
+++ b/arch/mips/rb532/gpio.c
@@ -55,8 +55,6 @@ static struct resource rb532_gpio_reg0_res[] = {
@@ -55,8 +55,6 @@ static struct resource rb532_gpio_reg0_r
static struct resource rb532_dev3_ctl_res[] = {
{
.name = "dev3_ctl",
@ -16,7 +14,7 @@ index d75eb19..40deb11 100644
.flags = IORESOURCE_MEM,
}
};
@@ -243,6 +241,9 @@ int __init rb532_gpio_init(void)
@@ -251,6 +249,9 @@ int __init rb532_gpio_init(void)
/* Register our GPIO chip */
gpiochip_add(&rb532_gpio_chip->chip);
@ -26,7 +24,3 @@ index d75eb19..40deb11 100644
r = rb532_dev3_ctl_res;
dev3.base = ioremap_nocache(r->start, r->end - r->start);
--
1.5.6.4

8
target/linux/rb532/patches-2.6.28/024-rb532_fix_set_latch_u5.patch
View File

@ -4,11 +4,9 @@ is wrong.
Signed-off-by: Phil Sutter <n0-1@freewrt.org>
---
diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c
index 40deb11..7e0cb4f 100644
--- a/arch/mips/rb532/gpio.c
+++ b/arch/mips/rb532/gpio.c
@@ -93,7 +93,7 @@ void set_latch_u5(unsigned char or_mask, unsigned char nand_mask)
@@ -93,7 +93,7 @@ void set_latch_u5(unsigned char or_mask,
spin_lock_irqsave(&dev3.lock, flags);
dev3.state = (dev3.state | or_mask) & ~nand_mask;
@ -17,7 +15,3 @@ index 40deb11..7e0cb4f 100644
spin_unlock_irqrestore(&dev3.lock, flags);
}
--
1.5.6.4

10
target/linux/rb532/patches-2.6.28/025-rb532_nand_fixup.patch
View File

@ -1,6 +1,6 @@
--- a/arch/mips/rb532/devices.c 2009-01-25 13:36:15.000000000 +0100
+++ b/arch/mips/rb532/devices.c 2009-01-25 14:00:56.000000000 +0100
@@ -119,6 +119,19 @@
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -119,6 +119,19 @@ static struct platform_device cf_slot0 =
};
/* Resources and device for NAND */
@ -20,7 +20,7 @@
static int rb532_dev_ready(struct mtd_info *mtd)
{
return gpio_get_value(GPIO_RDY);
@@ -277,6 +290,16 @@
@@ -277,6 +290,16 @@ static void __init parse_mac_addr(char *
/* NAND definitions */
#define NAND_CHIP_DELAY 25
@ -37,7 +37,7 @@
static void __init rb532_nand_setup(void)
{
switch (mips_machtype) {
@@ -296,6 +319,8 @@
@@ -296,6 +319,8 @@ static void __init rb532_nand_setup(void
rb532_nand_data.chip.partitions = rb532_partition_info;
rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
rb532_nand_data.chip.options = NAND_NO_AUTOINCR;

4
target/linux/rdc/patches-2.6.28/001-rdc3210_flash_map.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -110,6 +110,50 @@
@@ -112,6 +112,50 @@ config MTD_SUN_UFLASH
Sun Microsystems boardsets. This driver will require CFI support
in the kernel, so if you did not enable CFI previously, do that now.
@ -53,7 +53,7 @@
depends on X86 && MTD_CFI && MTD_CONCAT
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -29,6 +29,7 @@
@@ -27,6 +27,7 @@ obj-$(CONFIG_MTD_PHYSMAP_OF) += physmap_
obj-$(CONFIG_MTD_PMC_MSP_EVM) += pmcmsp-flash.o
obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcmsp-ramroot.o
obj-$(CONFIG_MTD_PCMCIA) += pcmciamtd.o

2
target/linux/rdc/patches-2.6.28/003-rootfstype.patch
View File

@ -1,6 +1,6 @@
--- a/init/do_mounts.c
+++ b/init/do_mounts.c
@@ -163,6 +163,8 @@
@@ -189,6 +189,8 @@ static void __init get_fs_names(char *pa
{
char *s = page;

6
target/linux/rdc/patches-2.6.28/004-yenta_mystery.patch
View File

@ -1,6 +1,6 @@
--- linux-2.6.24.7.orig/drivers/pcmcia/yenta_socket.c 2008-10-26 08:30:07.000000000 -0700
+++ linux-2.6.24.7/drivers/pcmcia/yenta_socket.c 2008-10-26 08:54:27.000000000 -0700
@@ -1171,6 +1171,17 @@
--- a/drivers/pcmcia/yenta_socket.c
+++ b/drivers/pcmcia/yenta_socket.c
@@ -1174,6 +1174,17 @@ static int __devinit yenta_probe (struct
/* We must finish initialization here */

16
target/linux/rdc/patches-2.6.28/005-fix_amit_breakage.patch
View File

@ -1,7 +1,6 @@
diff -ru linux-2.6.24.7.orig/arch/x86/boot/boot.h linux-2.6.24.7/arch/x86/boot/boot.h
--- linux-2.6.24.7.orig/arch/x86/boot/boot.h 2008-10-26 20:18:14.000000000 -0700
+++ linux-2.6.24.7/arch/x86/boot/boot.h 2008-10-26 20:18:36.000000000 -0700
@@ -60,7 +60,7 @@
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -62,7 +62,7 @@ static inline void outl(u32 v, u16 port)
{
asm volatile("outl %0,%1" : : "a" (v), "dN" (port));
}
@ -10,10 +9,9 @@ diff -ru linux-2.6.24.7.orig/arch/x86/boot/boot.h linux-2.6.24.7/arch/x86/boot/b
{
u32 v;
asm volatile("inl %1,%0" : "=a" (v) : "dN" (port));
diff -ru linux-2.6.24.7.orig/arch/x86/boot/pm.c linux-2.6.24.7/arch/x86/boot/pm.c
--- linux-2.6.24.7.orig/arch/x86/boot/pm.c 2008-10-26 19:55:50.000000000 -0700
+++ linux-2.6.24.7/arch/x86/boot/pm.c 2008-10-26 21:38:12.000000000 -0700
@@ -16,6 +16,9 @@
--- a/arch/x86/boot/pm.c
+++ b/arch/x86/boot/pm.c
@@ -14,6 +14,9 @@
#include "boot.h"
#include <asm/segment.h>
@ -23,7 +21,7 @@ diff -ru linux-2.6.24.7.orig/arch/x86/boot/pm.c linux-2.6.24.7/arch/x86/boot/pm.
/*
* Invoke the realmode switch hook if present; otherwise
@@ -160,6 +163,16 @@
@@ -156,6 +159,16 @@ void go_to_protected_mode(void)
die();
}

202
target/linux/rdc/patches-2.6.28/006-bzip2_lzma_x86.patch
View File

@ -1,7 +1,6 @@
diff -urN linux-2.6.28.9/arch/arm/boot/compressed/Makefile linux-2.6.28.9.new/arch/arm/boot/compressed/Makefile
--- linux-2.6.28.9/arch/arm/boot/compressed/Makefile 2009-03-23 22:55:52.000000000 +0100
+++ linux-2.6.28.9.new/arch/arm/boot/compressed/Makefile 2009-04-24 14:08:08.000000000 +0200
@@ -67,8 +67,15 @@
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -67,8 +67,15 @@ endif
SEDFLAGS = s/TEXT_START/$(ZTEXTADDR)/;s/BSS_START/$(ZBSSADDR)/
@ -19,7 +18,7 @@ diff -urN linux-2.6.28.9/arch/arm/boot/compressed/Makefile linux-2.6.28.9.new/ar
ifeq ($(CONFIG_FUNCTION_TRACER),y)
ORIG_CFLAGS := $(KBUILD_CFLAGS)
@@ -95,7 +102,7 @@
@@ -95,7 +102,7 @@ LDFLAGS_vmlinux += -p --no-undefined -X
# would otherwise mess up our GOT table
CFLAGS_misc.o := -Dstatic=
@ -28,7 +27,7 @@ diff -urN linux-2.6.28.9/arch/arm/boot/compressed/Makefile linux-2.6.28.9.new/ar
$(addprefix $(obj)/, $(OBJS)) FORCE
$(call if_changed,ld)
@:
@@ -103,7 +110,17 @@
@@ -103,7 +110,17 @@ $(obj)/vmlinux: $(obj)/vmlinux.lds $(obj
$(obj)/piggy.gz: $(obj)/../Image FORCE
$(call if_changed,gzip)
@ -47,10 +46,9 @@ diff -urN linux-2.6.28.9/arch/arm/boot/compressed/Makefile linux-2.6.28.9.new/ar
CFLAGS_font.o := -Dstatic=
diff -urN linux-2.6.28.9/arch/arm/boot/compressed/misc.c linux-2.6.28.9.new/arch/arm/boot/compressed/misc.c
--- linux-2.6.28.9/arch/arm/boot/compressed/misc.c 2009-03-23 22:55:52.000000000 +0100
+++ linux-2.6.28.9.new/arch/arm/boot/compressed/misc.c 2009-04-24 14:08:08.000000000 +0200
@@ -169,116 +169,34 @@
--- a/arch/arm/boot/compressed/misc.c
+++ b/arch/arm/boot/compressed/misc.c
@@ -169,116 +169,34 @@ static inline __ptr_t memcpy(__ptr_t __d
/*
* gzip delarations
*/
@ -176,7 +174,7 @@ diff -urN linux-2.6.28.9/arch/arm/boot/compressed/misc.c linux-2.6.28.9.new/arch
#ifndef arch_error
#define arch_error(x)
@@ -301,16 +219,24 @@
@@ -301,16 +219,24 @@ ulg
decompress_kernel(ulg output_start, ulg free_mem_ptr_p, ulg free_mem_ptr_end_p,
int arch_id)
{
@ -207,7 +205,7 @@ diff -urN linux-2.6.28.9/arch/arm/boot/compressed/misc.c linux-2.6.28.9.new/arch
putstr(" done, booting the kernel.\n");
return output_ptr;
}
@@ -320,11 +246,8 @@
@@ -320,11 +246,8 @@ char output_buffer[1500*1024];
int main()
{
@ -220,9 +218,8 @@ diff -urN linux-2.6.28.9/arch/arm/boot/compressed/misc.c linux-2.6.28.9.new/arch
putstr("done.\n");
return 0;
}
diff -urN linux-2.6.28.9/arch/x86/boot/compressed/Makefile linux-2.6.28.9.new/arch/x86/boot/compressed/Makefile
--- linux-2.6.28.9/arch/x86/boot/compressed/Makefile 2009-03-23 22:55:52.000000000 +0100
+++ linux-2.6.28.9.new/arch/x86/boot/compressed/Makefile 2009-04-24 14:10:01.000000000 +0200
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -4,7 +4,7 @@
# create a compressed vmlinux image from the original vmlinux
#
@ -232,7 +229,7 @@ diff -urN linux-2.6.28.9/arch/x86/boot/compressed/Makefile linux-2.6.28.9.new/ar
KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2
KBUILD_CFLAGS += -fno-strict-aliasing -fPIC
@@ -47,9 +47,17 @@
@@ -47,9 +47,17 @@ ifeq ($(CONFIG_X86_32),y)
ifdef CONFIG_RELOCATABLE
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin.all FORCE
$(call if_changed,gzip)
@ -250,7 +247,7 @@ diff -urN linux-2.6.28.9/arch/x86/boot/compressed/Makefile linux-2.6.28.9.new/ar
endif
LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T
@@ -60,5 +68,9 @@
@@ -60,5 +68,9 @@ $(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bi
LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T
endif
@ -261,9 +258,8 @@ diff -urN linux-2.6.28.9/arch/x86/boot/compressed/Makefile linux-2.6.28.9.new/ar
+
+$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.$(suffix_y) FORCE
$(call if_changed,ld)
diff -urN linux-2.6.28.9/arch/x86/boot/compressed/misc.c linux-2.6.28.9.new/arch/x86/boot/compressed/misc.c
--- linux-2.6.28.9/arch/x86/boot/compressed/misc.c 2009-03-23 22:55:52.000000000 +0100
+++ linux-2.6.28.9.new/arch/x86/boot/compressed/misc.c 2009-04-24 14:08:08.000000000 +0200
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -116,71 +116,13 @@
/*
* gzip declarations
@ -336,7 +332,7 @@ diff -urN linux-2.6.28.9/arch/x86/boot/compressed/misc.c linux-2.6.28.9.new/arch
static void error(char *m);
/*
@@ -189,11 +131,6 @@
@@ -189,11 +131,6 @@ static void error(char *m);
static struct boot_params *real_mode; /* Pointer to real-mode data */
static int quiet;
@ -348,7 +344,7 @@ diff -urN linux-2.6.28.9/arch/x86/boot/compressed/misc.c linux-2.6.28.9.new/arch
static void *memset(void *s, int c, unsigned n);
static void *memcpy(void *dest, const void *src, unsigned n);
@@ -213,7 +150,19 @@
@@ -213,7 +150,19 @@ static char *vidmem;
static int vidport;
static int lines, cols;
@ -368,7 +364,7 @@ diff -urN linux-2.6.28.9/arch/x86/boot/compressed/misc.c linux-2.6.28.9.new/arch
static void scroll(void)
{
@@ -293,38 +242,6 @@
@@ -293,38 +242,6 @@ static void *memcpy(void *dest, const vo
return dest;
}
@ -407,7 +403,7 @@ diff -urN linux-2.6.28.9/arch/x86/boot/compressed/misc.c linux-2.6.28.9.new/arch
static void error(char *x)
{
@@ -407,12 +324,8 @@
@@ -407,12 +324,8 @@ asmlinkage void decompress_kernel(void *
lines = real_mode->screen_info.orig_video_lines;
cols = real_mode->screen_info.orig_video_cols;
@ -420,7 +416,7 @@ diff -urN linux-2.6.28.9/arch/x86/boot/compressed/misc.c linux-2.6.28.9.new/arch
#ifdef CONFIG_X86_64
if ((unsigned long)output & (__KERNEL_ALIGN - 1))
@@ -430,10 +343,9 @@
@@ -430,10 +343,9 @@ asmlinkage void decompress_kernel(void *
#endif
#endif
@ -432,9 +428,8 @@ diff -urN linux-2.6.28.9/arch/x86/boot/compressed/misc.c linux-2.6.28.9.new/arch
parse_elf(output);
if (!quiet)
putstr("done.\nBooting the kernel.\n");
diff -urN linux-2.6.28.9/arch/x86/include/asm/boot.h linux-2.6.28.9.new/arch/x86/include/asm/boot.h
--- linux-2.6.28.9/arch/x86/include/asm/boot.h 2009-03-23 22:55:52.000000000 +0100
+++ linux-2.6.28.9.new/arch/x86/include/asm/boot.h 2009-04-24 14:08:08.000000000 +0200
--- a/arch/x86/include/asm/boot.h
+++ b/arch/x86/include/asm/boot.h
@@ -15,11 +15,21 @@
+ (CONFIG_PHYSICAL_ALIGN - 1)) \
& ~(CONFIG_PHYSICAL_ALIGN - 1))
@ -458,10 +453,9 @@ diff -urN linux-2.6.28.9/arch/x86/include/asm/boot.h linux-2.6.28.9.new/arch/x86
#define BOOT_STACK_SIZE 0x1000
#endif
diff -urN linux-2.6.28.9/drivers/block/Kconfig linux-2.6.28.9.new/drivers/block/Kconfig
--- linux-2.6.28.9/drivers/block/Kconfig 2009-03-23 22:55:52.000000000 +0100
+++ linux-2.6.28.9.new/drivers/block/Kconfig 2009-04-24 14:08:08.000000000 +0200
@@ -358,6 +358,30 @@
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -358,6 +358,30 @@ config BLK_DEV_XIP
will prevent RAM block device backing store memory from being
allocated from highmem (only a problem for highmem systems).
@ -492,9 +486,8 @@ diff -urN linux-2.6.28.9/drivers/block/Kconfig linux-2.6.28.9.new/drivers/block/
config CDROM_PKTCDVD
tristate "Packet writing on CD/DVD media"
depends on !UML
diff -urN linux-2.6.28.9/include/linux/decompress/bunzip2.h linux-2.6.28.9.new/include/linux/decompress/bunzip2.h
--- linux-2.6.28.9/include/linux/decompress/bunzip2.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.28.9.new/include/linux/decompress/bunzip2.h 2009-04-24 14:08:08.000000000 +0200
--- /dev/null
+++ b/include/linux/decompress/bunzip2.h
@@ -0,0 +1,10 @@
+#ifndef DECOMPRESS_BUNZIP2_H
+#define DECOMPRESS_BUNZIP2_H
@ -506,9 +499,8 @@ diff -urN linux-2.6.28.9/include/linux/decompress/bunzip2.h linux-2.6.28.9.new/i
+ int *pos,
+ void(*error)(char *x));
+#endif
diff -urN linux-2.6.28.9/include/linux/decompress/generic.h linux-2.6.28.9.new/include/linux/decompress/generic.h
--- linux-2.6.28.9/include/linux/decompress/generic.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.28.9.new/include/linux/decompress/generic.h 2009-04-24 14:08:08.000000000 +0200
--- /dev/null
+++ b/include/linux/decompress/generic.h
@@ -0,0 +1,30 @@
+#ifndef DECOMPRESS_GENERIC_H
+#define DECOMPRESS_GENERIC_H
@ -540,9 +532,8 @@ diff -urN linux-2.6.28.9/include/linux/decompress/generic.h linux-2.6.28.9.new/i
+
+
+#endif
diff -urN linux-2.6.28.9/include/linux/decompress/inflate.h linux-2.6.28.9.new/include/linux/decompress/inflate.h
--- linux-2.6.28.9/include/linux/decompress/inflate.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.28.9.new/include/linux/decompress/inflate.h 2009-04-24 14:08:08.000000000 +0200
--- /dev/null
+++ b/include/linux/decompress/inflate.h
@@ -0,0 +1,13 @@
+#ifndef INFLATE_H
+#define INFLATE_H
@ -557,9 +548,8 @@ diff -urN linux-2.6.28.9/include/linux/decompress/inflate.h linux-2.6.28.9.new/i
+ int *pos,
+ void(*error_fn)(char *x));
+#endif
diff -urN linux-2.6.28.9/include/linux/decompress/mm.h linux-2.6.28.9.new/include/linux/decompress/mm.h
--- linux-2.6.28.9/include/linux/decompress/mm.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.28.9.new/include/linux/decompress/mm.h 2009-04-24 14:08:08.000000000 +0200
--- /dev/null
+++ b/include/linux/decompress/mm.h
@@ -0,0 +1,89 @@
+/*
+ * linux/compr_mm.h
@ -650,9 +640,8 @@ diff -urN linux-2.6.28.9/include/linux/decompress/mm.h linux-2.6.28.9.new/includ
+#endif /* STATIC */
+
+#endif /* DECOMPR_MM_H */
diff -urN linux-2.6.28.9/include/linux/decompress/unlzma.h linux-2.6.28.9.new/include/linux/decompress/unlzma.h
--- linux-2.6.28.9/include/linux/decompress/unlzma.h 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.28.9.new/include/linux/decompress/unlzma.h 2009-04-24 14:08:08.000000000 +0200
--- /dev/null
+++ b/include/linux/decompress/unlzma.h
@@ -0,0 +1,12 @@
+#ifndef DECOMPRESS_UNLZMA_H
+#define DECOMPRESS_UNLZMA_H
@ -666,10 +655,9 @@ diff -urN linux-2.6.28.9/include/linux/decompress/unlzma.h linux-2.6.28.9.new/in
+ );
+
+#endif
diff -urN linux-2.6.28.9/init/Kconfig linux-2.6.28.9.new/init/Kconfig
--- linux-2.6.28.9/init/Kconfig 2009-03-23 22:55:52.000000000 +0100
+++ linux-2.6.28.9.new/init/Kconfig 2009-04-24 14:08:08.000000000 +0200
@@ -101,6 +101,56 @@
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -101,6 +101,56 @@ config LOCALVERSION_AUTO
which is done within the script "scripts/setlocalversion".)
@ -726,9 +714,8 @@ diff -urN linux-2.6.28.9/init/Kconfig linux-2.6.28.9.new/init/Kconfig
config SWAP
bool "Support for paging of anonymous memory (swap)"
depends on MMU && BLOCK
diff -urN linux-2.6.28.9/init/do_mounts_rd.c linux-2.6.28.9.new/init/do_mounts_rd.c
--- linux-2.6.28.9/init/do_mounts_rd.c 2009-04-24 13:59:44.000000000 +0200
+++ linux-2.6.28.9.new/init/do_mounts_rd.c 2009-04-24 14:08:08.000000000 +0200
--- a/init/do_mounts_rd.c
+++ b/init/do_mounts_rd.c
@@ -11,6 +11,12 @@
#include "do_mounts.h"
@ -742,7 +729,7 @@ diff -urN linux-2.6.28.9/init/do_mounts_rd.c linux-2.6.28.9.new/init/do_mounts_r
int __initdata rd_prompt = 1;/* 1 = prompt for RAM disk, 0 = don't prompt */
static int __init prompt_ramdisk(char *str)
@@ -29,7 +35,7 @@
@@ -29,7 +35,7 @@ static int __init ramdisk_start_setup(ch
}
__setup("ramdisk_start=", ramdisk_start_setup);
@ -751,7 +738,7 @@ diff -urN linux-2.6.28.9/init/do_mounts_rd.c linux-2.6.28.9.new/init/do_mounts_r
/*
* This routine tries to find a RAM disk image to load, and returns the
@@ -46,7 +52,7 @@
@@ -46,7 +52,7 @@ static int __init crd_load(int in_fd, in
* gzip
*/
static int __init
@ -760,7 +747,7 @@ diff -urN linux-2.6.28.9/init/do_mounts_rd.c linux-2.6.28.9.new/init/do_mounts_r
{
const int size = 512;
struct minix_super_block *minixsb;
@@ -74,6 +80,7 @@
@@ -74,6 +80,7 @@ identify_ramdisk_image(int fd, int start
sys_lseek(fd, start_block * BLOCK_SIZE, 0);
sys_read(fd, buf, size);
@ -768,7 +755,7 @@ diff -urN linux-2.6.28.9/init/do_mounts_rd.c linux-2.6.28.9.new/init/do_mounts_r
/*
* If it matches the gzip magic numbers, return 0
*/
@@ -81,9 +88,39 @@
@@ -81,9 +88,39 @@ identify_ramdisk_image(int fd, int start
printk(KERN_NOTICE
"RAMDISK: Compressed image found at block %d\n",
start_block);
@ -808,7 +795,7 @@ diff -urN linux-2.6.28.9/init/do_mounts_rd.c linux-2.6.28.9.new/init/do_mounts_r
/* romfs is at block zero too */
if (romfsb->word0 == ROMSB_WORD0 &&
@@ -156,6 +193,7 @@
@@ -156,6 +193,7 @@ int __init rd_load_image(char *from)
int nblocks, i, disk;
char *buf = NULL;
unsigned short rotate = 0;
@ -816,7 +803,7 @@ diff -urN linux-2.6.28.9/init/do_mounts_rd.c linux-2.6.28.9.new/init/do_mounts_r
#if !defined(CONFIG_S390) && !defined(CONFIG_PPC_ISERIES)
char rotator[4] = { '|' , '/' , '-' , '\\' };
#endif
@@ -168,12 +206,12 @@
@@ -168,12 +206,12 @@ int __init rd_load_image(char *from)
if (in_fd < 0)
goto noclose_input;
@ -831,7 +818,7 @@ diff -urN linux-2.6.28.9/init/do_mounts_rd.c linux-2.6.28.9.new/init/do_mounts_r
goto successful_load;
goto done;
}
@@ -272,138 +310,48 @@
@@ -272,138 +310,48 @@ int __init rd_load_disk(int n)
return rd_load_image("/dev/root");
}
@ -993,10 +980,9 @@ diff -urN linux-2.6.28.9/init/do_mounts_rd.c linux-2.6.28.9.new/init/do_mounts_r
- kfree(window);
return result;
}
diff -urN linux-2.6.28.9/init/initramfs.c linux-2.6.28.9.new/init/initramfs.c
--- linux-2.6.28.9/init/initramfs.c 2009-03-23 22:55:52.000000000 +0100
+++ linux-2.6.28.9.new/init/initramfs.c 2009-04-24 14:13:53.000000000 +0200
@@ -389,11 +389,14 @@
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -389,11 +389,14 @@ static int __init write_buffer(char *buf
return len - count;
}
@ -1013,7 +999,7 @@ diff -urN linux-2.6.28.9/init/initramfs.c linux-2.6.28.9.new/init/initramfs.c
while ((written = write_buffer(buf, len)) < len && !message) {
char c = buf[written];
if (c == '0') {
@@ -407,73 +410,14 @@
@@ -407,73 +410,14 @@ static void __init flush_buffer(char *bu
} else
error("junk in compressed archive");
}
@ -1092,7 +1078,7 @@ diff -urN linux-2.6.28.9/init/initramfs.c linux-2.6.28.9.new/init/initramfs.c
static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
{
@@ -482,9 +426,10 @@
@@ -482,9 +426,10 @@ static char * __init unpack_to_rootfs(ch
header_buf = kmalloc(110, GFP_KERNEL);
symlink_buf = kmalloc(PATH_MAX + N_ALIGN(PATH_MAX) + 1, GFP_KERNEL);
name_buf = kmalloc(N_ALIGN(PATH_MAX), GFP_KERNEL);
@ -1105,7 +1091,7 @@ diff -urN linux-2.6.28.9/init/initramfs.c linux-2.6.28.9.new/init/initramfs.c
state = Start;
this_header = 0;
message = NULL;
@@ -504,22 +449,38 @@
@@ -504,22 +449,38 @@ static char * __init unpack_to_rootfs(ch
continue;
}
this_header = 0;
@ -1157,10 +1143,9 @@ diff -urN linux-2.6.28.9/init/initramfs.c linux-2.6.28.9.new/init/initramfs.c
kfree(name_buf);
kfree(symlink_buf);
kfree(header_buf);
diff -urN linux-2.6.28.9/lib/Makefile linux-2.6.28.9.new/lib/Makefile
--- linux-2.6.28.9/lib/Makefile 2009-04-24 13:59:44.000000000 +0200
+++ linux-2.6.28.9.new/lib/Makefile 2009-04-24 14:08:08.000000000 +0200
@@ -11,7 +11,8 @@
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -11,7 +11,8 @@ lib-y := ctype.o string.o vsprintf.o cmd
rbtree.o radix-tree.o dump_stack.o \
idr.o int_sqrt.o extable.o prio_tree.o \
sha1.o irq_regs.o reciprocal_div.o argv_split.o \
@ -1170,9 +1155,8 @@ diff -urN linux-2.6.28.9/lib/Makefile linux-2.6.28.9.new/lib/Makefile
lib-$(CONFIG_MMU) += ioremap.o
lib-$(CONFIG_SMP) += cpumask.o
diff -urN linux-2.6.28.9/lib/decompress_bunzip2.c linux-2.6.28.9.new/lib/decompress_bunzip2.c
--- linux-2.6.28.9/lib/decompress_bunzip2.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.28.9.new/lib/decompress_bunzip2.c 2009-04-24 14:08:08.000000000 +0200
--- /dev/null
+++ b/lib/decompress_bunzip2.c
@@ -0,0 +1,735 @@
+/* vi: set sw = 4 ts = 4: */
+/* Small bzip2 deflate implementation, by Rob Landley (rob@landley.net).
@ -1909,9 +1893,8 @@ diff -urN linux-2.6.28.9/lib/decompress_bunzip2.c linux-2.6.28.9.new/lib/decompr
+}
+
+#define decompress bunzip2
diff -urN linux-2.6.28.9/lib/decompress_unlzma.c linux-2.6.28.9.new/lib/decompress_unlzma.c
--- linux-2.6.28.9/lib/decompress_unlzma.c 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.28.9.new/lib/decompress_unlzma.c 2009-04-24 14:08:08.000000000 +0200
--- /dev/null
+++ b/lib/decompress_unlzma.c
@@ -0,0 +1,647 @@
+/* Lzma decompressor for Linux kernel. Shamelessly snarfed
+ *from busybox 1.1.1
@ -2560,10 +2543,9 @@ diff -urN linux-2.6.28.9/lib/decompress_unlzma.c linux-2.6.28.9.new/lib/decompre
+}
+
+#define decompress unlzma
diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
--- linux-2.6.28.9/lib/inflate.c 2009-03-23 22:55:52.000000000 +0100
+++ linux-2.6.28.9.new/lib/inflate.c 2009-04-24 14:08:08.000000000 +0200
@@ -109,20 +109,78 @@
--- a/lib/inflate.c
+++ b/lib/inflate.c
@@ -109,20 +109,78 @@ static char rcsid[] = "#Id: inflate.c,v
#endif
#ifndef STATIC
@ -2651,7 +2633,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
#define slide window
/* Huffman code lookup table entry--this entry is four bytes for machines
@@ -133,10 +191,10 @@
@@ -133,10 +191,10 @@ static char rcsid[] = "#Id: inflate.c,v
an unused code. If a code with e == 99 is looked up, this implies an
error in the data. */
struct huft {
@ -2665,7 +2647,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
struct huft *t; /* pointer to next level of table */
} v;
};
@@ -144,7 +202,7 @@
@@ -144,7 +202,7 @@ struct huft {
/* Function prototypes */
STATIC int INIT huft_build OF((unsigned *, unsigned, unsigned,
@ -2674,7 +2656,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
STATIC int INIT huft_free OF((struct huft *));
STATIC int INIT inflate_codes OF((struct huft *, struct huft *, int, int));
STATIC int INIT inflate_stored OF((void));
@@ -159,28 +217,28 @@
@@ -159,28 +217,28 @@ STATIC int INIT inflate OF((void));
circular buffer. The index is updated simply by incrementing and then
ANDing with 0x7fff (32K-1). */
/* It is left to other modules to supply the 32 K area. It is assumed
@ -2710,7 +2692,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
12, 12, 13, 13};
@@ -217,59 +275,21 @@
@@ -217,59 +275,21 @@ static const ush cpdext[] = { /*
the stream.
*/
@ -2776,7 +2758,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
/*
Huffman code decoding is performed using a multi-level table lookup.
The fastest way to decode is to simply build a lookup table whose
@@ -307,7 +327,7 @@
@@ -307,7 +327,7 @@ STATIC const int lbits = 9; /*
STATIC const int dbits = 6; /* bits in base distance lookup table */
@ -2785,7 +2767,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
#define BMAX 16 /* maximum bit length of any code (16 for explode) */
#define N_MAX 288 /* maximum number of codes in any set */
@@ -319,8 +339,8 @@
@@ -319,8 +339,8 @@ STATIC int INIT huft_build(
unsigned *b, /* code lengths in bits (all assumed <= BMAX) */
unsigned n, /* number of codes (assumed <= N_MAX) */
unsigned s, /* number of simple-valued codes (0..s-1) */
@ -2796,7 +2778,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
struct huft **t, /* result: starting table */
int *m /* maximum lookup bits, returns actual */
)
@@ -500,8 +520,8 @@
@@ -500,8 +520,8 @@ DEBG1("5 ");
if (h)
{
x[h] = i; /* save pattern for backing up */
@ -2807,7 +2789,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
r.v.t = q; /* pointer to this table */
j = i >> (w - l); /* (get around Turbo C bug) */
u[h-1][j] = r; /* connect to last table */
@@ -511,18 +531,18 @@
@@ -511,18 +531,18 @@ DEBG1("6 ");
DEBG("h6c ");
/* set up table entry in r */
@ -2830,7 +2812,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
r.v.n = d[*p++ - s];
}
DEBG("h6d ");
@@ -592,11 +612,12 @@
@@ -592,11 +612,12 @@ STATIC int INIT inflate_codes(
Return an error code or zero if it all goes ok. */
{
register unsigned e; /* table entry flag/number of extra bits */
@ -2845,7 +2827,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
register unsigned k; /* number of bits in bit buffer */
@@ -622,7 +643,7 @@
@@ -622,7 +643,7 @@ STATIC int INIT inflate_codes(
DUMPBITS(t->b)
if (e == 16) /* then it's a literal */
{
@ -2854,7 +2836,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
Tracevv((stderr, "%c", slide[w-1]));
if (w == WSIZE)
{
@@ -659,11 +680,25 @@
@@ -659,11 +680,25 @@ STATIC int INIT inflate_codes(
/* do the copy */
do {
@ -2882,7 +2864,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
w += e;
d += e;
}
@@ -673,9 +708,8 @@
@@ -673,9 +708,8 @@ STATIC int INIT inflate_codes(
slide[w++] = slide[d++];
Tracevv((stderr, "%c", slide[w-1]));
} while (--e);
@ -2894,7 +2876,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
w = 0;
}
} while (n);
@@ -702,7 +736,7 @@
@@ -702,7 +736,7 @@ STATIC int INIT inflate_stored(void)
{
unsigned n; /* number of bytes in block */
unsigned w; /* current window position */
@ -2903,7 +2885,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
register unsigned k; /* number of bits in bit buffer */
DEBG("<stor");
@@ -732,7 +766,7 @@
@@ -732,7 +766,7 @@ DEBG("<stor");
while (n--)
{
NEEDBITS(8)
@ -2912,7 +2894,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
if (w == WSIZE)
{
flush_output(w);
@@ -838,7 +872,7 @@
@@ -838,7 +872,7 @@ STATIC int noinline INIT inflate_dynamic
unsigned nl; /* number of literal/length codes */
unsigned nd; /* number of distance codes */
unsigned *ll; /* literal/length and distance code lengths */
@ -2921,7 +2903,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
register unsigned k; /* number of bits in bit buffer */
int ret;
@@ -1033,7 +1067,7 @@
@@ -1033,7 +1067,7 @@ STATIC int INIT inflate_block(
/* decompress an inflated block */
{
unsigned t; /* block type */
@ -2930,7 +2912,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
register unsigned k; /* number of bits in bit buffer */
DEBG("<blk");
@@ -1130,8 +1164,8 @@
@@ -1130,8 +1164,8 @@ STATIC int INIT inflate(void)
*
**********************************************************************/
@ -2941,7 +2923,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
#define CRC_VALUE (crc ^ 0xffffffffUL)
/*
@@ -1172,7 +1206,7 @@
@@ -1172,7 +1206,7 @@ makecrc(void)
}
/* this is initialized here so this code could reside in ROM */
@ -2950,7 +2932,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
}
/* gzip flag byte */
@@ -1184,18 +1218,89 @@
@@ -1184,18 +1218,89 @@ makecrc(void)
#define ENCRYPTED 0x20 /* bit 5 set: file is encrypted */
#define RESERVED 0xC0 /* bit 6,7: reserved */
@ -3044,7 +3026,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
magic[0] = NEXTBYTE();
magic[1] = NEXTBYTE();
method = NEXTBYTE();
@@ -1212,7 +1317,7 @@
@@ -1212,7 +1317,7 @@ static int INIT gunzip(void)
return -1;
}
@ -3053,7 +3035,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
if ((flags & ENCRYPTED) != 0) {
error("Input is encrypted");
return -1;
@@ -1277,15 +1382,15 @@
@@ -1277,15 +1382,15 @@ static int INIT gunzip(void)
/* crc32 (see algorithm.doc)
* uncompressed input size modulo 2^32
*/
@ -3077,7 +3059,7 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
/* Validate decompression */
if (orig_crc != CRC_VALUE) {
@@ -1296,11 +1401,22 @@
@@ -1296,11 +1401,22 @@ static int INIT gunzip(void)
error("length error");
return -1;
}
@ -3101,10 +3083,9 @@ diff -urN linux-2.6.28.9/lib/inflate.c linux-2.6.28.9.new/lib/inflate.c
-
+#define decompress gunzip
diff -urN linux-2.6.28.9/scripts/Makefile.lib linux-2.6.28.9.new/scripts/Makefile.lib
--- linux-2.6.28.9/scripts/Makefile.lib 2009-03-23 22:55:52.000000000 +0100
+++ linux-2.6.28.9.new/scripts/Makefile.lib 2009-04-24 14:08:08.000000000 +0200
@@ -183,3 +183,17 @@
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -183,3 +183,17 @@ quiet_cmd_gzip = GZIP $@
cmd_gzip = gzip -f -9 < $< > $@
@ -3122,9 +3103,8 @@ diff -urN linux-2.6.28.9/scripts/Makefile.lib linux-2.6.28.9.new/scripts/Makefil
+
+quiet_cmd_lzma = LZMA $@
+cmd_lzma = (/usr/bin/lzma -9 -c $< ; $(size_append) $<) >$@ || (rm -f $@ ; false)
diff -urN linux-2.6.28.9/scripts/bin_size linux-2.6.28.9.new/scripts/bin_size
--- linux-2.6.28.9/scripts/bin_size 1970-01-01 01:00:00.000000000 +0100
+++ linux-2.6.28.9.new/scripts/bin_size 2009-04-24 14:08:08.000000000 +0200
--- /dev/null
+++ b/scripts/bin_size
@@ -0,0 +1,10 @@
+#!/bin/sh
+

30
target/linux/rdc/patches-2.6.28/007-r6040_git_updates.patch
View File

@ -1,5 +1,5 @@
--- linux-2.6.28.9/drivers/net/r6040.c 2009-03-23 22:55:52.000000000 +0100
+++ linux-2.6.28.9.new/drivers/net/r6040.c 2009-04-24 14:24:51.000000000 +0200
--- a/drivers/net/r6040.c
+++ b/drivers/net/r6040.c
@@ -49,12 +49,12 @@
#include <asm/processor.h>
@ -16,7 +16,7 @@
#define PHY_MODE 0x3100 /* PHY CHIP Register 0 */
#define PHY_CAP 0x01E1 /* PHY CHIP Register 4 */
@@ -160,6 +160,7 @@
@@ -160,6 +160,7 @@ MODULE_AUTHOR("Sten Wang <sten.wang@rdc.
"Florian Fainelli <florian@openwrt.org>");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("RDC R6040 NAPI PCI FastEthernet driver");
@ -24,7 +24,7 @@
/* RX and TX interrupts that we handle */
#define RX_INTS (RX_FIFO_FULL | RX_NO_DESC | RX_FINISH)
@@ -200,7 +201,7 @@
@@ -200,7 +201,7 @@ struct r6040_private {
static char version[] __devinitdata = KERN_INFO DRV_NAME
": RDC R6040 NAPI net driver,"
@ -33,7 +33,7 @@
static int phy_table[] = { PHY1_ADDR, PHY2_ADDR };
@@ -330,7 +331,7 @@
@@ -330,7 +331,7 @@ static int r6040_alloc_rxbufs(struct net
do {
skb = netdev_alloc_skb(dev, MAX_BUF_SIZE);
if (!skb) {
@ -42,7 +42,7 @@
rc = -ENOMEM;
goto err_exit;
}
@@ -438,7 +439,6 @@
@@ -438,7 +439,6 @@ static void r6040_down(struct net_device
{
struct r6040_private *lp = netdev_priv(dev);
void __iomem *ioaddr = lp->base;
@ -50,7 +50,7 @@
int limit = 2048;
u16 *adrp;
u16 cmd;
@@ -457,22 +457,12 @@
@@ -457,22 +457,12 @@ static void r6040_down(struct net_device
iowrite16(adrp[0], ioaddr + MID_0L);
iowrite16(adrp[1], ioaddr + MID_0M);
iowrite16(adrp[2], ioaddr + MID_0H);
@ -74,7 +74,7 @@
/* deleted timer */
del_timer_sync(&lp->timer);
@@ -481,8 +471,28 @@
@@ -481,8 +471,28 @@ static int r6040_close(struct net_device
napi_disable(&lp->napi);
netif_stop_queue(dev);
r6040_down(dev);
@ -103,7 +103,7 @@
return 0;
}
@@ -598,7 +608,6 @@
@@ -598,7 +608,6 @@ static int r6040_rx(struct net_device *d
/* Send to upper layer */
netif_receive_skb(skb_ptr);
@ -111,7 +111,7 @@
dev->stats.rx_packets++;
dev->stats.rx_bytes += descptr->len - 4;
@@ -668,7 +677,7 @@
@@ -668,7 +677,7 @@ static int r6040_poll(struct napi_struct
work_done = r6040_rx(dev, budget);
if (work_done < budget) {
@ -120,7 +120,7 @@
/* Enable RX interrupt */
iowrite16(ioread16(ioaddr + MIER) | RX_INTS, ioaddr + MIER);
}
@@ -705,7 +714,7 @@
@@ -705,7 +714,7 @@ static irqreturn_t r6040_interrupt(int i
/* Mask off RX interrupt */
misr &= ~RX_INTS;
@ -129,7 +129,7 @@
}
/* TX interrupt request */
@@ -1063,20 +1088,20 @@
@@ -1063,20 +1072,20 @@ static int __devinit r6040_init_one(stru
/* this should always be supported */
err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (err) {
@ -153,7 +153,7 @@
err = -EIO;
goto err_out;
}
@@ -1086,7 +1111,7 @@
@@ -1086,7 +1095,7 @@ static int __devinit r6040_init_one(stru
dev = alloc_etherdev(sizeof(struct r6040_private));
if (!dev) {
@ -162,7 +162,7 @@
err = -ENOMEM;
goto err_out;
}
@@ -1102,11 +1127,15 @@
@@ -1102,11 +1111,15 @@ static int __devinit r6040_init_one(stru
ioaddr = pci_iomap(pdev, bar, io_size);
if (!ioaddr) {
@ -179,7 +179,7 @@
/* Init system & device */
lp->base = ioaddr;
@@ -1123,6 +1152,13 @@
@@ -1123,6 +1136,13 @@ static int __devinit r6040_init_one(stru
adrp[1] = ioread16(ioaddr + MID_0M);
adrp[2] = ioread16(ioaddr + MID_0H);

764
target/linux/s3c24xx/patches-2.6.28/001-merge-openmoko.patch
View File

File diff suppressed because it is too large Load Diff

6
target/linux/s3c24xx/patches-2.6.28/005-dont-suspend-regulator.patch
View File

@ -15,8 +15,6 @@ gets rid of the regulator related backtrace seen upon resume.
Signed-off-by: Balaji Rao <balajirrao@openmoko.org>
---
diff --git a/arch/arm/plat-s3c/pm.c b/arch/arm/plat-s3c/pm.c
index 422dea2..889f191 100644
--- a/arch/arm/plat-s3c/pm.c
+++ b/arch/arm/plat-s3c/pm.c
@@ -18,7 +18,6 @@
@ -50,11 +48,9 @@ index 422dea2..889f191 100644
};
/* s3c_pm_init
diff --git a/drivers/regulator/pcf50633-regulator.c b/drivers/regulator/pcf50633-regulator.c
index 343f43e..d284200 100644
--- a/drivers/regulator/pcf50633-regulator.c
+++ b/drivers/regulator/pcf50633-regulator.c
@@ -249,8 +249,6 @@ struct regulator_ops pcf50633_regulator_ops = {
@@ -249,8 +249,6 @@ struct regulator_ops pcf50633_regulator_
.enable = pcf50633_regulator_enable,
.disable = pcf50633_regulator_disable,
.is_enabled = pcf50633_regulator_is_enabled,

8
target/linux/s3c24xx/patches-2.6.28/010-preserve-resolution.patch
View File

@ -1,8 +1,6 @@
diff --git a/drivers/video/display/jbt6k74.c b/drivers/video/display/jbt6k74.c
index a1d48dd..2ca1bd4 100644
--- a/drivers/video/display/jbt6k74.c
+++ b/drivers/video/display/jbt6k74.c
@@ -443,8 +443,17 @@ int jbt6k74_enter_state(struct jbt_info *jbt, enum jbt_state new_state)
@@ -443,8 +443,17 @@ int jbt6k74_enter_state(struct jbt_info
break;
}
@ -21,7 +19,7 @@ index a1d48dd..2ca1bd4 100644
return rc;
}
@@ -595,7 +604,14 @@ static int fb_notifier_callback(struct notifier_block *self,
@@ -595,7 +604,14 @@ static int fb_notifier_callback(struct n
switch (fb_blank) {
case FB_BLANK_UNBLANK:
dev_info(&jbt->spi_dev->dev, "**** jbt6k74 unblank\n");
@ -37,7 +35,7 @@ index a1d48dd..2ca1bd4 100644
break;
case FB_BLANK_NORMAL:
dev_info(&jbt->spi_dev->dev, "**** jbt6k74 normal\n");
@@ -720,8 +736,6 @@ static int jbt_suspend(struct spi_device *spi, pm_message_t state)
@@ -720,8 +736,6 @@ static int jbt_suspend(struct spi_device
{
struct jbt_info *jbt = dev_get_drvdata(&spi->dev);