projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6f98e7c
)
update to 2.6.26.5 and 2.6.25.17
author
Gabor Juhos
<juhosg@openwrt.org>
Fri, 26 Sep 2008 18:46:53 +0000
(18:46 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Fri, 26 Sep 2008 18:46:53 +0000
(18:46 +0000)
SVN-Revision: 12718
44 files changed:
include/kernel-version.mk
patch
|
blob
|
history
target/linux/adm5120/Makefile
patch
|
blob
|
history
target/linux/adm5120/patches-2.6.26/001-adm5120.patch
patch
|
blob
|
history
target/linux/ar7/Makefile
patch
|
blob
|
history
target/linux/ar7/patches-2.6.26/100-board_support.patch
patch
|
blob
|
history
target/linux/ar7/patches-2.6.26/110-flash.patch
patch
|
blob
|
history
target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch
patch
|
blob
|
history
target/linux/ar7/patches-2.6.26/130-vlynq.patch
patch
|
blob
|
history
target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch
patch
|
blob
|
history
target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
patch
|
blob
|
history
target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch
patch
|
blob
|
history
target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff
patch
|
blob
|
history
target/linux/ar71xx/Makefile
patch
|
blob
|
history
target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
patch
|
blob
|
history
target/linux/at91/Makefile
patch
|
blob
|
history
target/linux/atheros/Makefile
patch
|
blob
|
history
target/linux/au1000/Makefile
patch
|
blob
|
history
target/linux/au1000/patches/017-gpio-dir.patch
patch
|
blob
|
history
target/linux/avr32/Makefile
patch
|
blob
|
history
target/linux/brcm47xx/Makefile
patch
|
blob
|
history
target/linux/brcm63xx/Makefile
patch
|
blob
|
history
target/linux/etrax/Makefile
patch
|
blob
|
history
target/linux/etrax/patches/100-compile_fixes.patch
patch
|
blob
|
history
target/linux/etrax/patches/101-cris-eth-driver.patch
patch
|
blob
|
history
target/linux/etrax/patches/102-missing_arch_include.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.25/965-cdc_acm_unlock.patch
[deleted file]
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.26/906-pim_h_compile_fix.patch
[deleted file]
patch
|
blob
|
history
target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch
patch
|
blob
|
history
target/linux/ifxmips/Makefile
patch
|
blob
|
history
target/linux/ifxmips/patches/100-board.patch
patch
|
blob
|
history
target/linux/ifxmips/patches/110-drivers.patch
patch
|
blob
|
history
target/linux/ifxmips/patches/160-cfi-swap.patch
patch
|
blob
|
history
target/linux/iop32x/Makefile
patch
|
blob
|
history
target/linux/ixp4xx/Makefile
patch
|
blob
|
history
target/linux/magicbox/Makefile
patch
|
blob
|
history
target/linux/orion/Makefile
patch
|
blob
|
history
target/linux/orion/patches/000-orion_git_sync.patch
patch
|
blob
|
history
target/linux/ppc40x/Makefile
patch
|
blob
|
history
target/linux/ppc44x/Makefile
patch
|
blob
|
history
target/linux/ps3/Makefile
patch
|
blob
|
history
target/linux/sibyte/Makefile
patch
|
blob
|
history
target/linux/uml/Makefile
patch
|
blob
|
history
target/linux/x86/Makefile
patch
|
blob
|
history
diff --git
a/include/kernel-version.mk
b/include/kernel-version.mk
index 860269687402928f3a0d2d17cddaf960dd29f300..1260f4366a984c03f84137c74168cda1e2c7409a 100644
(file)
--- a/
include/kernel-version.mk
+++ b/
include/kernel-version.mk
@@
-22,11
+22,11
@@
endif
ifeq ($(LINUX_VERSION),2.6.24.7)
LINUX_KERNEL_MD5SUM:=40a73780d51525d28d36dec852c680c4
endif
ifeq ($(LINUX_VERSION),2.6.24.7)
LINUX_KERNEL_MD5SUM:=40a73780d51525d28d36dec852c680c4
endif
-ifeq ($(LINUX_VERSION),2.6.25.1
6
)
- LINUX_KERNEL_MD5SUM:=
fdb0e08f0e5a2b4fe6dc711ca35f430e
+ifeq ($(LINUX_VERSION),2.6.25.1
7
)
+ LINUX_KERNEL_MD5SUM:=
30618bff93fd4fd048e20a9a6aab8e5d
endif
endif
-ifeq ($(LINUX_VERSION),2.6.26.
3
)
- LINUX_KERNEL_MD5SUM:=9
0fe36b18dbac6e2f79374e2df60ac67
+ifeq ($(LINUX_VERSION),2.6.26.
5
)
+ LINUX_KERNEL_MD5SUM:=9
8261b39a558cf0739703ffea7db9f43
endif
# disable the md5sum check for unknown kernel versions
endif
# disable the md5sum check for unknown kernel versions
diff --git
a/target/linux/adm5120/Makefile
b/target/linux/adm5120/Makefile
index 5709a58cdb812341ec34727bd697546b2e7be39d..4eebc6fba0f4385ccce81f29b69c07b416a83e34 100644
(file)
--- a/
target/linux/adm5120/Makefile
+++ b/
target/linux/adm5120/Makefile
@@
-9,7
+9,7
@@
include $(TOPDIR)/rules.mk
BOARD:=adm5120
BOARDNAME:=Infineon/ADMtek ADM5120
BOARD:=adm5120
BOARDNAME:=Infineon/ADMtek ADM5120
-LINUX_VERSION:=2.6.26.
3
+LINUX_VERSION:=2.6.26.
5
SUBTARGETS:=router_le router_be
INITRAMFS_EXTRA_FILES:=
SUBTARGETS:=router_le router_be
INITRAMFS_EXTRA_FILES:=
diff --git
a/target/linux/adm5120/patches-2.6.26/001-adm5120.patch
b/target/linux/adm5120/patches-2.6.26/001-adm5120.patch
index 160c9adc746202876c26421a0b1cacddbf2d07d3..0661ee1ad9b5cf6ef1b4984e707743aabda27ec9 100644
(file)
--- a/
target/linux/adm5120/patches-2.6.26/001-adm5120.patch
+++ b/
target/linux/adm5120/patches-2.6.26/001-adm5120.patch
@@
-22,7
+22,7
@@
config MACH_ALCHEMY
bool "Alchemy processor based machines"
config MACH_ALCHEMY
bool "Alchemy processor based machines"
-@@ -687,6 +70
1
,7 @@
+@@ -687,6 +70
2
,7 @@
endchoice
endchoice
diff --git
a/target/linux/ar7/Makefile
b/target/linux/ar7/Makefile
index 4d07238070a13982104b391cffb3f2fbf011188e..4cf12a9f5066c53c537bbc643a59bc4835b499f7 100644
(file)
--- a/
target/linux/ar7/Makefile
+++ b/
target/linux/ar7/Makefile
@@
-11,7
+11,7
@@
BOARD:=ar7
BOARDNAME:=TI AR7
FEATURES:=squashfs jffs2 atm
BOARDNAME:=TI AR7
FEATURES:=squashfs jffs2 atm
-LINUX_VERSION:=2.6.26.
3
+LINUX_VERSION:=2.6.26.
5
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/ar7/patches-2.6.26/100-board_support.patch
b/target/linux/ar7/patches-2.6.26/100-board_support.patch
index 33b0b8baaf16a795af79ac266a54d4f2bcb87467..82d09b0f0171984880a65691f0e8c82f6c1ad4db 100644
(file)
--- a/
target/linux/ar7/patches-2.6.26/100-board_support.patch
+++ b/
target/linux/ar7/patches-2.6.26/100-board_support.patch
@@
-26,7
+26,7
@@
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
-@@ -11
12,9 +1112
,22 @@
+@@ -11
88,9 +1188
,22 @@
exception_handlers[n] = handler;
if (n == 0 && cpu_has_divec) {
exception_handlers[n] = handler;
if (n == 0 && cpu_has_divec) {
diff --git
a/target/linux/ar7/patches-2.6.26/110-flash.patch
b/target/linux/ar7/patches-2.6.26/110-flash.patch
index 39bf83affc52bdc3c4481605a1856a53b2a12213..4740e3421e4c14f038ce80bf42d6061df0657dc5 100644
(file)
--- a/
target/linux/ar7/patches-2.6.26/110-flash.patch
+++ b/
target/linux/ar7/patches-2.6.26/110-flash.patch
@@
-1,6
+1,5
@@
-diff -ruN linux-2.6.26.3.orig/drivers/mtd/Kconfig linux-2.6.26.3/drivers/mtd/Kconfig
---- linux-2.6.26.3.orig/drivers/mtd/Kconfig 2008-08-27 19:37:48.000000000 -0700
-+++ linux-2.6.26.3/drivers/mtd/Kconfig 2008-08-27 19:39:14.000000000 -0700
+--- a/drivers/mtd/Kconfig
++++ b/drivers/mtd/Kconfig
@@ -174,6 +174,12 @@
---help---
TI AR7 partitioning support
@@ -174,6 +174,12 @@
---help---
TI AR7 partitioning support
@@
-14,9
+13,8
@@
diff -ruN linux-2.6.26.3.orig/drivers/mtd/Kconfig linux-2.6.26.3/drivers/mtd/Kco
comment "User Modules And Translation Layers"
config MTD_CHAR
comment "User Modules And Translation Layers"
config MTD_CHAR
-diff -ruN linux-2.6.26.3.orig/drivers/mtd/Makefile linux-2.6.26.3/drivers/mtd/Makefile
---- linux-2.6.26.3.orig/drivers/mtd/Makefile 2008-08-27 19:37:48.000000000 -0700
-+++ linux-2.6.26.3/drivers/mtd/Makefile 2008-08-27 19:39:14.000000000 -0700
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
@@ -13,6 +13,7 @@
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
@@ -13,6 +13,7 @@
obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
obj-$(CONFIG_MTD_AR7_PARTS) += ar7part.o
@@
-25,9
+23,8
@@
diff -ruN linux-2.6.26.3.orig/drivers/mtd/Makefile linux-2.6.26.3/drivers/mtd/Ma
# 'Users' - code which presents functionality to userspace.
obj-$(CONFIG_MTD_CHAR) += mtdchar.o
# 'Users' - code which presents functionality to userspace.
obj-$(CONFIG_MTD_CHAR) += mtdchar.o
-diff -ruN linux-2.6.26.3.orig/drivers/mtd/maps/physmap.c linux-2.6.26.3/drivers/mtd/maps/physmap.c
---- linux-2.6.26.3.orig/drivers/mtd/maps/physmap.c 2008-08-27 19:37:48.000000000 -0700
-+++ linux-2.6.26.3/drivers/mtd/maps/physmap.c 2008-08-27 19:39:14.000000000 -0700
+--- a/drivers/mtd/maps/physmap.c
++++ b/drivers/mtd/maps/physmap.c
@@ -87,7 +87,8 @@
static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
@@ -87,7 +87,8 @@
static const char *rom_probe_types[] = { "cfi_probe", "jedec_probe", "map_rom", NULL };
diff --git
a/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch
b/target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch
index cd5d744de1b35641398c27d8e9713db1a7db496d..a3ce669400ddd05e5a209527c64303cc246f3774 100644
(file)
--- a/
target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch
+++ b/
target/linux/ar7/patches-2.6.26/120-gpio_chrdev.patch
@@
-1,6
+1,6
@@
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
-@@ -9
13,6 +913
,15 @@
+@@ -9
60,6 +960
,15 @@
To compile this driver as a module, choose M here: the
module will be called mwave.
To compile this driver as a module, choose M here: the
module will be called mwave.
@@
-18,7
+18,7
@@
depends on SCx200
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
depends on SCx200
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
-@@ -9
0,6 +90
,7 @@
+@@ -9
1,6 +91
,7 @@
obj-$(CONFIG_PPDEV) += ppdev.o
obj-$(CONFIG_NWBUTTON) += nwbutton.o
obj-$(CONFIG_NWFLASH) += nwflash.o
obj-$(CONFIG_PPDEV) += ppdev.o
obj-$(CONFIG_NWBUTTON) += nwbutton.o
obj-$(CONFIG_NWFLASH) += nwflash.o
diff --git
a/target/linux/ar7/patches-2.6.26/130-vlynq.patch
b/target/linux/ar7/patches-2.6.26/130-vlynq.patch
index 8fb613de5b938a47a8fab67dc1db38cff6b643c7..c1e04a6dbf3a9364528a1e80c658e2dbab7970bb 100644
(file)
--- a/
target/linux/ar7/patches-2.6.26/130-vlynq.patch
+++ b/
target/linux/ar7/patches-2.6.26/130-vlynq.patch
@@
-1,7
+1,5
@@
-Index: linux-2.6.26/drivers/Kconfig
-===================================================================
---- linux-2.6.26.orig/drivers/Kconfig 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.26/drivers/Kconfig 2008-07-14 12:28:00.186793402 +0200
+--- a/drivers/Kconfig
++++ b/drivers/Kconfig
@@ -100,5 +100,7 @@
source "drivers/uio/Kconfig"
@@ -100,5 +100,7 @@
source "drivers/uio/Kconfig"
@@
-10,10
+8,8
@@
Index: linux-2.6.26/drivers/Kconfig
+
source "drivers/xen/Kconfig"
endmenu
+
source "drivers/xen/Kconfig"
endmenu
-Index: linux-2.6.26/drivers/Makefile
-===================================================================
---- linux-2.6.26.orig/drivers/Makefile 2008-07-13 23:51:29.000000000 +0200
-+++ linux-2.6.26/drivers/Makefile 2008-07-14 12:27:34.362789842 +0200
+--- a/drivers/Makefile
++++ b/drivers/Makefile
@@ -92,5 +92,6 @@
obj-$(CONFIG_HID) += hid/
obj-$(CONFIG_PPC_PS3) += ps3/
@@ -92,5 +92,6 @@
obj-$(CONFIG_HID) += hid/
obj-$(CONFIG_PPC_PS3) += ps3/
diff --git
a/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch
b/target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch
index 6444cac88d85d2a4b87d295262febbef406aab1f..18477997e8ffb66e1a5fbce72f2d70bd33116810 100644
(file)
--- a/
target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch
+++ b/
target/linux/ar7/patches-2.6.26/150-cpmac_not_broken.patch
@@
-1,6
+1,6
@@
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
-@@ -18
74,7 +1874
,7 @@
+@@ -18
67,7 +1867
,7 @@
config CPMAC
tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
config CPMAC
tristate "TI AR7 CPMAC Ethernet support (EXPERIMENTAL)"
diff --git
a/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
b/target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
index a40d4a37712e4cd1568506891a9e9719c94651e6..00709186ef05940b604ba42d2fac6650a35a567a 100644
(file)
--- a/
target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
+++ b/
target/linux/ar7/patches-2.6.26/500-serial_kludge.patch
@@
-1,6
+1,6
@@
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
-@@ -26
7,6 +267
,13 @@
+@@ -26
6,6 +266
,13 @@
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
.flags = UART_CAP_FIFO,
},
.fcr = UART_FCR_ENABLE_FIFO | UART_FCR_R_TRIG_10,
.flags = UART_CAP_FIFO,
},
@@
-14,7
+14,7
@@
};
#if defined (CONFIG_SERIAL_8250_AU1X00)
};
#if defined (CONFIG_SERIAL_8250_AU1X00)
-@@ -2
455,7 +2462
,11 @@
+@@ -2
524,7 +2531
,11 @@
{
struct uart_8250_port *up = (struct uart_8250_port *)port;
{
struct uart_8250_port *up = (struct uart_8250_port *)port;
diff --git
a/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch
b/target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch
index 16e73204658e2b11d44aa489962d4b3e9add1cd8..63ced873ebf70dbecda0523ac6f0c17b29aea163 100644
(file)
--- a/
target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch
+++ b/
target/linux/ar7/patches-2.6.26/900-cpmac_multiqueue.patch
@@
-17,8
+17,8
@@
because other drivers do it in the same way.
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---- a/drivers/net/cpmac.c
2008-07-13 23:51:29.000000000 +0200
-+++ b/drivers/net/cpmac.c
2008-08-14 20:48:49.000000000 +0200
+--- a/drivers/net/cpmac.c
++++ b/drivers/net/cpmac.c
@@ -627,7 +627,7 @@
dev_kfree_skb_irq(desc->skb);
desc->skb = NULL;
@@ -627,7 +627,7 @@
dev_kfree_skb_irq(desc->skb);
desc->skb = NULL;
diff --git
a/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff
b/target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff
index 7da22cd99c9cb25c66795f186253c0432598f60b..43479f881e244d83bd8d82e45d1e1ad5f84be3f8 100644
(file)
--- a/
target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff
+++ b/
target/linux/ar7/patches-2.6.26/900-temporary_cpmac_hack.diff
@@
-1,6
+1,6
@@
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
-@@ -9
36,7 +936
,8 @@
+@@ -9
48,7 +948
,8 @@
int new_state = 0;
spin_lock(&priv->lock);
int new_state = 0;
spin_lock(&priv->lock);
@@
-10,7
+10,7
@@
netif_start_queue(dev);
if (priv->phy->duplex != priv->oldduplex) {
new_state = 1;
netif_start_queue(dev);
if (priv->phy->duplex != priv->oldduplex) {
new_state = 1;
-@@ -9
48,11 +949
,11 @@
+@@ -9
60,11 +961
,11 @@
priv->oldspeed = priv->phy->speed;
}
priv->oldspeed = priv->phy->speed;
}
diff --git
a/target/linux/ar71xx/Makefile
b/target/linux/ar71xx/Makefile
index 1572c84319fd0a1f8a2d1099b89a2dd77eb0b95a..b3353f7d391b6536730b8e37aade2638938d2753 100644
(file)
--- a/
target/linux/ar71xx/Makefile
+++ b/
target/linux/ar71xx/Makefile
@@
-11,7
+11,7
@@
BOARD:=ar71xx
BOARDNAME:=Atheros AR71xx
FEATURES:=squashfs tgz broken
BOARDNAME:=Atheros AR71xx
FEATURES:=squashfs tgz broken
-LINUX_VERSION:=2.6.26.
3
+LINUX_VERSION:=2.6.26.
5
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
b/target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
index ca989adeaf545b8316d13cab6a0a96578c2f9362..a1e82808c7689747636a78658da65e42626746f8 100644
(file)
--- a/
target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
+++ b/
target/linux/ar71xx/patches-2.6.26/900-mips_multi_machine_support.patch
@@
-131,7
+131,7
@@
source "arch/mips/au1000/Kconfig"
source "arch/mips/basler/excite/Kconfig"
source "arch/mips/jazz/Kconfig"
source "arch/mips/au1000/Kconfig"
source "arch/mips/basler/excite/Kconfig"
source "arch/mips/jazz/Kconfig"
-@@ -87
6,6 +877
,9 @@
+@@ -87
9,6 +880
,9 @@
config SYNC_R4K
bool
config SYNC_R4K
bool
diff --git
a/target/linux/at91/Makefile
b/target/linux/at91/Makefile
index 4385a1763a708bd1f519c3c6d4ce1a9745d78b95..e616467a5f92a4654d03ac97e6f4aa434f996fcc 100644
(file)
--- a/
target/linux/at91/Makefile
+++ b/
target/linux/at91/Makefile
@@
-11,7
+11,7
@@
BOARD:=at91
BOARDNAME:=Atmel AT91
FEATURES:=squashfs usb
BOARDNAME:=Atmel AT91
FEATURES:=squashfs usb
-LINUX_VERSION:=2.6.25.1
6
+LINUX_VERSION:=2.6.25.1
7
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/atheros/Makefile
b/target/linux/atheros/Makefile
index e4e2a423ced96b8851ecfea93af526e965ffd465..b3c44209a2b429a141e82e356e5efe9d1b686f78 100644
(file)
--- a/
target/linux/atheros/Makefile
+++ b/
target/linux/atheros/Makefile
@@
-11,7
+11,7
@@
BOARD:=atheros
BOARDNAME:=Atheros 231x/5312
FEATURES:=squashfs jffs2
BOARDNAME:=Atheros 231x/5312
FEATURES:=squashfs jffs2
-LINUX_VERSION:=2.6.26.
3
+LINUX_VERSION:=2.6.26.
5
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/au1000/Makefile
b/target/linux/au1000/Makefile
index 7cc7a93300233f49655c581dff8d4434ca0781db..4db3a39dc8b955bb500f938002fac4cca8d8b81c 100644
(file)
--- a/
target/linux/au1000/Makefile
+++ b/
target/linux/au1000/Makefile
@@
-11,7
+11,7
@@
BOARD:=au1000
BOARDNAME:=RMI/AMD AU1x00
FEATURES:=jffs2 usb pci
BOARDNAME:=RMI/AMD AU1x00
FEATURES:=jffs2 usb pci
-LINUX_VERSION:=2.6.25.1
6
+LINUX_VERSION:=2.6.25.1
7
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += yamonenv
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += yamonenv
diff --git
a/target/linux/au1000/patches/017-gpio-dir.patch
b/target/linux/au1000/patches/017-gpio-dir.patch
index c499d38e72665983af0d44e6de863c0b96907d18..982d10af4e457ec71b85b9e4aca9db21163cdacc 100644
(file)
--- a/
target/linux/au1000/patches/017-gpio-dir.patch
+++ b/
target/linux/au1000/patches/017-gpio-dir.patch
@@
-1,5
+1,5
@@
----
linux-2.6.25.16/arch/mips/au1000/common/gpio.c.org 2008-09-04 22:32:12.000000000 +0200
-+++
linux-2.6.25.16/arch/mips/au1000/common/gpio.c 2008-09-04 23:10:18.000000000 +0200
+---
a/arch/mips/au1000/common/gpio.c
++++
b/arch/mips/au1000/common/gpio.c
@@ -66,7 +66,8 @@
static int au1xxx_gpio2_direction_output(unsigned gpio, int value)
{
@@ -66,7 +66,8 @@
static int au1xxx_gpio2_direction_output(unsigned gpio, int value)
{
diff --git
a/target/linux/avr32/Makefile
b/target/linux/avr32/Makefile
index 49c7c4615465a83a6b9d0850d487ae594da3e133..6d24ecffb3a1a3cc630aefb58b00634abb41e8e8 100644
(file)
--- a/
target/linux/avr32/Makefile
+++ b/
target/linux/avr32/Makefile
@@
-10,7
+10,7
@@
ARCH:=avr32
BOARD:=avr32
BOARDNAME:=Atmel AVR32
FEATURES:=squashfs
BOARD:=avr32
BOARDNAME:=Atmel AVR32
FEATURES:=squashfs
-LINUX_VERSION:=2.6.25.1
6
+LINUX_VERSION:=2.6.25.1
7
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/brcm47xx/Makefile
b/target/linux/brcm47xx/Makefile
index 36205aed617a8f0b7e4fbd0fe2e5e42a1080c56e..bad5ec108df5c2a656d37f87591667e17d4b740c 100644
(file)
--- a/
target/linux/brcm47xx/Makefile
+++ b/
target/linux/brcm47xx/Makefile
@@
-11,7
+11,7
@@
BOARD:=brcm47xx
BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs usb
BOARDNAME:=Broadcom BCM947xx/953xx
FEATURES:=squashfs usb
-LINUX_VERSION:=2.6.25.1
6
+LINUX_VERSION:=2.6.25.1
7
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += kmod-switch kmod-diag
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += kmod-switch kmod-diag
diff --git
a/target/linux/brcm63xx/Makefile
b/target/linux/brcm63xx/Makefile
index cc2da9b7a5cb7c06026c9f52a4065a4284a7544b..7005d0163ea6b2e77ba0a14099cfe97863582300 100644
(file)
--- a/
target/linux/brcm63xx/Makefile
+++ b/
target/linux/brcm63xx/Makefile
@@
-10,7
+10,7
@@
ARCH:=mips
BOARD:=brcm63xx
BOARDNAME:=Broadcom BCM963xx
FEATURES:=squashfs jffs2 broken usb atm
BOARD:=brcm63xx
BOARDNAME:=Broadcom BCM963xx
FEATURES:=squashfs jffs2 broken usb atm
-LINUX_VERSION:=2.6.25.1
6
+LINUX_VERSION:=2.6.25.1
7
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/etrax/Makefile
b/target/linux/etrax/Makefile
index 543e0b0122d43c4cf163631f0ee60951ae182457..dcc0c37a71a9c8f1ccb97a78a571d25120caef66 100644
(file)
--- a/
target/linux/etrax/Makefile
+++ b/
target/linux/etrax/Makefile
@@
-10,7
+10,7
@@
ARCH:=cris
BOARD:=etrax
BOARDNAME:=Foxboard (ETRAX 100LX)
FEATURES:=squashfs jffs2 broken
BOARD:=etrax
BOARDNAME:=Foxboard (ETRAX 100LX)
FEATURES:=squashfs jffs2 broken
-LINUX_VERSION:=2.6.25.1
6
+LINUX_VERSION:=2.6.25.1
7
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/etrax/patches/100-compile_fixes.patch
b/target/linux/etrax/patches/100-compile_fixes.patch
index 59d47c68376872a80cda852a1b3f01c736b78d1c..ea6d08e86fee486ffb0828036dae76295ba46fda 100644
(file)
--- a/
target/linux/etrax/patches/100-compile_fixes.patch
+++ b/
target/linux/etrax/patches/100-compile_fixes.patch
@@
-1,6
+1,5
@@
-diff -urN linux-2.6.25.7/arch/cris/Makefile linux-2.6.25.7.cris/arch/cris/Makefile
---- linux-2.6.25.7/arch/cris/Makefile 2008-06-16 22:24:36.000000000 +0200
-+++ linux-2.6.25.7.cris/arch/cris/Makefile 2008-06-24 13:22:48.000000000 +0200
+--- a/arch/cris/Makefile
++++ b/arch/cris/Makefile
@@ -33,7 +33,7 @@
LD = $(CROSS_COMPILE)ld -mcrislinux
@@ -33,7 +33,7 @@
LD = $(CROSS_COMPILE)ld -mcrislinux
@@
-10,9
+9,8
@@
diff -urN linux-2.6.25.7/arch/cris/Makefile linux-2.6.25.7.cris/arch/cris/Makefi
CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
-diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/Makefile linux-2.6.25.7.cris/arch/cris/arch-v10/boot/Makefile
---- linux-2.6.25.7/arch/cris/arch-v10/boot/Makefile 2008-06-16 22:24:36.000000000 +0200
-+++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/Makefile 2008-06-24 13:23:03.000000000 +0200
+--- a/arch/cris/arch-v10/boot/Makefile
++++ b/arch/cris/arch-v10/boot/Makefile
@@ -2,9 +2,6 @@
# arch/cris/arch-v10/boot/Makefile
#
@@ -2,9 +2,6 @@
# arch/cris/arch-v10/boot/Makefile
#
@@
-31,9
+29,8
@@
diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/Makefile linux-2.6.25.7.cris/ar
$(obj)/zImage: $(obj)/compressed/vmlinux
@cp $< $@
$(obj)/zImage: $(obj)/compressed/vmlinux
@cp $< $@
-diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/Makefile linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/Makefile
---- linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/Makefile 2008-06-16 22:24:36.000000000 +0200
-+++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/Makefile 2008-06-24 13:23:14.000000000 +0200
+--- a/arch/cris/arch-v10/boot/compressed/Makefile
++++ b/arch/cris/arch-v10/boot/compressed/Makefile
@@ -2,13 +2,9 @@
# arch/cris/arch-v10/boot/compressed/Makefile
#
@@ -2,13 +2,9 @@
# arch/cris/arch-v10/boot/compressed/Makefile
#
@@
-61,18
+58,16
@@
diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/Makefile linux-2.6.2
$(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE
$(call if_changed,image)
$(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE
$(call if_changed,image)
-diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/decompress.ld linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/decompress.ld
---- linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/decompress.ld 2008-06-16 22:24:36.000000000 +0200
-+++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/decompress.ld 2008-06-24 12:57:25.000000000 +0200
+--- a/arch/cris/arch-v10/boot/compressed/decompress.ld
++++ b/arch/cris/arch-v10/boot/compressed/decompress.ld
@@ -1,4 +1,4 @@
-OUTPUT_FORMAT(elf32-us-cris)
+OUTPUT_FORMAT(elf32-cris)
MEMORY
{
@@ -1,4 +1,4 @@
-OUTPUT_FORMAT(elf32-us-cris)
+OUTPUT_FORMAT(elf32-cris)
MEMORY
{
-diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/head.S linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/head.S
---- linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/head.S 2008-06-16 22:24:36.000000000 +0200
-+++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/head.S 2008-06-24 13:24:50.000000000 +0200
+--- a/arch/cris/arch-v10/boot/compressed/head.S
++++ b/arch/cris/arch-v10/boot/compressed/head.S
@@ -10,13 +10,14 @@
#define ASSEMBLER_MACROS_ONLY
@@ -10,13 +10,14 @@
#define ASSEMBLER_MACROS_ONLY
@@
-227,9
+222,8
@@
diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/head.S linux-2.6.25.
+cmd_line_addr:
.dword 0
#include "../../lib/hw_settings.S"
+cmd_line_addr:
.dword 0
#include "../../lib/hw_settings.S"
-diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/misc.c linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/misc.c
---- linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/misc.c 2008-06-16 22:24:36.000000000 +0200
-+++ linux-2.6.25.7.cris/arch/cris/arch-v10/boot/compressed/misc.c 2008-06-24 12:57:25.000000000 +0200
+--- a/arch/cris/arch-v10/boot/compressed/misc.c
++++ b/arch/cris/arch-v10/boot/compressed/misc.c
@@ -5,7 +5,7 @@
* adapted for Linux.
*
@@ -5,7 +5,7 @@
* adapted for Linux.
*
@@
-294,9
+288,8
@@
diff -urN linux-2.6.25.7/arch/cris/arch-v10/boot/compressed/misc.c linux-2.6.25.
- puts("Done. Now booting the kernel.\n");
+ putstr("Done. Now booting the kernel.\n");
}
- puts("Done. Now booting the kernel.\n");
+ putstr("Done. Now booting the kernel.\n");
}
-diff -urN linux-2.6.25.7/arch/cris/arch-v10/mm/init.c linux-2.6.25.7.cris/arch/cris/arch-v10/mm/init.c
---- linux-2.6.25.7/arch/cris/arch-v10/mm/init.c 2008-06-16 22:24:36.000000000 +0200
-+++ linux-2.6.25.7.cris/arch/cris/arch-v10/mm/init.c 2008-06-24 12:57:25.000000000 +0200
+--- a/arch/cris/arch-v10/mm/init.c
++++ b/arch/cris/arch-v10/mm/init.c
@@ -184,6 +184,9 @@
free_area_init_node(0, &contig_page_data, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
@@ -184,6 +184,9 @@
free_area_init_node(0, &contig_page_data, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
diff --git
a/target/linux/etrax/patches/101-cris-eth-driver.patch
b/target/linux/etrax/patches/101-cris-eth-driver.patch
index f003f50e58fb32a564d3de14187eff5c853b2fa0..f73b379ddc5a7dd18ed609bc07845667a7ba6607 100644
(file)
--- a/
target/linux/etrax/patches/101-cris-eth-driver.patch
+++ b/
target/linux/etrax/patches/101-cris-eth-driver.patch
@@
-1,5
+1,5
@@
----
linux-2.6.25.7/drivers/net/cris/eth_v10.c.orig 2008-06-24 13:37:48.000000000 +0200
-+++
linux-2.6.25.7/drivers/net/cris/eth_v10.c 2008-06-24 13:37:58.000000000 +0200
+---
a/drivers/net/cris/eth_v10.c
++++
b/drivers/net/cris/eth_v10.c
@@ -1707,7 +1707,7 @@
static void
e100_netpoll(struct net_device* netdev)
@@ -1707,7 +1707,7 @@
static void
e100_netpoll(struct net_device* netdev)
diff --git
a/target/linux/etrax/patches/102-missing_arch_include.patch
b/target/linux/etrax/patches/102-missing_arch_include.patch
index 7e862524c4a7a2accf6f9235ff863457ef21b30a..8955712b269edb303e2582bc314ff2d66d856349 100644
(file)
--- a/
target/linux/etrax/patches/102-missing_arch_include.patch
+++ b/
target/linux/etrax/patches/102-missing_arch_include.patch
@@
-1,5
+1,5
@@
----
linux-2.6.25.7/include/asm-cris/Kbuild.orig 2008-06-23 12:24:03.000000000 +0200
-+++
linux-2.6.25.7/include/asm-cris/Kbuild 2008-06-23 12:24:23.000000000 +0200
+---
a/include/asm-cris/Kbuild
++++
b/include/asm-cris/Kbuild
@@ -1,7 +1,6 @@
include include/asm-generic/Kbuild.asm
@@ -1,7 +1,6 @@
include include/asm-generic/Kbuild.asm
diff --git
a/target/linux/generic-2.6/patches-2.6.25/965-cdc_acm_unlock.patch
b/target/linux/generic-2.6/patches-2.6.25/965-cdc_acm_unlock.patch
deleted file mode 100644
(file)
index
c70181c
..0000000
--- a/
target/linux/generic-2.6/patches-2.6.25/965-cdc_acm_unlock.patch
+++ /dev/null
@@
-1,12
+0,0 @@
---- a/drivers/usb/class/cdc-acm.c
-+++ b/drivers/usb/class/cdc-acm.c
-@@ -531,8 +531,8 @@
- tasklet_schedule(&acm->urb_task);
-
- done:
--err_out:
- mutex_unlock(&acm->mutex);
-+err_out:
- mutex_unlock(&open_mutex);
- return rv;
-
diff --git
a/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch
b/target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch
index df805f528326cef73d80cb46b7faefc93fcae7e8..9c69385dfb549873a7a23c5a26b11b308283b9bb 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch
+++ b/
target/linux/generic-2.6/patches-2.6.26/170-netfilter_chaostables_0.8.patch
@@
-833,7
+833,7
@@
+MODULE_ALIAS("ipt_portscan");
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
+MODULE_ALIAS("ipt_portscan");
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
-@@ -155
3,6 +1553
,8 @@
+@@ -155
4,6 +1554
,8 @@
return seq;
}
return seq;
}
diff --git
a/target/linux/generic-2.6/patches-2.6.26/906-pim_h_compile_fix.patch
b/target/linux/generic-2.6/patches-2.6.26/906-pim_h_compile_fix.patch
deleted file mode 100644
(file)
index
51ca974
..0000000
--- a/
target/linux/generic-2.6/patches-2.6.26/906-pim_h_compile_fix.patch
+++ /dev/null
@@
-1,11
+0,0 @@
---- a/include/linux/pim.h
-+++ b/include/linux/pim.h
-@@ -9,7 +9,7 @@
- __u8 pim_type:4, /* PIM message type */
- pim_ver:4; /* PIM version */
- #elif defined(__BIG_ENDIAN_BITFIELD)
-- __u8 pim_ver:4; /* PIM version */
-+ __u8 pim_ver:4, /* PIM version */
- pim_type:4; /* PIM message type */
- #endif
- __u8 pim_rsv; /* Reserved */
diff --git
a/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch
b/target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch
index 627f3538af19abf0820ae4e2cf8e1a9292a7158e..003d28c0cad2a173aa123e55c1bf812cfd894a84 100644
(file)
--- a/
target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch
+++ b/
target/linux/generic-2.6/patches-2.6.26/970-ocf_20080704.patch
@@
-44,7
+44,7
@@
* All of these routines try to estimate how many bits of randomness a
* particular randomness source. They do this by keeping track of the
* first and second order deltas of the event timings.
* All of these routines try to estimate how many bits of randomness a
* particular randomness source. They do this by keeping track of the
* first and second order deltas of the event timings.
-@@ -66
6,6 +676
,61 @@
+@@ -66
7,6 +677
,61 @@
}
#endif
}
#endif
diff --git
a/target/linux/ifxmips/Makefile
b/target/linux/ifxmips/Makefile
index 9d3ec23c7d7baa902853922d671dfa24e0b8c4c8..de982abf172e7f94d785a2e939a30d1246283cbd 100644
(file)
--- a/
target/linux/ifxmips/Makefile
+++ b/
target/linux/ifxmips/Makefile
@@
-10,7
+10,7
@@
ARCH:=mips
BOARD:=ifxmips
BOARDNAME:=Infineon Mips
FEATURES:=squashfs jffs2
BOARD:=ifxmips
BOARDNAME:=Infineon Mips
FEATURES:=squashfs jffs2
-LINUX_VERSION:=2.6.26.
2
+LINUX_VERSION:=2.6.26.
5
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=uboot-ifxmips
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES+=uboot-ifxmips
diff --git
a/target/linux/ifxmips/patches/100-board.patch
b/target/linux/ifxmips/patches/100-board.patch
index 0e82af76b26adad9f364f3e6c3b21c06f0773691..db43c90b2ced642dde7fe8daebe2306bc532d163 100644
(file)
--- a/
target/linux/ifxmips/patches/100-board.patch
+++ b/
target/linux/ifxmips/patches/100-board.patch
@@
-22,7
+22,7
@@
config MACH_DECSTATION
bool "DECstations"
select BOOT_ELF32
config MACH_DECSTATION
bool "DECstations"
select BOOT_ELF32
-@@ -69
3,6 +708
,7 @@
+@@ -69
7,6 +712
,7 @@
source "arch/mips/tx4927/Kconfig"
source "arch/mips/tx4938/Kconfig"
source "arch/mips/vr41xx/Kconfig"
source "arch/mips/tx4927/Kconfig"
source "arch/mips/tx4938/Kconfig"
source "arch/mips/vr41xx/Kconfig"
@@
-63,7
+63,7
@@
extern char *system_type;
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
extern char *system_type;
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
-@@ -1
379,6 +1379
,7 @@
+@@ -1
464,6 +1464
,7 @@
*/
if (cpu_has_mips_r2) {
cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
*/
if (cpu_has_mips_r2) {
cp0_compare_irq = (read_c0_intctl() >> 29) & 7;
diff --git
a/target/linux/ifxmips/patches/110-drivers.patch
b/target/linux/ifxmips/patches/110-drivers.patch
index 3233fd95c5317966d03a39013eacd11c4150c0db..a25c57003abed7bf106a85fdb794f41418fbce10 100644
(file)
--- a/
target/linux/ifxmips/patches/110-drivers.patch
+++ b/
target/linux/ifxmips/patches/110-drivers.patch
@@
-1,7
+1,5
@@
-Index: linux-2.6.26.2/drivers/char/Makefile
-===================================================================
---- linux-2.6.26.2.orig/drivers/char/Makefile 2008-09-09 01:44:53.000000000 +0200
-+++ linux-2.6.26.2/drivers/char/Makefile 2008-09-09 01:45:41.000000000 +0200
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile
@@ -114,6 +114,10 @@
obj-$(CONFIG_JS_RTC) += js-rtc.o
js-rtc-y = rtc.o
@@ -114,6 +114,10 @@
obj-$(CONFIG_JS_RTC) += js-rtc.o
js-rtc-y = rtc.o
@@
-13,19
+11,15
@@
Index: linux-2.6.26.2/drivers/char/Makefile
# Files generated that shall be removed upon make clean
clean-files := consolemap_deftbl.c defkeymap.c
# Files generated that shall be removed upon make clean
clean-files := consolemap_deftbl.c defkeymap.c
-Index: linux-2.6.26.2/drivers/mtd/maps/Makefile
-===================================================================
---- linux-2.6.26.2.orig/drivers/mtd/maps/Makefile 2008-09-09 01:44:51.000000000 +0200
-+++ linux-2.6.26.2/drivers/mtd/maps/Makefile 2008-09-09 01:45:41.000000000 +0200
+--- a/drivers/mtd/maps/Makefile
++++ b/drivers/mtd/maps/Makefile
@@ -67,3 +67,4 @@
obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o
obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o
obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o
+obj-$(CONFIG_MTD_IFXMIPS) += ifxmips.o
@@ -67,3 +67,4 @@
obj-$(CONFIG_MTD_OMAP_NOR) += omap_nor.o
obj-$(CONFIG_MTD_MTX1) += mtx-1_flash.o
obj-$(CONFIG_MTD_INTEL_VR_NOR) += intel_vr_nor.o
+obj-$(CONFIG_MTD_IFXMIPS) += ifxmips.o
-Index: linux-2.6.26.2/drivers/net/Kconfig
-===================================================================
---- linux-2.6.26.2.orig/drivers/net/Kconfig 2008-09-09 01:44:53.000000000 +0200
-+++ linux-2.6.26.2/drivers/net/Kconfig 2008-09-09 01:45:41.000000000 +0200
+--- a/drivers/net/Kconfig
++++ b/drivers/net/Kconfig
@@ -351,6 +351,12 @@
source "drivers/net/arm/Kconfig"
@@ -351,6 +351,12 @@
source "drivers/net/arm/Kconfig"
@@
-39,10
+33,8
@@
Index: linux-2.6.26.2/drivers/net/Kconfig
config AX88796
tristate "ASIX AX88796 NE2000 clone support"
depends on ARM || MIPS || SUPERH
config AX88796
tristate "ASIX AX88796 NE2000 clone support"
depends on ARM || MIPS || SUPERH
-Index: linux-2.6.26.2/drivers/serial/Kconfig
-===================================================================
---- linux-2.6.26.2.orig/drivers/serial/Kconfig 2008-09-09 01:44:51.000000000 +0200
-+++ linux-2.6.26.2/drivers/serial/Kconfig 2008-09-09 01:45:41.000000000 +0200
+--- a/drivers/serial/Kconfig
++++ b/drivers/serial/Kconfig
@@ -1334,6 +1334,14 @@
Currently, only 8250 compatible ports are supported, but
others can easily be added.
@@ -1334,6 +1334,14 @@
Currently, only 8250 compatible ports are supported, but
others can easily be added.
@@
-58,19
+50,15
@@
Index: linux-2.6.26.2/drivers/serial/Kconfig
config SERIAL_QE
tristate "Freescale QUICC Engine serial port support"
depends on QUICC_ENGINE
config SERIAL_QE
tristate "Freescale QUICC Engine serial port support"
depends on QUICC_ENGINE
-Index: linux-2.6.26.2/drivers/serial/Makefile
-===================================================================
---- linux-2.6.26.2.orig/drivers/serial/Makefile 2008-09-09 01:44:51.000000000 +0200
-+++ linux-2.6.26.2/drivers/serial/Makefile 2008-09-09 01:46:23.000000000 +0200
+--- a/drivers/serial/Makefile
++++ b/drivers/serial/Makefile
@@ -68,3 +68,4 @@
obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
+obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o
@@ -68,3 +68,4 @@
obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
obj-$(CONFIG_KGDB_SERIAL_CONSOLE) += kgdboc.o
obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
+obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o
-Index: linux-2.6.26.2/drivers/watchdog/Makefile
-===================================================================
---- linux-2.6.26.2.orig/drivers/watchdog/Makefile 2008-09-09 01:44:51.000000000 +0200
-+++ linux-2.6.26.2/drivers/watchdog/Makefile 2008-09-09 01:45:41.000000000 +0200
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile
@@ -97,6 +97,7 @@
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
@@ -97,6 +97,7 @@
obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
@@
-79,20
+67,16
@@
Index: linux-2.6.26.2/drivers/watchdog/Makefile
# PARISC Architecture
# PARISC Architecture
-Index: linux-2.6.26.2/drivers/net/Makefile
-===================================================================
---- linux-2.6.26.2.orig/drivers/net/Makefile 2008-09-09 01:44:53.000000000 +0200
-+++ linux-2.6.26.2/drivers/net/Makefile 2008-09-09 01:47:02.000000000 +0200
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile
@@ -256,4 +256,4 @@
obj-$(CONFIG_NIU) += niu.o
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
obj-$(CONFIG_SFC) += sfc/
-
+obj-$(CONFIG_IFXMIPS_MII0) += ifxmips_mii0.o
@@ -256,4 +256,4 @@
obj-$(CONFIG_NIU) += niu.o
obj-$(CONFIG_VIRTIO_NET) += virtio_net.o
obj-$(CONFIG_SFC) += sfc/
-
+obj-$(CONFIG_IFXMIPS_MII0) += ifxmips_mii0.o
-Index: linux-2.6.26.2/drivers/crypto/Kconfig
-===================================================================
---- linux-2.6.26.2.orig/drivers/crypto/Kconfig 2008-09-09 01:44:53.000000000 +0200
-+++ linux-2.6.26.2/drivers/crypto/Kconfig 2008-09-09 01:45:41.000000000 +0200
+--- a/drivers/crypto/Kconfig
++++ b/drivers/crypto/Kconfig
@@ -9,6 +9,9 @@
If you say N, all options in this submenu will be skipped and disabled.
@@ -9,6 +9,9 @@
If you say N, all options in this submenu will be skipped and disabled.
@@
-103,19
+87,15
@@
Index: linux-2.6.26.2/drivers/crypto/Kconfig
config CRYPTO_DEV_PADLOCK
tristate "Support for VIA PadLock ACE"
config CRYPTO_DEV_PADLOCK
tristate "Support for VIA PadLock ACE"
-Index: linux-2.6.26.2/drivers/crypto/Makefile
-===================================================================
---- linux-2.6.26.2.orig/drivers/crypto/Makefile 2008-09-09 01:44:53.000000000 +0200
-+++ linux-2.6.26.2/drivers/crypto/Makefile 2008-09-09 01:47:30.000000000 +0200
+--- a/drivers/crypto/Makefile
++++ b/drivers/crypto/Makefile
@@ -4,3 +4,4 @@
obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o
obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o
obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o
+obj-$(CONFIG_CRYPTO_DEV_IFXMIPS) += ifxdeu-aes.o ifxdeu-des.o ifxdeu-dma.o ifxdeu-generic.o ifxdeu-md5.o ifxdeu-sha1.o
@@ -4,3 +4,4 @@
obj-$(CONFIG_CRYPTO_DEV_HIFN_795X) += hifn_795x.o
obj-$(CONFIG_CRYPTO_DEV_TALITOS) += talitos.o
obj-$(CONFIG_CRYPTO_DEV_IXP4XX) += ixp4xx_crypto.o
+obj-$(CONFIG_CRYPTO_DEV_IFXMIPS) += ifxdeu-aes.o ifxdeu-des.o ifxdeu-dma.o ifxdeu-generic.o ifxdeu-md5.o ifxdeu-sha1.o
-Index: linux-2.6.26.2/drivers/usb/host/Kconfig
-===================================================================
---- linux-2.6.26.2.orig/drivers/usb/host/Kconfig 2008-09-09 01:44:51.000000000 +0200
-+++ linux-2.6.26.2/drivers/usb/host/Kconfig 2008-09-09 01:48:14.000000000 +0200
+--- a/drivers/usb/host/Kconfig
++++ b/drivers/usb/host/Kconfig
@@ -305,3 +305,10 @@
help
This driver enables support for the on-chip R8A66597 in the
@@ -305,3 +305,10 @@
help
This driver enables support for the on-chip R8A66597 in the
@@
-127,10
+107,8
@@
Index: linux-2.6.26.2/drivers/usb/host/Kconfig
+ default y
+ help
+ Danube USB Host Controller
+ default y
+ help
+ Danube USB Host Controller
-Index: linux-2.6.26.2/drivers/leds/Kconfig
-===================================================================
---- linux-2.6.26.2.orig/drivers/leds/Kconfig 2008-09-09 01:44:53.000000000 +0200
-+++ linux-2.6.26.2/drivers/leds/Kconfig 2008-09-09 01:45:41.000000000 +0200
+--- a/drivers/leds/Kconfig
++++ b/drivers/leds/Kconfig
@@ -153,6 +153,12 @@
To compile this driver as a module, choose M here: the
module will be called leds-clevo-mail.
@@ -153,6 +153,12 @@
To compile this driver as a module, choose M here: the
module will be called leds-clevo-mail.
@@
-144,10
+122,8
@@
Index: linux-2.6.26.2/drivers/leds/Kconfig
comment "LED Triggers"
config LEDS_TRIGGERS
comment "LED Triggers"
config LEDS_TRIGGERS
-Index: linux-2.6.26.2/drivers/leds/Makefile
-===================================================================
---- linux-2.6.26.2.orig/drivers/leds/Makefile 2008-09-09 01:44:53.000000000 +0200
-+++ linux-2.6.26.2/drivers/leds/Makefile 2008-09-09 01:49:25.000000000 +0200
+--- a/drivers/leds/Makefile
++++ b/drivers/leds/Makefile
@@ -22,6 +22,7 @@
obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o
obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o
@@ -22,6 +22,7 @@
obj-$(CONFIG_LEDS_CLEVO_MAIL) += leds-clevo-mail.o
obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o
@@
-156,10
+132,8
@@
Index: linux-2.6.26.2/drivers/leds/Makefile
# LED Triggers
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
# LED Triggers
obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o
-Index: linux-2.6.26.2/drivers/watchdog/Kconfig
-===================================================================
---- linux-2.6.26.2.orig/drivers/watchdog/Kconfig 2008-09-09 01:44:51.000000000 +0200
-+++ linux-2.6.26.2/drivers/watchdog/Kconfig 2008-09-09 01:45:41.000000000 +0200
+--- a/drivers/watchdog/Kconfig
++++ b/drivers/watchdog/Kconfig
@@ -683,6 +683,12 @@
help
Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
@@ -683,6 +683,12 @@
help
Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs.
diff --git
a/target/linux/ifxmips/patches/160-cfi-swap.patch
b/target/linux/ifxmips/patches/160-cfi-swap.patch
index 51b82023ad7de03da26a90e98ddcc000302f56dd..7649ec1ff4d7d3c522cee17003db1ce020fe08ef 100644
(file)
--- a/
target/linux/ifxmips/patches/160-cfi-swap.patch
+++ b/
target/linux/ifxmips/patches/160-cfi-swap.patch
@@
-1,6
+1,6
@@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -10
15,7 +1015
,9 @@
+@@ -10
41,7 +1041
,9 @@
int retry_cnt = 0;
adr += chip->start;
int retry_cnt = 0;
adr += chip->start;
diff --git
a/target/linux/iop32x/Makefile
b/target/linux/iop32x/Makefile
index e46e0c80c8bb2fc0fdd3a3fa9cc90d20ae156ea9..2fe245b50b117c919a7dd3a703cc6182f4f07bbe 100644
(file)
--- a/
target/linux/iop32x/Makefile
+++ b/
target/linux/iop32x/Makefile
@@
-11,7
+11,7
@@
BOARD:=iop32x
BOARDNAME:=Intel IOP32x
FEATURES:=squashfs jffs2
BOARDNAME:=Intel IOP32x
FEATURES:=squashfs jffs2
-LINUX_VERSION:=2.6.26.
3
+LINUX_VERSION:=2.6.26.
5
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/ixp4xx/Makefile
b/target/linux/ixp4xx/Makefile
index 51155663b8c00c2dc474fae9ed800c694c4be7e7..9bae182b21bb25069c7bd751a96fd43d8c9d2960 100644
(file)
--- a/
target/linux/ixp4xx/Makefile
+++ b/
target/linux/ixp4xx/Makefile
@@
-12,7
+12,7
@@
BOARDNAME:=Intel IXP4xx
FEATURES:=squashfs
SUBTARGETS=generic harddisk
FEATURES:=squashfs
SUBTARGETS=generic harddisk
-LINUX_VERSION:=2.6.26.
3
+LINUX_VERSION:=2.6.26.
5
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/magicbox/Makefile
b/target/linux/magicbox/Makefile
index f170208d2b3efd255f3205c5c6bd574e5b237993..085e02f5ea82c0306fa05093c48f2509363da61f 100644
(file)
--- a/
target/linux/magicbox/Makefile
+++ b/
target/linux/magicbox/Makefile
@@
-11,7
+11,7
@@
BOARD:=magicbox
BOARDNAME:=Magicbox
FEATURES:=squashfs pci
BOARDNAME:=Magicbox
FEATURES:=squashfs pci
-LINUX_VERSION:=2.6.26.
3
+LINUX_VERSION:=2.6.26.
5
LINUX_KARCH:=ppc
include $(INCLUDE_DIR)/target.mk
LINUX_KARCH:=ppc
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/orion/Makefile
b/target/linux/orion/Makefile
index 7fc961cd962373fe8f643470cb3bf314f93ce3ff..0f7064ae14b1c573d7e54fb8fad1228cf19a1f1a 100644
(file)
--- a/
target/linux/orion/Makefile
+++ b/
target/linux/orion/Makefile
@@
-11,7
+11,7
@@
BOARD:=orion
BOARDNAME:=Marvell Orion
FEATURES:=squashfs
BOARDNAME:=Marvell Orion
FEATURES:=squashfs
-LINUX_VERSION:=2.6.26.
3
+LINUX_VERSION:=2.6.26.
5
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/orion/patches/000-orion_git_sync.patch
b/target/linux/orion/patches/000-orion_git_sync.patch
index 335c996c982350db261c2b77fdfdd31db847964d..4daef75d5b53f1a4f76bd683827f0ae22423dd14 100644
(file)
--- a/
target/linux/orion/patches/000-orion_git_sync.patch
+++ b/
target/linux/orion/patches/000-orion_git_sync.patch
@@
-1,6
+1,6
@@
--- a/MAINTAINERS
+++ b/MAINTAINERS
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -26
86,12 +2686
,10 @@
+@@ -26
91,12 +2691
,10 @@
S: Maintained
MARVELL MV643XX ETHERNET DRIVER
S: Maintained
MARVELL MV643XX ETHERNET DRIVER
diff --git
a/target/linux/ppc40x/Makefile
b/target/linux/ppc40x/Makefile
index 38c16c1e346b282f1bb6153d5d0c31b97a417be6..daf808b8e9077c866c698d3949cdadc7e32ffaaf 100644
(file)
--- a/
target/linux/ppc40x/Makefile
+++ b/
target/linux/ppc40x/Makefile
@@
-11,7
+11,7
@@
BOARD:=ppc40x
BOARDNAME:=AMCC/IBM PPC40x
FEATURES:=squashfs
BOARDNAME:=AMCC/IBM PPC40x
FEATURES:=squashfs
-LINUX_VERSION:=2.6.26.
3
+LINUX_VERSION:=2.6.26.
5
LINUX_KARCH:=powerpc
include $(INCLUDE_DIR)/target.mk
LINUX_KARCH:=powerpc
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/ppc44x/Makefile
b/target/linux/ppc44x/Makefile
index 1c13f4ce9a6c84cb8a8344f81350b33a9400dd70..5e025a82c5173bd80060b6d8db544e117c390861 100644
(file)
--- a/
target/linux/ppc44x/Makefile
+++ b/
target/linux/ppc44x/Makefile
@@
-11,7
+11,7
@@
BOARD:=ppc44x
BOARDNAME:=AMCC/IBM PPC44x
FEATURES:=squashfs
BOARDNAME:=AMCC/IBM PPC44x
FEATURES:=squashfs
-LINUX_VERSION:=2.6.26.
3
+LINUX_VERSION:=2.6.26.
5
LINUX_KARCH:=powerpc
include $(INCLUDE_DIR)/target.mk
LINUX_KARCH:=powerpc
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/ps3/Makefile
b/target/linux/ps3/Makefile
index 3e559eb4216fbe854b571863134eb44ef2fd0342..daa2c62d7820edbf62a988bce2cd02373264652e 100644
(file)
--- a/
target/linux/ps3/Makefile
+++ b/
target/linux/ps3/Makefile
@@
-10,7
+10,7
@@
ARCH:=powerpc
BOARD:=ps3
BOARDNAME:=Sony PS3 Game Console
BOARD:=ps3
BOARDNAME:=Sony PS3 Game Console
-LINUX_VERSION:=2.6.25.1
6
+LINUX_VERSION:=2.6.25.1
7
KERNEL_CC:=
KERNEL_CC:=
diff --git
a/target/linux/sibyte/Makefile
b/target/linux/sibyte/Makefile
index 41cd69034890fa18d1c1f5b1752ce830a9362740..f4436a84cfb09b287595092e61b1ead3697c4ccd 100644
(file)
--- a/
target/linux/sibyte/Makefile
+++ b/
target/linux/sibyte/Makefile
@@
-11,7
+11,7
@@
BOARD:=sibyte
BOARDNAME:=Broadcom/SiByte SB-1
FEATURES:=broken
BOARDNAME:=Broadcom/SiByte SB-1
FEATURES:=broken
-LINUX_VERSION:=2.6.26.
3
+LINUX_VERSION:=2.6.26.
5
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/uml/Makefile
b/target/linux/uml/Makefile
index e09751314b547e4a29d249673b618d3e73b2611e..659eaec704a71fc7fb16127dedd5326a04a5f908 100644
(file)
--- a/
target/linux/uml/Makefile
+++ b/
target/linux/uml/Makefile
@@
-23,7
+23,7
@@
BOARDNAME:=User Mode Linux
FEATURES:=ext2
LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
FEATURES:=ext2
LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
-LINUX_VERSION:=2.6.26.
3
+LINUX_VERSION:=2.6.26.
5
include $(INCLUDE_DIR)/target.mk
include $(INCLUDE_DIR)/target.mk
diff --git
a/target/linux/x86/Makefile
b/target/linux/x86/Makefile
index 3288de347a08acbf62582f18261567cebe568025..9e46cfec3f7d56f80da69e1f7b6e434099d94cff 100644
(file)
--- a/
target/linux/x86/Makefile
+++ b/
target/linux/x86/Makefile
@@
-12,7
+12,7
@@
BOARDNAME:=x86
FEATURES:=squashfs jffs2 ext2 vdi
SUBTARGETS=generic
FEATURES:=squashfs jffs2 ext2 vdi
SUBTARGETS=generic
-LINUX_VERSION:=2.6.25.1
6
+LINUX_VERSION:=2.6.25.1
7
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += kmod-natsemi kmod-ne2k-pci