bump to 2.6.25.4, refresh kernel patches

SVN-Revision: 11199

diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile
index 648a3ae081ffea8ddd1dc20e52dcf94ef3145aa5..6351971455ec5c40ce488dc4a1267271cfc06844 100644 (file)
--- a/target/linux/au1000/Makefile
+++ b/target/linux/au1000/Makefile
@@ -1,4 +1,4 @@
-# 
+#
 # Copyright (C) 2006 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
@@ -11,7 +11,7 @@ BOARD:=au1000
 BOARDNAME:=RMI/AMD AU1x00
 FEATURES:=jffs2 usb pci
 
-LINUX_VERSION:=2.6.25
+LINUX_VERSION:=2.6.25.4
 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += yamonenv

diff --git a/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch b/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch
index 1e0ddef069fabdec6eb129ec20bfb4a7a14b461b..a99070dd4609cd85099e54f44e069e627fcbcf16 100644 (file)
--- a/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch
+++ b/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch
@@ -10,15 +10,12 @@ Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
  arch/mips/au1000/Kconfig |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
-diff --git a/arch/mips/au1000/Kconfig b/arch/mips/au1000/Kconfig
-index 29c95d9..f03b2eb 100644
---- a/arch/mips/au1000/Kconfig
-+++ b/arch/mips/au1000/Kconfig
-@@ -141,3 +141,4 @@ config SOC_AU1X00
+Index: linux-2.6.25.4/arch/mips/au1000/Kconfig
+===================================================================
+--- linux-2.6.25.4.orig/arch/mips/au1000/Kconfig
++++ linux-2.6.25.4/arch/mips/au1000/Kconfig
+@@ -135,3 +135,4 @@ config SOC_AU1X00
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_APM_EMULATION
        select SYS_SUPPORTS_KGDB
 +      select GENERIC_GPIO
--- 
-1.5.2.4
-

diff --git a/target/linux/au1000/patches/002-sys_btn_gpio.patch b/target/linux/au1000/patches/002-sys_btn_gpio.patch
index 741f557cfcb4c9197d2a2d8fb67bafcbff8383de..65102f26ad158ecf8248d3a3fa447039ba684757 100644 (file)
--- a/target/linux/au1000/patches/002-sys_btn_gpio.patch
+++ b/target/linux/au1000/patches/002-sys_btn_gpio.patch
@@ -2,11 +2,11 @@ This patch adds support for the GPIO connected system button on the MTX-1 boards
 
 Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
 ---
-diff --git a/arch/mips/au1000/mtx-1/platform.c b/arch/mips/au1000/mtx-1/platform.c
-index 49c0fb4..ce8637b 100644
---- a/arch/mips/au1000/mtx-1/platform.c
-+++ b/arch/mips/au1000/mtx-1/platform.c
-@@ -22,9 +22,32 @@
+Index: linux-2.6.25.4/arch/mips/au1000/mtx-1/platform.c
+===================================================================
+--- linux-2.6.25.4.orig/arch/mips/au1000/mtx-1/platform.c
++++ linux-2.6.25.4/arch/mips/au1000/mtx-1/platform.c
+@@ -23,9 +23,32 @@
  #include <linux/types.h>
  #include <linux/platform_device.h>
  #include <linux/leds.h>
@@ -38,10 +38,10 @@ index 49c0fb4..ce8637b 100644
 +
  static struct resource mtx1_wdt_res[] = {
        [0] = {
-               .start  = 15,
-@@ -66,11 +89,13 @@ static struct platform_device mtx1_gpio_leds = {
+               .start = 15,
+@@ -62,11 +85,13 @@ static struct platform_device mtx1_gpio_
  
- static struct __initdata platform_device * mtx1_devs[] = {
+ static struct platform_device *mtx1_devs[] = {
        &mtx1_gpio_leds,
 -      &mtx1_wdt
 +      &mtx1_wdt,

diff --git a/target/linux/au1000/patches/005-au1000_eth_link_beat.patch b/target/linux/au1000/patches/005-au1000_eth_link_beat.patch
index 946bd84540a4bf4cf82830b765c50efc6a5cf18b..9a7ec80fefa69b77646abd24f2078c5ee5802c15 100644 (file)
--- a/target/linux/au1000/patches/005-au1000_eth_link_beat.patch
+++ b/target/linux/au1000/patches/005-au1000_eth_link_beat.patch
@@ -1,7 +1,8 @@
-diff -urN linux-2.6.16.7/drivers/net/au1000_eth.c linux-2.6.16.7.new/drivers/net/au1000_eth.c
---- linux-2.6.16.7/drivers/net/au1000_eth.c    2006-04-17 23:53:25.000000000 +0200
-+++ linux-2.6.16.7.new/drivers/net/au1000_eth.c        2006-04-23 01:42:48.000000000 +0200
-@@ -12,6 +12,9 @@
+Index: linux-2.6.25.4/drivers/net/au1000_eth.c
+===================================================================
+--- linux-2.6.25.4.orig/drivers/net/au1000_eth.c
++++ linux-2.6.25.4/drivers/net/au1000_eth.c
+@@ -15,6 +15,9 @@
   * Author: MontaVista Software, Inc.
   *            ppopov@mvista.com or source@mvista.com
   *
@@ -11,9 +12,9 @@ diff -urN linux-2.6.16.7/drivers/net/au1000_eth.c linux-2.6.16.7.new/drivers/net
   * ########################################################################
   *
   *  This program is free software; you can distribute it and/or modify it
-@@ -1672,6 +1675,10 @@
-       aup->phy_ops->phy_status(dev, aup->phy_addr, &link, &speed);
-       control = MAC_DISABLE_RX_OWN | MAC_RX_ENABLE | MAC_TX_ENABLE;
+@@ -835,6 +838,10 @@ static int au1000_init(struct net_device
+ 
+       control = MAC_RX_ENABLE | MAC_TX_ENABLE;
  #ifndef CONFIG_CPU_LITTLE_ENDIAN
 +      /*riemer: fix for startup without cable */
 +      if (!link)
@@ -21,4 +22,4 @@ diff -urN linux-2.6.16.7/drivers/net/au1000_eth.c linux-2.6.16.7.new/drivers/net
 +
        control |= MAC_BIG_ENDIAN;
  #endif
-       if (link && (dev->if_port == IF_PORT_100BASEFX)) {
+       if (aup->phy_dev) {

diff --git a/target/linux/au1000/patches/012-mtx1_cmdline.patch b/target/linux/au1000/patches/012-mtx1_cmdline.patch
index 14b8e746ec354637a99390c63dc2603f664a141e..2ac4dd5a971a6eec7f0c528ed95a07d996927962 100644 (file)
--- a/target/linux/au1000/patches/012-mtx1_cmdline.patch
+++ b/target/linux/au1000/patches/012-mtx1_cmdline.patch
@@ -1,8 +1,10 @@
---- linux-2.6.19.2/arch/mips/au1000/mtx-1/init.c.old   2007-04-06 15:01:13.503777992 +0200
-+++ linux-2.6.19.2/arch/mips/au1000/mtx-1/init.c       2007-04-06 15:01:36.296313000 +0200
-@@ -59,7 +58,7 @@
-       mips_machgroup = MACH_GROUP_ALCHEMY;
-       mips_machtype = MACH_MTX1;      /* set the platform # */
+Index: linux-2.6.25.4/arch/mips/au1000/mtx-1/init.c
+===================================================================
+--- linux-2.6.25.4.orig/arch/mips/au1000/mtx-1/init.c
++++ linux-2.6.25.4/arch/mips/au1000/mtx-1/init.c
+@@ -54,7 +54,7 @@ void __init prom_init(void)
+       prom_argv = (char **) fw_arg1;
+       prom_envp = (char **) fw_arg2;
  
 -      prom_init_cmdline();
 +      strcpy(arcs_cmdline, CONFIG_CMDLINE);

diff --git a/target/linux/au1000/patches/013-openwrt_rootfs.patch b/target/linux/au1000/patches/013-openwrt_rootfs.patch
index 7793161af832570000b4b30246a8c5d89a8a93cb..3a3637397053b7b0b79d1b35ba7e2b58f6df1b3d 100644 (file)
--- a/target/linux/au1000/patches/013-openwrt_rootfs.patch
+++ b/target/linux/au1000/patches/013-openwrt_rootfs.patch
@@ -1,6 +1,8 @@
---- linux-2.6.19.2/drivers/mtd/maps/mtx-1_flash.c      2007-07-10 20:56:30.000000000 +0200
-+++ linux-2.6.19.2.new/drivers/mtd/maps/mtx-1_flash.c  2007-07-23 12:21:16.000000000 +0200
-@@ -28,7 +28,7 @@
+Index: linux-2.6.25.4/drivers/mtd/maps/mtx-1_flash.c
+===================================================================
+--- linux-2.6.25.4.orig/drivers/mtd/maps/mtx-1_flash.c
++++ linux-2.6.25.4/drivers/mtd/maps/mtx-1_flash.c
+@@ -28,7 +28,7 @@ static struct map_info mtx1_map = {
  
  static struct mtd_partition mtx1_partitions[] = {
          {

diff --git a/target/linux/au1000/patches/014-au1000_eth_ioctl.patch b/target/linux/au1000/patches/014-au1000_eth_ioctl.patch
index 6187a7d5afbeebb5cafce6120ac3e2606a748a5f..d8b3aecab414aeadcff63b8361c555da6765624e 100644 (file)
--- a/target/linux/au1000/patches/014-au1000_eth_ioctl.patch
+++ b/target/linux/au1000/patches/014-au1000_eth_ioctl.patch
@@ -1,6 +1,8 @@
---- linux-2.6.22.1.orig/drivers/net/au1000_eth.c       2007-07-24 18:43:25.527583520 +0200
-+++ linux-2.6.22.1/drivers/net/au1000_eth.c    2007-07-24 23:07:00.388821102 +0200
-@@ -1320,9 +1320,12 @@
+Index: linux-2.6.25.4/drivers/net/au1000_eth.c
+===================================================================
+--- linux-2.6.25.4.orig/drivers/net/au1000_eth.c
++++ linux-2.6.25.4/drivers/net/au1000_eth.c
+@@ -1306,9 +1306,12 @@ static void set_rx_mode(struct net_devic
        }
  }
  

diff --git a/target/linux/au1000/patches/015-pci-resource.patch b/target/linux/au1000/patches/015-pci-resource.patch
index a9497c7075f505a26f68c796bb3ebc42fcf0bebb..4f2158f95d893444a4e21762428aaf8e750f081f 100644 (file)
--- a/target/linux/au1000/patches/015-pci-resource.patch
+++ b/target/linux/au1000/patches/015-pci-resource.patch
@@ -1,7 +1,7 @@
-diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c
-index c93d7a6..6c25e6c 100644
---- a/arch/mips/au1000/common/pci.c
-+++ b/arch/mips/au1000/common/pci.c
+Index: linux-2.6.25.4/arch/mips/au1000/common/pci.c
+===================================================================
+--- linux-2.6.25.4.orig/arch/mips/au1000/common/pci.c
++++ linux-2.6.25.4/arch/mips/au1000/common/pci.c
 @@ -39,15 +39,15 @@
  
  /* TBD */