upgrade to 2.6.25.7, and refresh patches

SVN-Revision: 11523

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index c7804af97f37f7ff84128848ca7396c49f44dfee..1afc434895ad9ef90ec667f05ce76e2e4539ce69 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -25,8 +25,8 @@ 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.6)
-  LINUX_KERNEL_MD5SUM:=82f641f5774221bbc27dbd83a31c88f6
+ifeq ($(LINUX_VERSION),2.6.25.7)
+  LINUX_KERNEL_MD5SUM:=783551769cd104de0eac19bd78dc5ad7

 endif
 
 # disable the md5sum check for unknown kernel versions
 endif
 
 # disable the md5sum check for unknown kernel versions

diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile
index 1c6359933c20eebab8adf1c934bbbbf76b122083..d5e403f8ebcd23370612b75cf09afbf33865a0b8 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.25.6
+LINUX_VERSION:=2.6.25.7

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff b/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
index 16e21f84ddb0a489d638267a13e393a9a13f1c1d..7da22cd99c9cb25c66795f186253c0432598f60b 100644 (file)
--- a/target/linux/ar7/patches-2.6.25/900-temporary_cpmac_hack.diff
+++ b/target/linux/ar7/patches-2.6.25/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

-@@ -947,7 +947,8 @@
+@@ -936,7 +936,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;

-@@ -959,11 +960,11 @@
+@@ -948,11 +949,11 @@

                        priv->oldspeed = priv->phy->speed;
                }
  
                        priv->oldspeed = priv->phy->speed;
                }
  

diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile
index 1cb9de70a13d3d3e34de797ca4b7d2ee3ef61028..48c376d2ef3ef4b05b6b6da41ed9fa1a2cfd22fd 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.6
+LINUX_VERSION:=2.6.25.7

 
 include $(INCLUDE_DIR)/target.mk
 DEFAULT_PACKAGES += yamonenv
 
 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 a99070dd4609cd85099e54f44e069e627fcbcf16..bac9463e048096b8f2f1c9043ec58fb97891aee5 100644 (file)
--- a/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch
+++ b/target/linux/au1000/patches/001-au1000_gpio_kconfig.patch
@@ -10,11 +10,9 @@ Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
  arch/mips/au1000/Kconfig |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
  arch/mips/au1000/Kconfig |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 

-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
+--- a/arch/mips/au1000/Kconfig
++++ b/arch/mips/au1000/Kconfig
+@@ -135,3 +135,4 @@

        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_APM_EMULATION
        select SYS_SUPPORTS_KGDB
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_APM_EMULATION
        select SYS_SUPPORTS_KGDB

diff --git a/target/linux/au1000/patches/002-sys_btn_gpio.patch b/target/linux/au1000/patches/002-sys_btn_gpio.patch
index 65102f26ad158ecf8248d3a3fa447039ba684757..a3aa7ad6793db377c7f28cf45ed4269ddb665890 100644 (file)
--- a/target/linux/au1000/patches/002-sys_btn_gpio.patch
+++ b/target/linux/au1000/patches/002-sys_btn_gpio.patch
@@ -2,10 +2,8 @@ This patch adds support for the GPIO connected system button on the MTX-1 boards
 
 Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
 ---
 
 Signed-off-by: Florian Fainelli <florian.fainelli@telecomint.eu>
 ---

-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
+--- a/arch/mips/au1000/mtx-1/platform.c
++++ b/arch/mips/au1000/mtx-1/platform.c

 @@ -23,9 +23,32 @@
  #include <linux/types.h>
  #include <linux/platform_device.h>
 @@ -23,9 +23,32 @@
  #include <linux/types.h>
  #include <linux/platform_device.h>


@@ -39,7 +37,7 @@ Index: linux-2.6.25.4/arch/mips/au1000/mtx-1/platform.c
  static struct resource mtx1_wdt_res[] = {
        [0] = {
                .start = 15,
  static struct resource mtx1_wdt_res[] = {
        [0] = {
                .start = 15,

-@@ -62,11 +85,13 @@ static struct platform_device mtx1_gpio_
+@@ -62,11 +85,13 @@

  
  static struct platform_device *mtx1_devs[] = {
        &mtx1_gpio_leds,
  
  static struct platform_device *mtx1_devs[] = {
        &mtx1_gpio_leds,

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 9a7ec80fefa69b77646abd24f2078c5ee5802c15..8ba5f0024efdeeb5df97578c449042f29c7c4a14 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,5 @@
-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
+--- a/drivers/net/au1000_eth.c
++++ b/drivers/net/au1000_eth.c

 @@ -15,6 +15,9 @@
   * Author: MontaVista Software, Inc.
   *            ppopov@mvista.com or source@mvista.com
 @@ -15,6 +15,9 @@
   * Author: MontaVista Software, Inc.
   *            ppopov@mvista.com or source@mvista.com


@@ -12,7 +10,7 @@ Index: linux-2.6.25.4/drivers/net/au1000_eth.c
   * ########################################################################
   *
   *  This program is free software; you can distribute it and/or modify it
   * ########################################################################
   *
   *  This program is free software; you can distribute it and/or modify it

-@@ -835,6 +838,10 @@ static int au1000_init(struct net_device
+@@ -835,6 +838,10 @@

  
        control = MAC_RX_ENABLE | MAC_TX_ENABLE;
  #ifndef CONFIG_CPU_LITTLE_ENDIAN
  
        control = MAC_RX_ENABLE | MAC_TX_ENABLE;
  #ifndef CONFIG_CPU_LITTLE_ENDIAN

diff --git a/target/linux/au1000/patches/012-mtx1_cmdline.patch b/target/linux/au1000/patches/012-mtx1_cmdline.patch
index 2ac4dd5a971a6eec7f0c528ed95a07d996927962..ee8b541b811921929c612587e14ba3f69ea77554 100644 (file)
--- a/target/linux/au1000/patches/012-mtx1_cmdline.patch
+++ b/target/linux/au1000/patches/012-mtx1_cmdline.patch
@@ -1,8 +1,6 @@
-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)
+--- a/arch/mips/au1000/mtx-1/init.c
++++ b/arch/mips/au1000/mtx-1/init.c
+@@ -54,7 +54,7 @@

        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
  
        prom_argv = (char **) fw_arg1;
        prom_envp = (char **) fw_arg2;
  

diff --git a/target/linux/au1000/patches/013-openwrt_rootfs.patch b/target/linux/au1000/patches/013-openwrt_rootfs.patch
index 3a3637397053b7b0b79d1b35ba7e2b58f6df1b3d..414aa3958317552accbd5de7b2e442c2cb3ef56c 100644 (file)
--- a/target/linux/au1000/patches/013-openwrt_rootfs.patch
+++ b/target/linux/au1000/patches/013-openwrt_rootfs.patch
@@ -1,8 +1,6 @@
-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 = {
+--- a/drivers/mtd/maps/mtx-1_flash.c
++++ b/drivers/mtd/maps/mtx-1_flash.c
+@@ -28,7 +28,7 @@

  
  static struct mtd_partition mtx1_partitions[] = {
          {
  
  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 d8b3aecab414aeadcff63b8361c555da6765624e..ed308f8190d0975d4390b7652b5f61f0001ef952 100644 (file)
--- a/target/linux/au1000/patches/014-au1000_eth_ioctl.patch
+++ b/target/linux/au1000/patches/014-au1000_eth_ioctl.patch
@@ -1,8 +1,6 @@
-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
+--- a/drivers/net/au1000_eth.c
++++ b/drivers/net/au1000_eth.c
+@@ -1306,9 +1306,12 @@

        }
  }
  
        }
  }
  

diff --git a/target/linux/au1000/patches/015-pci-resource.patch b/target/linux/au1000/patches/015-pci-resource.patch
index 4f2158f95d893444a4e21762428aaf8e750f081f..7b0bc896b3703d8cde05b41e7549dfbd456742de 100644 (file)
--- a/target/linux/au1000/patches/015-pci-resource.patch
+++ b/target/linux/au1000/patches/015-pci-resource.patch
@@ -1,7 +1,5 @@
-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
+--- a/arch/mips/au1000/common/pci.c
++++ b/arch/mips/au1000/common/pci.c

 @@ -39,15 +39,15 @@
  
  /* TBD */
 @@ -39,15 +39,15 @@
  
  /* TBD */

diff --git a/target/linux/au1000/patches/016-net-irq.patch b/target/linux/au1000/patches/016-net-irq.patch
index 565e7a4dde429930792ee8bef468a1b487076c60..4ad718bf6e1a9eb0b6ed9f2b8fb09a6392232db7 100644 (file)
--- a/target/linux/au1000/patches/016-net-irq.patch
+++ b/target/linux/au1000/patches/016-net-irq.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.4/include/asm-mips/mach-au1x00/au1000.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/mach-au1x00/au1000.h  2008-06-06 20:51:08.000000000 +0100
-+++ linux-2.6.25.4/include/asm-mips/mach-au1x00/au1000.h       2008-06-06 20:51:48.000000000 +0100
+--- a/include/asm-mips/mach-au1x00/au1000.h
++++ b/include/asm-mips/mach-au1x00/au1000.h

 @@ -623,6 +623,7 @@
        AU1000_RTC_MATCH1_INT,
        AU1000_RTC_MATCH2_INT,
 @@ -623,6 +623,7 @@
        AU1000_RTC_MATCH1_INT,
        AU1000_RTC_MATCH2_INT,

diff --git a/target/linux/avr32/Makefile b/target/linux/avr32/Makefile
index 96c5a104b2c9fc923c67a00a424c53a3775c9e61..3df221e98d4cda756d0877e9461d05e3bf22f1f8 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.6
+LINUX_VERSION:=2.6.25.7

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile
index 06322d3a9da23e2fc5dd2f93c7712b47932f72b7..2a31f697cb86fdd207f79f73f411880300407a43 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.6
+LINUX_VERSION:=2.6.25.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/brcm47xx/patches-2.6.25/100-board_support.patch b/target/linux/brcm47xx/patches-2.6.25/100-board_support.patch
index 943b3341c173c89d5944cef75c797fe5adb5b992..783aa8c10d1314effbccf7787f4cb883c8853c16 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/100-board_support.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/100-board_support.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/arch/mips/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/Kconfig
-+++ linux-2.6.25.4/arch/mips/Kconfig
-@@ -50,8 +50,10 @@ config BCM47XX
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -50,8 +50,10 @@

        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SSB
        select SYS_SUPPORTS_32BIT_KERNEL
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select SSB


@@ -13,7 +11,7 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
        select SSB_PCICORE_HOSTMODE if PCI
        select GENERIC_GPIO
        select SYS_HAS_EARLY_PRINTK
        select SSB_PCICORE_HOSTMODE if PCI
        select GENERIC_GPIO
        select SYS_HAS_EARLY_PRINTK

-@@ -790,6 +792,7 @@ config CSRC_SB1250
+@@ -790,6 +792,7 @@

  
  config CFE
        bool
  
  config CFE
        bool


@@ -21,10 +19,8 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
  
  config DMA_COHERENT
        bool
  
  config DMA_COHERENT
        bool

-Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/bootinfo.h
-+++ linux-2.6.25.4/include/asm-mips/bootinfo.h
+--- a/include/asm-mips/bootinfo.h
++++ b/include/asm-mips/bootinfo.h

 @@ -94,6 +94,12 @@
  #define MACH_MSP7120_FPGA       5     /* PMC-Sierra MSP7120 Emulation */
  #define MACH_MSP_OTHER        255     /* PMC-Sierra unknown board type */
 @@ -94,6 +94,12 @@
  #define MACH_MSP7120_FPGA       5     /* PMC-Sierra MSP7120 Emulation */
  #define MACH_MSP_OTHER        255     /* PMC-Sierra unknown board type */


@@ -38,11 +34,9 @@ Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
  #define CL_SIZE                       COMMAND_LINE_SIZE
  
  extern char *system_type;
  #define CL_SIZE                       COMMAND_LINE_SIZE
  
  extern char *system_type;

-Index: linux-2.6.25.4/include/linux/pci_ids.h
-===================================================================
---- linux-2.6.25.4.orig/include/linux/pci_ids.h
-+++ linux-2.6.25.4/include/linux/pci_ids.h
-@@ -2000,6 +2000,7 @@
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -2001,6 +2001,7 @@

  #define PCI_DEVICE_ID_TIGON3_5906M    0x1713
  #define PCI_DEVICE_ID_BCM4401         0x4401
  #define PCI_DEVICE_ID_BCM4401B0               0x4402
  #define PCI_DEVICE_ID_TIGON3_5906M    0x1713
  #define PCI_DEVICE_ID_BCM4401         0x4401
  #define PCI_DEVICE_ID_BCM4401B0               0x4402

diff --git a/target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch b/target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch
index 3c16831f68206de429c123bf8d54a2d3e83855ce..14710831776f02db3d2b046f7a805b9e209204e4 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/110-flash_map.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/mtd/maps/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/maps/Kconfig
-+++ linux-2.6.25.4/drivers/mtd/maps/Kconfig
-@@ -337,6 +337,12 @@ config MTD_CFI_FLAGADM
+--- a/drivers/mtd/maps/Kconfig
++++ b/drivers/mtd/maps/Kconfig
+@@ -337,6 +337,12 @@

          Mapping for the Flaga digital module. If you don't have one, ignore
          this setting.
  
          Mapping for the Flaga digital module. If you don't have one, ignore
          this setting.
  


@@ -15,11 +13,9 @@ Index: linux-2.6.25.4/drivers/mtd/maps/Kconfig
  config MTD_WALNUT
        tristate "Flash device mapped on IBM 405GP Walnut"
        depends on MTD_JEDECPROBE && WALNUT && !PPC_MERGE
  config MTD_WALNUT
        tristate "Flash device mapped on IBM 405GP Walnut"
        depends on MTD_JEDECPROBE && WALNUT && !PPC_MERGE

-Index: linux-2.6.25.4/drivers/mtd/maps/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/maps/Makefile
-+++ linux-2.6.25.4/drivers/mtd/maps/Makefile
-@@ -31,6 +31,7 @@ obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcm
+--- a/drivers/mtd/maps/Makefile
++++ b/drivers/mtd/maps/Makefile
+@@ -31,6 +31,7 @@

  obj-$(CONFIG_MTD_PCMCIA)      += pcmciamtd.o
  obj-$(CONFIG_MTD_RPXLITE)     += rpxlite.o
  obj-$(CONFIG_MTD_TQM8XXL)     += tqm8xxl.o
  obj-$(CONFIG_MTD_PCMCIA)      += pcmciamtd.o
  obj-$(CONFIG_MTD_RPXLITE)     += rpxlite.o
  obj-$(CONFIG_MTD_TQM8XXL)     += tqm8xxl.o

diff --git a/target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch b/target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch
index 7d215a1a97ffb09973ce07acf22019ea7950281d..d36b4d8307e921a84763bea1e29d26adaa307049 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/130-remove_scache.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/arch/mips/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/Kconfig
-+++ linux-2.6.25.4/arch/mips/Kconfig
-@@ -228,7 +228,6 @@ config MIPS_MALTA
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -228,7 +228,6 @@

        select I8259
        select MIPS_BOARDS_GEN
        select MIPS_BONITO64
        select I8259
        select MIPS_BOARDS_GEN
        select MIPS_BONITO64


@@ -10,7 +8,7 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
        select PCI_GT64XXX_PCI0
        select MIPS_MSC
        select SWAP_IO_SPACE
        select PCI_GT64XXX_PCI0
        select MIPS_MSC
        select SWAP_IO_SPACE

-@@ -1421,13 +1420,6 @@ config IP22_CPU_SCACHE
+@@ -1421,13 +1420,6 @@

        bool
        select BOARD_SCACHE
  
        bool
        select BOARD_SCACHE
  


@@ -24,11 +22,9 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
  config R5000_CPU_SCACHE
        bool
        select BOARD_SCACHE
  config R5000_CPU_SCACHE
        bool
        select BOARD_SCACHE

-Index: linux-2.6.25.4/arch/mips/kernel/cpu-probe.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/kernel/cpu-probe.c
-+++ linux-2.6.25.4/arch/mips/kernel/cpu-probe.c
-@@ -704,6 +704,8 @@ static inline void cpu_probe_mips(struct
+--- a/arch/mips/kernel/cpu-probe.c
++++ b/arch/mips/kernel/cpu-probe.c
+@@ -704,6 +704,8 @@

                break;
        case PRID_IMP_25KF:
                c->cputype = CPU_25KF;
                break;
        case PRID_IMP_25KF:
                c->cputype = CPU_25KF;


@@ -37,11 +33,9 @@ Index: linux-2.6.25.4/arch/mips/kernel/cpu-probe.c
                break;
        case PRID_IMP_34K:
                c->cputype = CPU_34K;
                break;
        case PRID_IMP_34K:
                c->cputype = CPU_34K;

-Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/mm/c-r4k.c
-+++ linux-2.6.25.4/arch/mips/mm/c-r4k.c
-@@ -1103,7 +1103,6 @@ static void __init loongson2_sc_init(voi
+--- a/arch/mips/mm/c-r4k.c
++++ b/arch/mips/mm/c-r4k.c
+@@ -1103,7 +1103,6 @@

  
  extern int r5k_sc_init(void);
  extern int rm7k_sc_init(void);
  
  extern int r5k_sc_init(void);
  extern int rm7k_sc_init(void);


@@ -49,7 +43,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
  
  static void __cpuinit setup_scache(void)
  {
  
  static void __cpuinit setup_scache(void)
  {

-@@ -1157,29 +1156,17 @@ static void __cpuinit setup_scache(void)
+@@ -1157,29 +1156,17 @@

  #endif
  
        default:
  #endif
  
        default:


@@ -84,11 +78,9 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
        /* compute a couple of other cache variables */
        c->scache.waysize = scache_size / c->scache.ways;
  
        /* compute a couple of other cache variables */
        c->scache.waysize = scache_size / c->scache.ways;
  

-Index: linux-2.6.25.4/arch/mips/mm/Makefile
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/mm/Makefile
-+++ linux-2.6.25.4/arch/mips/mm/Makefile
-@@ -32,6 +32,5 @@ obj-$(CONFIG_CPU_VR41XX)     += c-r4k.o cex-
+--- a/arch/mips/mm/Makefile
++++ b/arch/mips/mm/Makefile
+@@ -32,6 +32,5 @@

  obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
  obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o
  obj-$(CONFIG_RM7000_CPU_SCACHE)       += sc-rm7k.o
  obj-$(CONFIG_IP22_CPU_SCACHE) += sc-ip22.o
  obj-$(CONFIG_R5000_CPU_SCACHE)  += sc-r5k.o
  obj-$(CONFIG_RM7000_CPU_SCACHE)       += sc-rm7k.o

diff --git a/target/linux/brcm47xx/patches-2.6.25/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.25/150-cpu_fixes.patch
index fb91dfae742ea26de8c587e65df99bd3def49be1..e0d225b154b43aecabcfffb641a519dad8bc1cb7 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/150-cpu_fixes.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/150-cpu_fixes.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/arch/mips/kernel/genex.S
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/kernel/genex.S
-+++ linux-2.6.25.4/arch/mips/kernel/genex.S
-@@ -51,6 +51,10 @@ NESTED(except_vec1_generic, 0, sp)
+--- a/arch/mips/kernel/genex.S
++++ b/arch/mips/kernel/genex.S
+@@ -51,6 +51,10 @@

  NESTED(except_vec3_generic, 0, sp)
        .set    push
        .set    noat
  NESTED(except_vec3_generic, 0, sp)
        .set    push
        .set    noat


@@ -13,10 +11,8 @@ Index: linux-2.6.25.4/arch/mips/kernel/genex.S
  #if R5432_CP0_INTERRUPT_WAR
        mfc0    k0, CP0_INDEX
  #endif
  #if R5432_CP0_INTERRUPT_WAR
        mfc0    k0, CP0_INDEX
  #endif

-Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/mm/c-r4k.c
-+++ linux-2.6.25.4/arch/mips/mm/c-r4k.c
+--- a/arch/mips/mm/c-r4k.c
++++ b/arch/mips/mm/c-r4k.c

 @@ -33,6 +33,9 @@
  #include <asm/cacheflush.h> /* for run_uncached() */
  
 @@ -33,6 +33,9 @@
  #include <asm/cacheflush.h> /* for run_uncached() */
  


@@ -27,7 +23,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
  /*
   * Special Variant of smp_call_function for use by cache functions:
   *
  /*
   * Special Variant of smp_call_function for use by cache functions:
   *

-@@ -97,6 +100,9 @@ static void __cpuinit r4k_blast_dcache_p
+@@ -97,6 +100,9 @@

  {
        unsigned long  dc_lsize = cpu_dcache_line_size();
  
  {
        unsigned long  dc_lsize = cpu_dcache_line_size();
  


@@ -37,7 +33,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
        if (dc_lsize == 0)
                r4k_blast_dcache_page = (void *)cache_noop;
        else if (dc_lsize == 16)
        if (dc_lsize == 0)
                r4k_blast_dcache_page = (void *)cache_noop;
        else if (dc_lsize == 16)

-@@ -111,6 +117,9 @@ static void __cpuinit r4k_blast_dcache_p
+@@ -111,6 +117,9 @@

  {
        unsigned long dc_lsize = cpu_dcache_line_size();
  
  {
        unsigned long dc_lsize = cpu_dcache_line_size();
  


@@ -47,7 +43,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
        if (dc_lsize == 0)
                r4k_blast_dcache_page_indexed = (void *)cache_noop;
        else if (dc_lsize == 16)
        if (dc_lsize == 0)
                r4k_blast_dcache_page_indexed = (void *)cache_noop;
        else if (dc_lsize == 16)

-@@ -125,6 +134,9 @@ static void __cpuinit r4k_blast_dcache_s
+@@ -125,6 +134,9 @@

  {
        unsigned long dc_lsize = cpu_dcache_line_size();
  
  {
        unsigned long dc_lsize = cpu_dcache_line_size();
  


@@ -57,7 +53,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
        if (dc_lsize == 0)
                r4k_blast_dcache = (void *)cache_noop;
        else if (dc_lsize == 16)
        if (dc_lsize == 0)
                r4k_blast_dcache = (void *)cache_noop;
        else if (dc_lsize == 16)

-@@ -630,6 +642,8 @@ static void local_r4k_flush_cache_sigtra
+@@ -630,6 +642,8 @@

        unsigned long addr = (unsigned long) arg;
  
        R4600_HIT_CACHEOP_WAR_IMPL;
        unsigned long addr = (unsigned long) arg;
  
        R4600_HIT_CACHEOP_WAR_IMPL;


@@ -66,7 +62,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
        if (dc_lsize)
                protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
        if (!cpu_icache_snoops_remote_store && scache_size)
        if (dc_lsize)
                protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
        if (!cpu_icache_snoops_remote_store && scache_size)

-@@ -1215,6 +1229,17 @@ static void __cpuinit coherency_setup(vo
+@@ -1215,6 +1229,17 @@

         * silly idea of putting something else there ...
         */
        switch (current_cpu_type()) {
         * silly idea of putting something else there ...
         */
        switch (current_cpu_type()) {


@@ -84,7 +80,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
        case CPU_R4000PC:
        case CPU_R4000SC:
        case CPU_R4000MC:
        case CPU_R4000PC:
        case CPU_R4000SC:
        case CPU_R4000MC:

-@@ -1254,6 +1279,15 @@ void __cpuinit r4k_cache_init(void)
+@@ -1254,6 +1279,15 @@

                break;
        }
  
                break;
        }
  


@@ -100,7 +96,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
        probe_pcache();
        setup_scache();
  
        probe_pcache();
        setup_scache();
  

-@@ -1303,5 +1337,13 @@ void __cpuinit r4k_cache_init(void)
+@@ -1303,5 +1337,13 @@

        build_clear_page();
        build_copy_page();
        local_r4k___flush_cache_all(NULL);
        build_clear_page();
        build_copy_page();
        local_r4k___flush_cache_all(NULL);


@@ -114,11 +110,9 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
        coherency_setup();
 +#endif
  }
        coherency_setup();
 +#endif
  }

-Index: linux-2.6.25.4/arch/mips/mm/tlbex.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/mm/tlbex.c
-+++ linux-2.6.25.4/arch/mips/mm/tlbex.c
-@@ -677,6 +677,9 @@ static void __cpuinit build_r4000_tlb_re
+--- a/arch/mips/mm/tlbex.c
++++ b/arch/mips/mm/tlbex.c
+@@ -677,6 +677,9 @@

                /* No need for uasm_i_nop */
        }
  
                /* No need for uasm_i_nop */
        }
  


@@ -128,7 +122,7 @@ Index: linux-2.6.25.4/arch/mips/mm/tlbex.c
  #ifdef CONFIG_64BIT
        build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
  #else
  #ifdef CONFIG_64BIT
        build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
  #else

-@@ -1084,6 +1087,9 @@ build_r4000_tlbchange_handler_head(u32 *
+@@ -1084,6 +1087,9 @@

                                   struct uasm_reloc **r, unsigned int pte,
                                   unsigned int ptr)
  {
                                   struct uasm_reloc **r, unsigned int pte,
                                   unsigned int ptr)
  {


@@ -138,10 +132,8 @@ Index: linux-2.6.25.4/arch/mips/mm/tlbex.c
  #ifdef CONFIG_64BIT
        build_get_pmde64(p, l, r, pte, ptr); /* get pmd in ptr */
  #else
  #ifdef CONFIG_64BIT
        build_get_pmde64(p, l, r, pte, ptr); /* get pmd in ptr */
  #else

-Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/r4kcache.h
-+++ linux-2.6.25.4/include/asm-mips/r4kcache.h
+--- a/include/asm-mips/r4kcache.h
++++ b/include/asm-mips/r4kcache.h

 @@ -17,6 +17,20 @@
  #include <asm/cpu-features.h>
  #include <asm/mipsmtregs.h>
 @@ -17,6 +17,20 @@
  #include <asm/cpu-features.h>
  #include <asm/mipsmtregs.h>


@@ -163,7 +155,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
  /*
   * This macro return a properly sign-extended address suitable as base address
   * for indexed cache operations.  Two issues here:
  /*
   * This macro return a properly sign-extended address suitable as base address
   * for indexed cache operations.  Two issues here:

-@@ -150,6 +164,7 @@ static inline void flush_icache_line_ind
+@@ -150,6 +164,7 @@

  static inline void flush_dcache_line_indexed(unsigned long addr)
  {
        __dflush_prologue
  static inline void flush_dcache_line_indexed(unsigned long addr)
  {
        __dflush_prologue


@@ -171,7 +163,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
        cache_op(Index_Writeback_Inv_D, addr);
        __dflush_epilogue
  }
        cache_op(Index_Writeback_Inv_D, addr);
        __dflush_epilogue
  }

-@@ -169,6 +184,7 @@ static inline void flush_icache_line(uns
+@@ -169,6 +184,7 @@

  static inline void flush_dcache_line(unsigned long addr)
  {
        __dflush_prologue
  static inline void flush_dcache_line(unsigned long addr)
  {
        __dflush_prologue


@@ -179,7 +171,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
        cache_op(Hit_Writeback_Inv_D, addr);
        __dflush_epilogue
  }
        cache_op(Hit_Writeback_Inv_D, addr);
        __dflush_epilogue
  }

-@@ -176,6 +192,7 @@ static inline void flush_dcache_line(uns
+@@ -176,6 +192,7 @@

  static inline void invalidate_dcache_line(unsigned long addr)
  {
        __dflush_prologue
  static inline void invalidate_dcache_line(unsigned long addr)
  {
        __dflush_prologue


@@ -187,7 +179,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
        cache_op(Hit_Invalidate_D, addr);
        __dflush_epilogue
  }
        cache_op(Hit_Invalidate_D, addr);
        __dflush_epilogue
  }

-@@ -208,6 +225,7 @@ static inline void flush_scache_line(uns
+@@ -208,6 +225,7 @@

   */
  static inline void protected_flush_icache_line(unsigned long addr)
  {
   */
  static inline void protected_flush_icache_line(unsigned long addr)
  {


@@ -195,7 +187,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
        protected_cache_op(Hit_Invalidate_I, addr);
  }
  
        protected_cache_op(Hit_Invalidate_I, addr);
  }
  

-@@ -219,6 +237,7 @@ static inline void protected_flush_icach
+@@ -219,6 +237,7 @@

   */
  static inline void protected_writeback_dcache_line(unsigned long addr)
  {
   */
  static inline void protected_writeback_dcache_line(unsigned long addr)
  {


@@ -203,7 +195,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
        protected_cache_op(Hit_Writeback_Inv_D, addr);
  }
  
        protected_cache_op(Hit_Writeback_Inv_D, addr);
  }
  

-@@ -339,8 +358,52 @@ static inline void invalidate_tcache_pag
+@@ -339,8 +358,52 @@

                : "r" (base),                                           \
                  "i" (op));
  
                : "r" (base),                                           \
                  "i" (op));
  


@@ -257,7 +249,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
  static inline void blast_##pfx##cache##lsize(void)                    \
  {                                                                     \
        unsigned long start = INDEX_BASE;                               \
  static inline void blast_##pfx##cache##lsize(void)                    \
  {                                                                     \
        unsigned long start = INDEX_BASE;                               \

-@@ -352,6 +415,7 @@ static inline void blast_##pfx##cache##l
+@@ -352,6 +415,7 @@

                                                                        \
        __##pfx##flush_prologue                                         \
                                                                        \
                                                                        \
        __##pfx##flush_prologue                                         \
                                                                        \


@@ -265,7 +257,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
        for (ws = 0; ws < ws_end; ws += ws_inc)                         \
                for (addr = start; addr < end; addr += lsize * 32)      \
                        cache##lsize##_unroll32(addr|ws, indexop);      \
        for (ws = 0; ws < ws_end; ws += ws_inc)                         \
                for (addr = start; addr < end; addr += lsize * 32)      \
                        cache##lsize##_unroll32(addr|ws, indexop);      \

-@@ -366,6 +430,7 @@ static inline void blast_##pfx##cache##l
+@@ -366,6 +430,7 @@

                                                                        \
        __##pfx##flush_prologue                                         \
                                                                        \
                                                                        \
        __##pfx##flush_prologue                                         \
                                                                        \


@@ -273,7 +265,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
        do {                                                            \
                cache##lsize##_unroll32(start, hitop);                  \
                start += lsize * 32;                                    \
        do {                                                            \
                cache##lsize##_unroll32(start, hitop);                  \
                start += lsize * 32;                                    \

-@@ -384,6 +449,8 @@ static inline void blast_##pfx##cache##l
+@@ -384,6 +449,8 @@

                               current_cpu_data.desc.waybit;            \
        unsigned long ws, addr;                                         \
                                                                        \
                               current_cpu_data.desc.waybit;            \
        unsigned long ws, addr;                                         \
                                                                        \


@@ -282,7 +274,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
        __##pfx##flush_prologue                                         \
                                                                        \
        for (ws = 0; ws < ws_end; ws += ws_inc)                         \
        __##pfx##flush_prologue                                         \
                                                                        \
        for (ws = 0; ws < ws_end; ws += ws_inc)                         \

-@@ -393,35 +460,37 @@ static inline void blast_##pfx##cache##l
+@@ -393,35 +460,37 @@

        __##pfx##flush_epilogue                                         \
  }
  
        __##pfx##flush_epilogue                                         \
  }
  


@@ -337,7 +329,7 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
                prot##cache_op(hitop, addr);                            \
                if (addr == aend)                                       \
                        break;                                          \
                prot##cache_op(hitop, addr);                            \
                if (addr == aend)                                       \
                        break;                                          \

-@@ -431,13 +500,13 @@ static inline void prot##blast_##pfx##ca
+@@ -431,13 +500,13 @@

        __##pfx##flush_epilogue                                         \
  }
  
        __##pfx##flush_epilogue                                         \
  }
  


@@ -358,10 +350,8 @@ Index: linux-2.6.25.4/include/asm-mips/r4kcache.h
 +__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD,,, )
  
  #endif /* _ASM_R4KCACHE_H */
 +__BUILD_BLAST_CACHE_RANGE(inv_s, scache, Hit_Invalidate_SD,,, )
  
  #endif /* _ASM_R4KCACHE_H */

-Index: linux-2.6.25.4/include/asm-mips/stackframe.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/stackframe.h
-+++ linux-2.6.25.4/include/asm-mips/stackframe.h
+--- a/include/asm-mips/stackframe.h
++++ b/include/asm-mips/stackframe.h

 @@ -359,6 +359,10 @@
                .macro  RESTORE_SP_AND_RET
                LONG_L  sp, PT_R29(sp)
 @@ -359,6 +359,10 @@
                .macro  RESTORE_SP_AND_RET
                LONG_L  sp, PT_R29(sp)

diff --git a/target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch b/target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch
index 3db02d663d104d494e76fe722f82b26f5e06090f..725fb3c7ed566801244783796024e14a8fa320dd 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/160-kmap_coherent.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/arch/mips/mm/init.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/mm/init.c
-+++ linux-2.6.25.4/arch/mips/mm/init.c
-@@ -211,7 +211,7 @@ void copy_user_highpage(struct page *to,
+--- a/arch/mips/mm/init.c
++++ b/arch/mips/mm/init.c
+@@ -211,7 +211,7 @@

        void *vfrom, *vto;
  
        vto = kmap_atomic(to, KM_USER1);
        void *vfrom, *vto;
  
        vto = kmap_atomic(to, KM_USER1);


@@ -11,7 +9,7 @@ Index: linux-2.6.25.4/arch/mips/mm/init.c
            page_mapped(from) && !Page_dcache_dirty(from)) {
                vfrom = kmap_coherent(from, vaddr);
                copy_page(vto, vfrom);
            page_mapped(from) && !Page_dcache_dirty(from)) {
                vfrom = kmap_coherent(from, vaddr);
                copy_page(vto, vfrom);

-@@ -235,7 +235,7 @@ void copy_to_user_page(struct vm_area_st
+@@ -235,7 +235,7 @@

        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
  {
        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
  {


@@ -20,7 +18,7 @@ Index: linux-2.6.25.4/arch/mips/mm/init.c
            page_mapped(page) && !Page_dcache_dirty(page)) {
                void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
                memcpy(vto, src, len);
            page_mapped(page) && !Page_dcache_dirty(page)) {
                void *vto = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
                memcpy(vto, src, len);

-@@ -255,7 +255,7 @@ void copy_from_user_page(struct vm_area_
+@@ -255,7 +255,7 @@

        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
  {
        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
  {


@@ -29,10 +27,8 @@ Index: linux-2.6.25.4/arch/mips/mm/init.c
            page_mapped(page) && !Page_dcache_dirty(page)) {
                void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
                memcpy(dst, vfrom, len);
            page_mapped(page) && !Page_dcache_dirty(page)) {
                void *vfrom = kmap_coherent(page, vaddr) + (vaddr & ~PAGE_MASK);
                memcpy(dst, vfrom, len);

-Index: linux-2.6.25.4/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h
-===================================================================

 --- /dev/null
 --- /dev/null

-+++ linux-2.6.25.4/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h
++++ b/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h

 @@ -0,0 +1,13 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public
 @@ -0,0 +1,13 @@
 +/*
 + * This file is subject to the terms and conditions of the GNU General Public


@@ -47,10 +43,8 @@ Index: linux-2.6.25.4/include/asm-mips/mach-bcm47xx/cpu-feature-overrides.h
 +#define cpu_use_kmap_coherent 0
 +
 +#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */
 +#define cpu_use_kmap_coherent 0
 +
 +#endif /* __ASM_MACH_BCM47XX_CPU_FEATURE_OVERRIDES_H */

-Index: linux-2.6.25.4/include/asm-mips/cpu-features.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/cpu-features.h
-+++ linux-2.6.25.4/include/asm-mips/cpu-features.h
+--- a/include/asm-mips/cpu-features.h
++++ b/include/asm-mips/cpu-features.h

 @@ -101,6 +101,9 @@
  #ifndef cpu_has_pindexed_dcache
  #define cpu_has_pindexed_dcache       (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)
 @@ -101,6 +101,9 @@
  #ifndef cpu_has_pindexed_dcache
  #define cpu_has_pindexed_dcache       (cpu_data[0].dcache.flags & MIPS_CACHE_PINDEX)


@@ -61,11 +55,9 @@ Index: linux-2.6.25.4/include/asm-mips/cpu-features.h
  
  /*
   * I-Cache snoops remote store.  This only matters on SMP.  Some multiprocessors
  
  /*
   * I-Cache snoops remote store.  This only matters on SMP.  Some multiprocessors

-Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/mm/c-r4k.c
-+++ linux-2.6.25.4/arch/mips/mm/c-r4k.c
-@@ -484,7 +484,7 @@ static inline void local_r4k_flush_cache
+--- a/arch/mips/mm/c-r4k.c
++++ b/arch/mips/mm/c-r4k.c
+@@ -484,7 +484,7 @@

                 * Use kmap_coherent or kmap_atomic to do flushes for
                 * another ASID than the current one.
                 */
                 * Use kmap_coherent or kmap_atomic to do flushes for
                 * another ASID than the current one.
                 */


@@ -74,7 +66,7 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
                        vaddr = kmap_coherent(page, addr);
                else
                        vaddr = kmap_atomic(page, KM_USER0);
                        vaddr = kmap_coherent(page, addr);
                else
                        vaddr = kmap_atomic(page, KM_USER0);

-@@ -505,7 +505,7 @@ static inline void local_r4k_flush_cache
+@@ -505,7 +505,7 @@

        }
  
        if (vaddr) {
        }
  
        if (vaddr) {

diff --git a/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch b/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch
index 6e6f10e4c5bd094b527f3eea089890aa6c69681e..8658d6d2551e60d2b1f890a6b90f66fa903c93fb 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/220-bcm5354.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/ssb/driver_chipcommon.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/driver_chipcommon.c
-+++ linux-2.6.25.4/drivers/ssb/driver_chipcommon.c
-@@ -270,6 +270,8 @@ void ssb_chipco_resume(struct ssb_chipco
+--- a/drivers/ssb/driver_chipcommon.c
++++ b/drivers/ssb/driver_chipcommon.c
+@@ -270,6 +270,8 @@

  void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
                               u32 *plltype, u32 *n, u32 *m)
  {
  void ssb_chipco_get_clockcpu(struct ssb_chipcommon *cc,
                               u32 *plltype, u32 *n, u32 *m)
  {


@@ -11,7 +9,7 @@ Index: linux-2.6.25.4/drivers/ssb/driver_chipcommon.c
        *n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
        *plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
        switch (*plltype) {
        *n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
        *plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
        switch (*plltype) {

-@@ -293,6 +295,8 @@ void ssb_chipco_get_clockcpu(struct ssb_
+@@ -293,6 +295,8 @@

  void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
                                 u32 *plltype, u32 *n, u32 *m)
  {
  void ssb_chipco_get_clockcontrol(struct ssb_chipcommon *cc,
                                 u32 *plltype, u32 *n, u32 *m)
  {


@@ -20,11 +18,9 @@ Index: linux-2.6.25.4/drivers/ssb/driver_chipcommon.c
        *n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
        *plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
        switch (*plltype) {
        *n = chipco_read32(cc, SSB_CHIPCO_CLOCK_N);
        *plltype = (cc->capabilities & SSB_CHIPCO_CAP_PLLT);
        switch (*plltype) {

-Index: linux-2.6.25.4/drivers/ssb/driver_mipscore.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/driver_mipscore.c
-+++ linux-2.6.25.4/drivers/ssb/driver_mipscore.c
-@@ -161,6 +161,8 @@ u32 ssb_cpu_clock(struct ssb_mipscore *m
+--- a/drivers/ssb/driver_mipscore.c
++++ b/drivers/ssb/driver_mipscore.c
+@@ -161,6 +161,8 @@

  
        if ((pll_type == SSB_PLLTYPE_5) || (bus->chip_id == 0x5365)) {
                rate = 200000000;
  
        if ((pll_type == SSB_PLLTYPE_5) || (bus->chip_id == 0x5365)) {
                rate = 200000000;


@@ -33,11 +29,9 @@ Index: linux-2.6.25.4/drivers/ssb/driver_mipscore.c
        } else {
                rate = ssb_calc_clock_rate(pll_type, n, m);
        }
        } else {
                rate = ssb_calc_clock_rate(pll_type, n, m);
        }

-Index: linux-2.6.25.4/drivers/ssb/main.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/main.c
-+++ linux-2.6.25.4/drivers/ssb/main.c
-@@ -867,6 +867,8 @@ u32 ssb_clockspeed(struct ssb_bus *bus)
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -867,6 +867,8 @@

  
        if (bus->chip_id == 0x5365) {
                rate = 100000000;
  
        if (bus->chip_id == 0x5365) {
                rate = 100000000;

diff --git a/target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch b/target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch
index c33af0071d866cddf92a17baf69116dd9fdfa785..f599ca773cd5f9e5cbfbd2af7de67a1435ba6163 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/250-ohci-ssb-usb2.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/usb/host/ohci-ssb.c
-+++ linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
-@@ -142,10 +142,59 @@ static int ssb_ohci_attach(struct ssb_de
+--- a/drivers/usb/host/ohci-ssb.c
++++ b/drivers/usb/host/ohci-ssb.c
+@@ -142,10 +142,59 @@

        int err = -ENOMEM;
        u32 tmp, flags = 0;
  
        int err = -ENOMEM;
        u32 tmp, flags = 0;
  


@@ -64,7 +62,7 @@ Index: linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
  
        hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
                        dev->dev->bus_id);
  
        hcd = usb_create_hcd(&ssb_ohci_hc_driver, dev->dev,
                        dev->dev->bus_id);

-@@ -236,6 +285,7 @@ static int ssb_ohci_resume(struct ssb_de
+@@ -236,6 +285,7 @@

  static const struct ssb_device_id ssb_ohci_table[] = {
        SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
        SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),
  static const struct ssb_device_id ssb_ohci_table[] = {
        SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOSTDEV, SSB_ANY_REV),
        SSB_DEVICE(SSB_VENDOR_BROADCOM, SSB_DEV_USB11_HOST, SSB_ANY_REV),

diff --git a/target/linux/brcm47xx/patches-2.6.25/260-ohci-set-dma-mask.patch b/target/linux/brcm47xx/patches-2.6.25/260-ohci-set-dma-mask.patch
index a2a01df6a9eda2813169abc52ef22efce4680d07..21fac47407b38cff8cce4e56958d87f779c24b5e 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/260-ohci-set-dma-mask.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/260-ohci-set-dma-mask.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/usb/host/ohci-ssb.c
-+++ linux-2.6.25.4/drivers/usb/host/ohci-ssb.c
-@@ -195,6 +195,11 @@ static int ssb_ohci_attach(struct ssb_de
+--- a/drivers/usb/host/ohci-ssb.c
++++ b/drivers/usb/host/ohci-ssb.c
+@@ -195,6 +195,11 @@

        else
                ssb_device_enable(dev, 0);
  
        else
                ssb_device_enable(dev, 0);
  

diff --git a/target/linux/brcm47xx/patches-2.6.25/300-fork_cacheflush.patch b/target/linux/brcm47xx/patches-2.6.25/300-fork_cacheflush.patch
index 93a7ac86f2accc7d10487513af9ee38d67df453d..f5b5d776821c7ae474164a335e35ae8520c94756 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/300-fork_cacheflush.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/300-fork_cacheflush.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.4/include/asm-mips/cacheflush.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/cacheflush.h
-+++ linux-2.6.25.4/include/asm-mips/cacheflush.h
+--- a/include/asm-mips/cacheflush.h
++++ b/include/asm-mips/cacheflush.h

 @@ -32,7 +32,7 @@
  extern void (*flush_cache_all)(void);
  extern void (*__flush_cache_all)(void);
 @@ -32,7 +32,7 @@
  extern void (*flush_cache_all)(void);
  extern void (*__flush_cache_all)(void);

diff --git a/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch b/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch
index fc25172dd24ccec23c2820018bbe5a62754b168d..a2c27ab7c7f998e613467f244c46d6b90330b5d0 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/310-no_highpage.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/arch/mips/mm/init.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/mm/init.c
-+++ linux-2.6.25.4/arch/mips/mm/init.c
-@@ -205,32 +205,6 @@ void kunmap_coherent(void)
+--- a/arch/mips/mm/init.c
++++ b/arch/mips/mm/init.c
+@@ -205,32 +205,6 @@

        preempt_check_resched();
  }
  
        preempt_check_resched();
  }
  


@@ -35,10 +33,8 @@ Index: linux-2.6.25.4/arch/mips/mm/init.c
  void copy_to_user_page(struct vm_area_struct *vma,
        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)
  void copy_to_user_page(struct vm_area_struct *vma,
        struct page *page, unsigned long vaddr, void *dst, const void *src,
        unsigned long len)

-Index: linux-2.6.25.4/include/asm-mips/page.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/page.h
-+++ linux-2.6.25.4/include/asm-mips/page.h
+--- a/include/asm-mips/page.h
++++ b/include/asm-mips/page.h

 @@ -32,6 +32,7 @@
  #ifndef __ASSEMBLY__
  
 @@ -32,6 +32,7 @@
  #ifndef __ASSEMBLY__
  


@@ -47,7 +43,7 @@ Index: linux-2.6.25.4/include/asm-mips/page.h
  #include <asm/io.h>
  
  /*
  #include <asm/io.h>
  
  /*

-@@ -64,13 +65,16 @@ static inline void clear_user_page(void 
+@@ -64,13 +65,16 @@

                flush_data_cache_page((unsigned long)addr);
  }
  
                flush_data_cache_page((unsigned long)addr);
  }
  

diff --git a/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch b/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch
index 78dc4dafddb04782da11469daa686a1cdd315558..fb69cc4aab0336742efe33cd79b0db67fde35201 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/400-arch-bcm47xx.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.4/arch/mips/bcm47xx/irq.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm47xx/irq.c
-+++ linux-2.6.25.4/arch/mips/bcm47xx/irq.c
+--- a/arch/mips/bcm47xx/irq.c
++++ b/arch/mips/bcm47xx/irq.c

 @@ -1,5 +1,6 @@
  /*
   *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
 @@ -1,5 +1,6 @@
  /*
   *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>


@@ -29,7 +27,7 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/irq.c
  void plat_irq_dispatch(void)
  {
        u32 cause;
  void plat_irq_dispatch(void)
  {
        u32 cause;

-@@ -53,3 +63,19 @@ void __init arch_init_irq(void)
+@@ -53,3 +63,19 @@

  {
        mips_cpu_irq_init();
  }
  {
        mips_cpu_irq_init();
  }


@@ -49,10 +47,8 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/irq.c
 +
 +      return res;
 +}
 +
 +      return res;
 +}

-Index: linux-2.6.25.4/arch/mips/bcm47xx/setup.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm47xx/setup.c
-+++ linux-2.6.25.4/arch/mips/bcm47xx/setup.c
+--- 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>
 @@ -2,7 +2,7 @@
   *  Copyright (C) 2004 Florian Schirmer <jolt@tuxbox.org>
   *  Copyright (C) 2005 Waldemar Brodkorb <wbx@openwrt.org>


@@ -119,7 +115,7 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/setup.c
        while (1)
                cpu_relax();
  }
        while (1)
                cpu_relax();
  }

-@@ -50,12 +79,13 @@ static void bcm47xx_machine_halt(void)
+@@ -50,12 +79,13 @@

  {
        /* Disable interrupts and watchdog and spin forever */
        local_irq_disable();
  {
        /* Disable interrupts and watchdog and spin forever */
        local_irq_disable();


@@ -135,7 +131,7 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/setup.c
  {
        int i = 0;
  
  {
        int i = 0;
  

-@@ -72,52 +102,141 @@ static void str2eaddr(char *str, char *d
+@@ -72,52 +102,141 @@

        }
  }
  
        }
  }
  


@@ -310,10 +306,8 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/setup.c
 +      return 0;
 +}
 +device_initcall(bcm47xx_register_gpiodev);
 +      return 0;
 +}
 +device_initcall(bcm47xx_register_gpiodev);

-Index: linux-2.6.25.4/arch/mips/bcm47xx/time.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm47xx/time.c
-+++ linux-2.6.25.4/arch/mips/bcm47xx/time.c
+--- a/arch/mips/bcm47xx/time.c
++++ b/arch/mips/bcm47xx/time.c

 @@ -22,11 +22,17 @@
   *  675 Mass Ave, Cambridge, MA 02139, USA.
   */
 @@ -22,11 +22,17 @@
   *  675 Mass Ave, Cambridge, MA 02139, USA.
   */


@@ -334,10 +328,8 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/time.c
  
  void __init plat_time_init(void)
  {
  
  void __init plat_time_init(void)
  {

-Index: linux-2.6.25.4/arch/mips/bcm47xx/nvram.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm47xx/nvram.c
-+++ linux-2.6.25.4/arch/mips/bcm47xx/nvram.c
+--- a/arch/mips/bcm47xx/nvram.c
++++ b/arch/mips/bcm47xx/nvram.c

 @@ -24,10 +24,10 @@
  #include <asm/io.h>
  #include <asm/uaccess.h>
 @@ -24,10 +24,10 @@
  #include <asm/io.h>
  #include <asm/uaccess.h>


@@ -351,7 +343,7 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/nvram.c
  
  static char nvram_buf[NVRAM_SPACE];
  static int cfe_env;
  
  static char nvram_buf[NVRAM_SPACE];
  static int cfe_env;

-@@ -36,7 +36,7 @@ extern char *cfe_env_get(char *nv_buf, c
+@@ -36,7 +36,7 @@

  /* Probe for NVRAM header */
  static void __init early_nvram_init(void)
  {
  /* Probe for NVRAM header */
  static void __init early_nvram_init(void)
  {


@@ -360,21 +352,17 @@ Index: linux-2.6.25.4/arch/mips/bcm47xx/nvram.c
        struct nvram_header *header;
        int i;
        u32 base, lim, off;
        struct nvram_header *header;
        int i;
        u32 base, lim, off;

-Index: linux-2.6.25.4/arch/mips/bcm47xx/Makefile
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm47xx/Makefile
-+++ linux-2.6.25.4/arch/mips/bcm47xx/Makefile
+--- 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
 @@ -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.25.4/arch/mips/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/Kconfig
-+++ linux-2.6.25.4/arch/mips/Kconfig
-@@ -54,6 +54,7 @@ config BCM47XX
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -54,6 +54,7 @@

        select SSB_DRIVER_MIPS
        select SSB_DRIVER_EXTIF
        select SSB_DRIVER_PCICORE
        select SSB_DRIVER_MIPS
        select SSB_DRIVER_EXTIF
        select SSB_DRIVER_PCICORE

diff --git a/target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch b/target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch
index b67c875e31b48b361f0f4e8b36c605d3c9351c6f..a2e4c2b85c40af805f957ab07aa4b6fa2695aaa7 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/500-lzma_initramfs.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/scripts/gen_initramfs_list.sh
-===================================================================
---- linux-2.6.25.4.orig/scripts/gen_initramfs_list.sh
-+++ linux-2.6.25.4/scripts/gen_initramfs_list.sh
-@@ -287,7 +287,7 @@ if [ ! -z ${output_file} ]; then
+--- a/scripts/gen_initramfs_list.sh
++++ b/scripts/gen_initramfs_list.sh
+@@ -287,7 +287,7 @@

        if [ "${is_cpio_compressed}" = "compressed" ]; then
                cat ${cpio_tfile} > ${output_file}
        else
        if [ "${is_cpio_compressed}" = "compressed" ]; then
                cat ${cpio_tfile} > ${output_file}
        else


@@ -11,11 +9,9 @@ Index: linux-2.6.25.4/scripts/gen_initramfs_list.sh
        fi
        [ -z ${cpio_file} ] && rm ${cpio_tfile}
  fi
        fi
        [ -z ${cpio_file} ] && rm ${cpio_tfile}
  fi

-Index: linux-2.6.25.4/init/initramfs.c
-===================================================================
---- linux-2.6.25.4.orig/init/initramfs.c
-+++ linux-2.6.25.4/init/initramfs.c
-@@ -441,6 +441,69 @@ static void __init flush_window(void)
+--- a/init/initramfs.c
++++ b/init/initramfs.c
+@@ -441,6 +441,69 @@

        outcnt = 0;
  }
  
        outcnt = 0;
  }
  


@@ -85,7 +81,7 @@ Index: linux-2.6.25.4/init/initramfs.c
  static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
  {
        int written;
  static char * __init unpack_to_rootfs(char *buf, unsigned len, int check_only)
  {
        int written;

-@@ -475,12 +538,28 @@ static char * __init unpack_to_rootfs(ch
+@@ -475,12 +538,28 @@

                inptr = 0;
                outcnt = 0;             /* bytes in output buffer */
                bytes_out = 0;
                inptr = 0;
                outcnt = 0;             /* bytes in output buffer */
                bytes_out = 0;

diff --git a/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch b/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
index ed8938f28726211a3e5340f65b183ec1dee788d5..21e89cddfffa9826fadb149a86561a4b699cbeb9 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/601-mips-remove-pci-collision-check.patch
@@ -2,11 +2,9 @@ The SSB pcicore driver does create some MMIO resource collisions.
 However, the pcicore PCI-fixup routine fixes these collisions afterwards.
 Remove this sanity check for now until we find a better solution.
 --mb
 However, the pcicore PCI-fixup routine fixes these collisions afterwards.
 Remove this sanity check for now until we find a better solution.
 --mb

-Index: linux-2.6.25.4/arch/mips/pci/pci.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/pci/pci.c
-+++ linux-2.6.25.4/arch/mips/pci/pci.c
-@@ -182,12 +182,10 @@ static int pcibios_enable_resources(stru
+--- a/arch/mips/pci/pci.c
++++ b/arch/mips/pci/pci.c
+@@ -182,12 +182,10 @@

                if ((idx == PCI_ROM_RESOURCE) &&
                                (!(r->flags & IORESOURCE_ROM_ENABLE)))
                        continue;
                if ((idx == PCI_ROM_RESOURCE) &&
                                (!(r->flags & IORESOURCE_ROM_ENABLE)))
                        continue;

diff --git a/target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch b/target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch
index 4e31b578dd63c4d08f02788b52a49414d7ab51a5..d2271dd43ef2c8141fe376e5bc51db3f28ea2271 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/ssb/main.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/main.c
-+++ linux-2.6.25.4/drivers/ssb/main.c
-@@ -1173,7 +1173,9 @@ static int __init ssb_modinit(void)
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -1173,7 +1173,9 @@

  /* ssb must be initialized after PCI but before the ssb drivers.
   * That means we must use some initcall between subsys_initcall
   * and device_initcall. */
  /* ssb must be initialized after PCI but before the ssb drivers.
   * That means we must use some initcall between subsys_initcall
   * and device_initcall. */

diff --git a/target/linux/brcm47xx/patches-2.6.25/680-ssb-support-8bit-writes.patch b/target/linux/brcm47xx/patches-2.6.25/680-ssb-support-8bit-writes.patch
index 975d72d4e194eac2b0e38ff8cbc1197637b77608..c7b1b26af4e415682a8e973b10051e55ce3084a1 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/680-ssb-support-8bit-writes.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/680-ssb-support-8bit-writes.patch
@@ -1,9 +1,7 @@
 Add support for 8bit reads/writes to SSB.
 Add support for 8bit reads/writes to SSB.

-Index: linux-2.6.25.4/drivers/ssb/main.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/main.c
-+++ linux-2.6.25.4/drivers/ssb/main.c
-@@ -508,6 +508,14 @@ error:
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -508,6 +508,14 @@

        return err;
  }
  
        return err;
  }
  


@@ -18,7 +16,7 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
  static u16 ssb_ssb_read16(struct ssb_device *dev, u16 offset)
  {
        struct ssb_bus *bus = dev->bus;
  static u16 ssb_ssb_read16(struct ssb_device *dev, u16 offset)
  {
        struct ssb_bus *bus = dev->bus;

-@@ -524,6 +532,14 @@ static u32 ssb_ssb_read32(struct ssb_dev
+@@ -524,6 +532,14 @@

        return readl(bus->mmio + offset);
  }
  
        return readl(bus->mmio + offset);
  }
  


@@ -33,7 +31,7 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
  static void ssb_ssb_write16(struct ssb_device *dev, u16 offset, u16 value)
  {
        struct ssb_bus *bus = dev->bus;
  static void ssb_ssb_write16(struct ssb_device *dev, u16 offset, u16 value)
  {
        struct ssb_bus *bus = dev->bus;

-@@ -542,8 +558,10 @@ static void ssb_ssb_write32(struct ssb_d
+@@ -542,8 +558,10 @@

  
  /* Ops for the plain SSB bus without a host-device (no PCI or PCMCIA). */
  static const struct ssb_bus_ops ssb_ssb_ops = {
  
  /* Ops for the plain SSB bus without a host-device (no PCI or PCMCIA). */
  static const struct ssb_bus_ops ssb_ssb_ops = {


@@ -44,11 +42,9 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
        .write16        = ssb_ssb_write16,
        .write32        = ssb_ssb_write32,
  };
        .write16        = ssb_ssb_write16,
        .write32        = ssb_ssb_write32,
  };

-Index: linux-2.6.25.4/drivers/ssb/pci.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/pci.c
-+++ linux-2.6.25.4/drivers/ssb/pci.c
-@@ -577,6 +577,19 @@ static inline int ssb_pci_assert_buspowe
+--- a/drivers/ssb/pci.c
++++ b/drivers/ssb/pci.c
+@@ -577,6 +577,19 @@

  }
  #endif /* DEBUG */
  
  }
  #endif /* DEBUG */
  


@@ -68,7 +64,7 @@ Index: linux-2.6.25.4/drivers/ssb/pci.c
  static u16 ssb_pci_read16(struct ssb_device *dev, u16 offset)
  {
        struct ssb_bus *bus = dev->bus;
  static u16 ssb_pci_read16(struct ssb_device *dev, u16 offset)
  {
        struct ssb_bus *bus = dev->bus;

-@@ -603,6 +616,19 @@ static u32 ssb_pci_read32(struct ssb_dev
+@@ -603,6 +616,19 @@

        return ioread32(bus->mmio + offset);
  }
  
        return ioread32(bus->mmio + offset);
  }
  


@@ -88,7 +84,7 @@ Index: linux-2.6.25.4/drivers/ssb/pci.c
  static void ssb_pci_write16(struct ssb_device *dev, u16 offset, u16 value)
  {
        struct ssb_bus *bus = dev->bus;
  static void ssb_pci_write16(struct ssb_device *dev, u16 offset, u16 value)
  {
        struct ssb_bus *bus = dev->bus;

-@@ -631,8 +657,10 @@ static void ssb_pci_write32(struct ssb_d
+@@ -631,8 +657,10 @@

  
  /* Not "static", as it's used in main.c */
  const struct ssb_bus_ops ssb_pci_ops = {
  
  /* Not "static", as it's used in main.c */
  const struct ssb_bus_ops ssb_pci_ops = {


@@ -99,11 +95,9 @@ Index: linux-2.6.25.4/drivers/ssb/pci.c
        .write16        = ssb_pci_write16,
        .write32        = ssb_pci_write32,
  };
        .write16        = ssb_pci_write16,
        .write32        = ssb_pci_write32,
  };

-Index: linux-2.6.25.4/drivers/ssb/pcmcia.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/pcmcia.c
-+++ linux-2.6.25.4/drivers/ssb/pcmcia.c
-@@ -172,6 +172,22 @@ static int select_core_and_segment(struc
+--- a/drivers/ssb/pcmcia.c
++++ b/drivers/ssb/pcmcia.c
+@@ -172,6 +172,22 @@

        return 0;
  }
  
        return 0;
  }
  


@@ -126,7 +120,7 @@ Index: linux-2.6.25.4/drivers/ssb/pcmcia.c
  static u16 ssb_pcmcia_read16(struct ssb_device *dev, u16 offset)
  {
        struct ssb_bus *bus = dev->bus;
  static u16 ssb_pcmcia_read16(struct ssb_device *dev, u16 offset)
  {
        struct ssb_bus *bus = dev->bus;

-@@ -206,6 +222,20 @@ static u32 ssb_pcmcia_read32(struct ssb_
+@@ -206,6 +222,20 @@

        return (lo | (hi << 16));
  }
  
        return (lo | (hi << 16));
  }
  


@@ -147,7 +141,7 @@ Index: linux-2.6.25.4/drivers/ssb/pcmcia.c
  static void ssb_pcmcia_write16(struct ssb_device *dev, u16 offset, u16 value)
  {
        struct ssb_bus *bus = dev->bus;
  static void ssb_pcmcia_write16(struct ssb_device *dev, u16 offset, u16 value)
  {
        struct ssb_bus *bus = dev->bus;

-@@ -238,8 +268,10 @@ static void ssb_pcmcia_write32(struct ss
+@@ -238,8 +268,10 @@

  
  /* Not "static", as it's used in main.c */
  const struct ssb_bus_ops ssb_pcmcia_ops = {
  
  /* Not "static", as it's used in main.c */
  const struct ssb_bus_ops ssb_pcmcia_ops = {


@@ -158,11 +152,9 @@ Index: linux-2.6.25.4/drivers/ssb/pcmcia.c
        .write16        = ssb_pcmcia_write16,
        .write32        = ssb_pcmcia_write32,
  };
        .write16        = ssb_pcmcia_write16,
        .write32        = ssb_pcmcia_write32,
  };

-Index: linux-2.6.25.4/include/linux/ssb/ssb.h
-===================================================================
---- linux-2.6.25.4.orig/include/linux/ssb/ssb.h
-+++ linux-2.6.25.4/include/linux/ssb/ssb.h
-@@ -72,8 +72,10 @@ struct ssb_device;
+--- a/include/linux/ssb/ssb.h
++++ b/include/linux/ssb/ssb.h
+@@ -72,8 +72,10 @@

  /* Lowlevel read/write operations on the device MMIO.
   * Internal, don't use that outside of ssb. */
  struct ssb_bus_ops {
  /* Lowlevel read/write operations on the device MMIO.
   * Internal, don't use that outside of ssb. */
  struct ssb_bus_ops {


@@ -173,7 +165,7 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb.h
        void (*write16)(struct ssb_device *dev, u16 offset, u16 value);
        void (*write32)(struct ssb_device *dev, u16 offset, u32 value);
  };
        void (*write16)(struct ssb_device *dev, u16 offset, u16 value);
        void (*write32)(struct ssb_device *dev, u16 offset, u32 value);
  };

-@@ -348,6 +350,10 @@ void ssb_device_disable(struct ssb_devic
+@@ -348,6 +350,10 @@

  
  
  /* Device MMIO register read/write functions. */
  
  
  /* Device MMIO register read/write functions. */


@@ -184,7 +176,7 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb.h
  static inline u16 ssb_read16(struct ssb_device *dev, u16 offset)
  {
        return dev->ops->read16(dev, offset);
  static inline u16 ssb_read16(struct ssb_device *dev, u16 offset)
  {
        return dev->ops->read16(dev, offset);

-@@ -356,6 +362,10 @@ static inline u32 ssb_read32(struct ssb_
+@@ -356,6 +362,10 @@

  {
        return dev->ops->read32(dev, offset);
  }
  {
        return dev->ops->read32(dev, offset);
  }

diff --git a/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch b/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch
index cc5de49fa576daa379de556a27f9b4fb71a84107..1ba199fcbb859db662ca24630fee51b04ba95a95 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch
@@ -1,10 +1,8 @@
 Allow registering PCI devices after early boot.
 
 This is an ugly hack and needs to be rewritten before going upstream.
 Allow registering PCI devices after early boot.
 
 This is an ugly hack and needs to be rewritten before going upstream.

-Index: linux-2.6.25.4/arch/mips/pci/pci.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/pci/pci.c
-+++ linux-2.6.25.4/arch/mips/pci/pci.c
+--- a/arch/mips/pci/pci.c
++++ b/arch/mips/pci/pci.c

 @@ -21,6 +21,17 @@
   */
  int pci_probe_only;
 @@ -21,6 +21,17 @@
   */
  int pci_probe_only;


@@ -23,7 +21,7 @@ Index: linux-2.6.25.4/arch/mips/pci/pci.c
  #define PCI_ASSIGN_ALL_BUSSES 1
  
  unsigned int pci_probe = PCI_ASSIGN_ALL_BUSSES;
  #define PCI_ASSIGN_ALL_BUSSES 1
  
  unsigned int pci_probe = PCI_ASSIGN_ALL_BUSSES;

-@@ -75,8 +86,32 @@ pcibios_align_resource(void *data, struc
+@@ -75,8 +86,32 @@

        res->start = start;
  }
  
        res->start = start;
  }
  


@@ -57,7 +55,7 @@ Index: linux-2.6.25.4/arch/mips/pci/pci.c
        if (request_resource(&iomem_resource, hose->mem_resource) < 0)
                goto out;
        if (request_resource(&ioport_resource, hose->io_resource) < 0) {
        if (request_resource(&iomem_resource, hose->mem_resource) < 0)
                goto out;
        if (request_resource(&ioport_resource, hose->io_resource) < 0) {

-@@ -84,9 +119,6 @@ void __devinit register_pci_controller(s
+@@ -84,9 +119,6 @@

                goto out;
        }
  
                goto out;
        }
  


@@ -67,7 +65,7 @@ Index: linux-2.6.25.4/arch/mips/pci/pci.c
        /*
         * Do not panic here but later - this might hapen before console init.
         */
        /*
         * Do not panic here but later - this might hapen before console init.
         */

-@@ -94,41 +126,47 @@ void __devinit register_pci_controller(s
+@@ -94,41 +126,47 @@

                printk(KERN_WARNING
                       "registering PCI controller with io_map_base unset\n");
        }
                printk(KERN_WARNING
                       "registering PCI controller with io_map_base unset\n");
        }


@@ -138,7 +136,7 @@ Index: linux-2.6.25.4/arch/mips/pci/pci.c
  
        /* Scan all of the recorded PCI controllers.  */
        for (next_busno = 0, hose = hose_head; hose; hose = hose->next) {
  
        /* Scan all of the recorded PCI controllers.  */
        for (next_busno = 0, hose = hose_head; hose; hose = hose->next) {

-@@ -157,6 +195,7 @@ static int __init pcibios_init(void)
+@@ -157,6 +195,7 @@

        if (!pci_probe_only)
                pci_assign_unassigned_resources();
        pci_fixup_irqs(common_swizzle, pcibios_map_irq);
        if (!pci_probe_only)
                pci_assign_unassigned_resources();
        pci_fixup_irqs(common_swizzle, pcibios_map_irq);


@@ -146,11 +144,9 @@ Index: linux-2.6.25.4/arch/mips/pci/pci.c
  
        return 0;
  }
  
        return 0;
  }

-Index: linux-2.6.25.4/drivers/ssb/main.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/main.c
-+++ linux-2.6.25.4/drivers/ssb/main.c
-@@ -1191,9 +1191,7 @@ static int __init ssb_modinit(void)
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c
+@@ -1191,9 +1191,7 @@

  /* ssb must be initialized after PCI but before the ssb drivers.
   * That means we must use some initcall between subsys_initcall
   * and device_initcall. */
  /* ssb must be initialized after PCI but before the ssb drivers.
   * That means we must use some initcall between subsys_initcall
   * and device_initcall. */

diff --git a/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch
index 0291096fc4ab85d5522c1749e080bbc7519b5e93..ae97cf6cd5208443a24f322083e9886c02182f0d 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/700-ssb-gigabit-ethernet-driver.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/ssb/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/Kconfig
-+++ linux-2.6.25.4/drivers/ssb/Kconfig
-@@ -125,4 +125,13 @@ config SSB_DRIVER_EXTIF
+--- a/drivers/ssb/Kconfig
++++ b/drivers/ssb/Kconfig
+@@ -125,4 +125,13 @@

  
          If unsure, say N
  
  
          If unsure, say N
  


@@ -16,11 +14,9 @@ Index: linux-2.6.25.4/drivers/ssb/Kconfig
 +        If unsure, say N
 +
  endmenu
 +        If unsure, say N
 +
  endmenu

-Index: linux-2.6.25.4/drivers/ssb/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/Makefile
-+++ linux-2.6.25.4/drivers/ssb/Makefile
-@@ -11,6 +11,7 @@ ssb-y                                        += driver_chipcommon.o
+--- a/drivers/ssb/Makefile
++++ b/drivers/ssb/Makefile
+@@ -11,6 +11,7 @@

  ssb-$(CONFIG_SSB_DRIVER_MIPS)         += driver_mipscore.o
  ssb-$(CONFIG_SSB_DRIVER_EXTIF)                += driver_extif.o
  ssb-$(CONFIG_SSB_DRIVER_PCICORE)      += driver_pcicore.o
  ssb-$(CONFIG_SSB_DRIVER_MIPS)         += driver_mipscore.o
  ssb-$(CONFIG_SSB_DRIVER_EXTIF)                += driver_extif.o
  ssb-$(CONFIG_SSB_DRIVER_PCICORE)      += driver_pcicore.o


@@ -28,10 +24,8 @@ Index: linux-2.6.25.4/drivers/ssb/Makefile
  
  # b43 pci-ssb-bridge driver
  # Not strictly a part of SSB, but kept here for convenience
  
  # b43 pci-ssb-bridge driver
  # Not strictly a part of SSB, but kept here for convenience

-Index: linux-2.6.25.4/drivers/ssb/driver_gige.c
-===================================================================

 --- /dev/null
 --- /dev/null

-+++ linux-2.6.25.4/drivers/ssb/driver_gige.c
++++ b/drivers/ssb/driver_gige.c

 @@ -0,0 +1,294 @@
 +/*
 + * Sonics Silicon Backplane
 @@ -0,0 +1,294 @@
 +/*
 + * Sonics Silicon Backplane


@@ -327,10 +321,8 @@ Index: linux-2.6.25.4/drivers/ssb/driver_gige.c
 +{
 +      return ssb_driver_register(&ssb_gige_driver);
 +}
 +{
 +      return ssb_driver_register(&ssb_gige_driver);
 +}

-Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_gige.h
-===================================================================

 --- /dev/null
 --- /dev/null

-+++ linux-2.6.25.4/include/linux/ssb/ssb_driver_gige.h
++++ b/include/linux/ssb/ssb_driver_gige.h

 @@ -0,0 +1,174 @@
 +#ifndef LINUX_SSB_DRIVER_GIGE_H_
 +#define LINUX_SSB_DRIVER_GIGE_H_
 @@ -0,0 +1,174 @@
 +#ifndef LINUX_SSB_DRIVER_GIGE_H_
 +#define LINUX_SSB_DRIVER_GIGE_H_


@@ -506,11 +498,9 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_gige.h
 +
 +#endif /* CONFIG_SSB_DRIVER_GIGE */
 +#endif /* LINUX_SSB_DRIVER_GIGE_H_ */
 +
 +#endif /* CONFIG_SSB_DRIVER_GIGE */
 +#endif /* LINUX_SSB_DRIVER_GIGE_H_ */

-Index: linux-2.6.25.4/drivers/ssb/driver_pcicore.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/driver_pcicore.c
-+++ linux-2.6.25.4/drivers/ssb/driver_pcicore.c
-@@ -60,78 +60,6 @@ static DEFINE_SPINLOCK(cfgspace_lock);
+--- a/drivers/ssb/driver_pcicore.c
++++ b/drivers/ssb/driver_pcicore.c
+@@ -60,78 +60,6 @@

  /* Core to access the external PCI config space. Can only have one. */
  static struct ssb_pcicore *extpci_core;
  
  /* Core to access the external PCI config space. Can only have one. */
  static struct ssb_pcicore *extpci_core;
  


@@ -589,7 +579,7 @@ Index: linux-2.6.25.4/drivers/ssb/driver_pcicore.c
  static u32 get_cfgspace_addr(struct ssb_pcicore *pc,
                             unsigned int bus, unsigned int dev,
                             unsigned int func, unsigned int off)
  static u32 get_cfgspace_addr(struct ssb_pcicore *pc,
                             unsigned int bus, unsigned int dev,
                             unsigned int func, unsigned int off)

-@@ -320,6 +248,95 @@ static struct pci_controller ssb_pcicore
+@@ -320,6 +248,95 @@

        .mem_offset     = 0x24000000,
  };
  
        .mem_offset     = 0x24000000,
  };
  


@@ -685,10 +675,8 @@ Index: linux-2.6.25.4/drivers/ssb/driver_pcicore.c
  static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
  {
        u32 val;
  static void ssb_pcicore_init_hostmode(struct ssb_pcicore *pc)
  {
        u32 val;

-Index: linux-2.6.25.4/drivers/ssb/embedded.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/embedded.c
-+++ linux-2.6.25.4/drivers/ssb/embedded.c
+--- a/drivers/ssb/embedded.c
++++ b/drivers/ssb/embedded.c

 @@ -10,6 +10,9 @@
  
  #include <linux/ssb/ssb.h>
 @@ -10,6 +10,9 @@
  
  #include <linux/ssb/ssb.h>


@@ -699,7 +687,7 @@ Index: linux-2.6.25.4/drivers/ssb/embedded.c
  
  #include "ssb_private.h"
  
  
  #include "ssb_private.h"
  

-@@ -130,3 +133,90 @@ u32 ssb_gpio_polarity(struct ssb_bus *bu
+@@ -130,3 +133,90 @@

        return res;
  }
  EXPORT_SYMBOL(ssb_gpio_polarity);
        return res;
  }
  EXPORT_SYMBOL(ssb_gpio_polarity);


@@ -790,11 +778,9 @@ Index: linux-2.6.25.4/drivers/ssb/embedded.c
 +
 +      return -ENODEV;
 +}
 +
 +      return -ENODEV;
 +}

-Index: linux-2.6.25.4/include/linux/ssb/ssb.h
-===================================================================
---- linux-2.6.25.4.orig/include/linux/ssb/ssb.h
-+++ linux-2.6.25.4/include/linux/ssb/ssb.h
-@@ -426,5 +426,12 @@ extern int ssb_bus_powerup(struct ssb_bu
+--- a/include/linux/ssb/ssb.h
++++ b/include/linux/ssb/ssb.h
+@@ -426,5 +426,12 @@

  extern u32 ssb_admatch_base(u32 adm);
  extern u32 ssb_admatch_size(u32 adm);
  
  extern u32 ssb_admatch_base(u32 adm);
  extern u32 ssb_admatch_size(u32 adm);
  


@@ -807,10 +793,8 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb.h
 +#endif /* CONFIG_SSB_EMBEDDED */
  
  #endif /* LINUX_SSB_H_ */
 +#endif /* CONFIG_SSB_EMBEDDED */
  
  #endif /* LINUX_SSB_H_ */

-Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h
-===================================================================
---- linux-2.6.25.4.orig/include/linux/ssb/ssb_driver_pci.h
-+++ linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h
+--- a/include/linux/ssb/ssb_driver_pci.h
++++ b/include/linux/ssb/ssb_driver_pci.h

 @@ -1,6 +1,11 @@
  #ifndef LINUX_SSB_PCICORE_H_
  #define LINUX_SSB_PCICORE_H_
 @@ -1,6 +1,11 @@
  #ifndef LINUX_SSB_PCICORE_H_
  #define LINUX_SSB_PCICORE_H_


@@ -823,7 +807,7 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h
  #ifdef CONFIG_SSB_DRIVER_PCICORE
  
  /* PCI core registers. */
  #ifdef CONFIG_SSB_DRIVER_PCICORE
  
  /* PCI core registers. */

-@@ -88,6 +93,9 @@ extern void ssb_pcicore_init(struct ssb_
+@@ -88,6 +93,9 @@

  extern int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
                                          struct ssb_device *dev);
  
  extern int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc,
                                          struct ssb_device *dev);
  


@@ -833,7 +817,7 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h
  
  #else /* CONFIG_SSB_DRIVER_PCICORE */
  
  
  #else /* CONFIG_SSB_DRIVER_PCICORE */
  

-@@ -107,5 +115,16 @@ int ssb_pcicore_dev_irqvecs_enable(struc
+@@ -107,5 +115,16 @@

        return 0;
  }
  
        return 0;
  }
  


@@ -850,10 +834,8 @@ Index: linux-2.6.25.4/include/linux/ssb/ssb_driver_pci.h
 +
  #endif /* CONFIG_SSB_DRIVER_PCICORE */
  #endif /* LINUX_SSB_PCICORE_H_ */
 +
  #endif /* CONFIG_SSB_DRIVER_PCICORE */
  #endif /* LINUX_SSB_PCICORE_H_ */

-Index: linux-2.6.25.4/drivers/ssb/main.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/main.c
-+++ linux-2.6.25.4/drivers/ssb/main.c
+--- a/drivers/ssb/main.c
++++ b/drivers/ssb/main.c

 @@ -14,6 +14,7 @@
  #include <linux/io.h>
  #include <linux/ssb/ssb.h>
 @@ -14,6 +14,7 @@
  #include <linux/io.h>
  #include <linux/ssb/ssb.h>


@@ -862,7 +844,7 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
  #include <linux/dma-mapping.h>
  #include <linux/pci.h>
  
  #include <linux/dma-mapping.h>
  #include <linux/pci.h>
  

-@@ -68,6 +69,25 @@ found:
+@@ -68,6 +69,25 @@

  }
  #endif /* CONFIG_SSB_PCIHOST */
  
  }
  #endif /* CONFIG_SSB_PCIHOST */
  


@@ -888,7 +870,7 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
  static struct ssb_device *ssb_device_get(struct ssb_device *dev)
  {
        if (dev)
  static struct ssb_device *ssb_device_get(struct ssb_device *dev)
  {
        if (dev)

-@@ -1181,7 +1201,14 @@ static int __init ssb_modinit(void)
+@@ -1181,7 +1201,14 @@

        err = b43_pci_ssb_bridge_init();
        if (err) {
                ssb_printk(KERN_ERR "Broadcom 43xx PCI-SSB-bridge "
        err = b43_pci_ssb_bridge_init();
        if (err) {
                ssb_printk(KERN_ERR "Broadcom 43xx PCI-SSB-bridge "


@@ -904,7 +886,7 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
                /* don't fail SSB init because of this */
                err = 0;
        }
                /* don't fail SSB init because of this */
                err = 0;
        }

-@@ -1195,6 +1222,7 @@ fs_initcall(ssb_modinit);
+@@ -1195,6 +1222,7 @@

  
  static void __exit ssb_modexit(void)
  {
  
  static void __exit ssb_modexit(void)
  {


@@ -912,11 +894,9 @@ Index: linux-2.6.25.4/drivers/ssb/main.c
        b43_pci_ssb_bridge_exit();
        bus_unregister(&ssb_bustype);
  }
        b43_pci_ssb_bridge_exit();
        bus_unregister(&ssb_bustype);
  }

-Index: linux-2.6.25.4/drivers/ssb/ssb_private.h
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/ssb_private.h
-+++ linux-2.6.25.4/drivers/ssb/ssb_private.h
-@@ -118,6 +118,8 @@ extern u32 ssb_calc_clock_rate(u32 pllty
+--- a/drivers/ssb/ssb_private.h
++++ b/drivers/ssb/ssb_private.h
+@@ -118,6 +118,8 @@

  extern int ssb_devices_freeze(struct ssb_bus *bus);
  extern int ssb_devices_thaw(struct ssb_bus *bus);
  extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev);
  extern int ssb_devices_freeze(struct ssb_bus *bus);
  extern int ssb_devices_thaw(struct ssb_bus *bus);
  extern struct ssb_bus *ssb_pci_dev_to_bus(struct pci_dev *pdev);


@@ -925,10 +905,8 @@ Index: linux-2.6.25.4/drivers/ssb/ssb_private.h
  
  /* b43_pci_bridge.c */
  #ifdef CONFIG_SSB_B43_PCI_BRIDGE
  
  /* b43_pci_bridge.c */
  #ifdef CONFIG_SSB_B43_PCI_BRIDGE

-Index: linux-2.6.25.4/drivers/net/tg3.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/tg3.c
-+++ linux-2.6.25.4/drivers/net/tg3.c
+--- a/drivers/net/tg3.c
++++ b/drivers/net/tg3.c

 @@ -38,6 +38,7 @@
  #include <linux/workqueue.h>
  #include <linux/prefetch.h>
 @@ -38,6 +38,7 @@
  #include <linux/workqueue.h>
  #include <linux/prefetch.h>


@@ -937,7 +915,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
  
  #include <net/checksum.h>
  #include <net/ip.h>
  
  #include <net/checksum.h>
  #include <net/ip.h>

-@@ -425,8 +426,9 @@ static void _tw32_flush(struct tg3 *tp, 
+@@ -425,8 +426,9 @@

  static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val)
  {
        tp->write32_mbox(tp, off, val);
  static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val)
  {
        tp->write32_mbox(tp, off, val);


@@ -949,7 +927,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
                tp->read32_mbox(tp, off);
  }
  
                tp->read32_mbox(tp, off);
  }
  

-@@ -706,7 +708,7 @@ static void tg3_switch_clocks(struct tg3
+@@ -706,7 +708,7 @@

  
  #define PHY_BUSY_LOOPS        5000
  
  
  #define PHY_BUSY_LOOPS        5000
  


@@ -958,7 +936,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
  {
        u32 frame_val;
        unsigned int loops;
  {
        u32 frame_val;
        unsigned int loops;

-@@ -720,7 +722,7 @@ static int tg3_readphy(struct tg3 *tp, i
+@@ -720,7 +722,7 @@

  
        *val = 0x0;
  
  
        *val = 0x0;
  


@@ -967,7 +945,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
                      MI_COM_PHY_ADDR_MASK);
        frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
                      MI_COM_REG_ADDR_MASK);
                      MI_COM_PHY_ADDR_MASK);
        frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
                      MI_COM_REG_ADDR_MASK);

-@@ -755,7 +757,12 @@ static int tg3_readphy(struct tg3 *tp, i
+@@ -755,7 +757,12 @@

        return ret;
  }
  
        return ret;
  }
  


@@ -981,7 +959,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
  {
        u32 frame_val;
        unsigned int loops;
  {
        u32 frame_val;
        unsigned int loops;

-@@ -771,7 +778,7 @@ static int tg3_writephy(struct tg3 *tp, 
+@@ -771,7 +778,7 @@

                udelay(80);
        }
  
                udelay(80);
        }
  


@@ -990,7 +968,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
                      MI_COM_PHY_ADDR_MASK);
        frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
                      MI_COM_REG_ADDR_MASK);
                      MI_COM_PHY_ADDR_MASK);
        frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
                      MI_COM_REG_ADDR_MASK);

-@@ -804,6 +811,11 @@ static int tg3_writephy(struct tg3 *tp, 
+@@ -804,6 +811,11 @@

        return ret;
  }
  
        return ret;
  }
  


@@ -1002,7 +980,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
  static void tg3_phydsp_write(struct tg3 *tp, u32 reg, u32 val)
  {
        tg3_writephy(tp, MII_TG3_DSP_ADDRESS, reg);
  static void tg3_phydsp_write(struct tg3 *tp, u32 reg, u32 val)
  {
        tg3_writephy(tp, MII_TG3_DSP_ADDRESS, reg);

-@@ -2250,6 +2262,14 @@ static int tg3_setup_copper_phy(struct t
+@@ -2250,6 +2262,14 @@

                        }
                }
  
                        }
                }
  


@@ -1017,7 +995,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
                if (current_link_up == 1 &&
                    tp->link_config.active_duplex == DUPLEX_FULL)
                        tg3_setup_flow_control(tp, lcl_adv, rmt_adv);
                if (current_link_up == 1 &&
                    tp->link_config.active_duplex == DUPLEX_FULL)
                        tg3_setup_flow_control(tp, lcl_adv, rmt_adv);

-@@ -5197,6 +5217,11 @@ static int tg3_poll_fw(struct tg3 *tp)
+@@ -5197,6 +5217,11 @@

        int i;
        u32 val;
  
        int i;
        u32 val;
  


@@ -1029,7 +1007,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
                /* Wait up to 20ms for init done. */
                for (i = 0; i < 200; i++) {
        if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) {
                /* Wait up to 20ms for init done. */
                for (i = 0; i < 200; i++) {

-@@ -5435,6 +5460,14 @@ static int tg3_chip_reset(struct tg3 *tp
+@@ -5435,6 +5460,14 @@

                tw32(0x5000, 0x400);
        }
  
                tw32(0x5000, 0x400);
        }
  


@@ -1044,7 +1022,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
        tw32(GRC_MODE, tp->grc_mode);
  
        if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
        tw32(GRC_MODE, tp->grc_mode);
  
        if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {

-@@ -5704,9 +5737,12 @@ static int tg3_halt_cpu(struct tg3 *tp, 
+@@ -5704,9 +5737,12 @@

                return -ENODEV;
        }
  
                return -ENODEV;
        }
  


@@ -1060,7 +1038,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
        return 0;
  }
  
        return 0;
  }
  

-@@ -5787,6 +5823,11 @@ static int tg3_load_5701_a0_firmware_fix
+@@ -5787,6 +5823,11 @@

        struct fw_info info;
        int err, i;
  
        struct fw_info info;
        int err, i;
  


@@ -1072,7 +1050,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
        info.text_base = TG3_FW_TEXT_ADDR;
        info.text_len = TG3_FW_TEXT_LEN;
        info.text_data = &tg3FwText[0];
        info.text_base = TG3_FW_TEXT_ADDR;
        info.text_len = TG3_FW_TEXT_LEN;
        info.text_data = &tg3FwText[0];

-@@ -6345,6 +6386,11 @@ static int tg3_load_tso_firmware(struct 
+@@ -6345,6 +6386,11 @@

        unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
        int err, i;
  
        unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
        int err, i;
  


@@ -1084,7 +1062,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
        if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
                return 0;
  
        if (tp->tg3_flags2 & TG3_FLG2_HW_TSO)
                return 0;
  

-@@ -7306,6 +7352,11 @@ static void tg3_timer(unsigned long __op
+@@ -7306,6 +7352,11 @@

  
        spin_lock(&tp->lock);
  
  
        spin_lock(&tp->lock);
  


@@ -1096,7 +1074,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
        if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) {
                /* All of this garbage is because when using non-tagged
                 * IRQ status the mailbox/status_block protocol the chip
        if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) {
                /* All of this garbage is because when using non-tagged
                 * IRQ status the mailbox/status_block protocol the chip

-@@ -8906,6 +8957,11 @@ static int tg3_test_nvram(struct tg3 *tp
+@@ -8906,6 +8957,11 @@

        __le32 *buf;
        int i, j, k, err = 0, size;
  
        __le32 *buf;
        int i, j, k, err = 0, size;
  


@@ -1108,7 +1086,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
        if (tg3_nvram_read_swab(tp, 0, &magic) != 0)
                return -EIO;
  
        if (tg3_nvram_read_swab(tp, 0, &magic) != 0)
                return -EIO;
  

-@@ -9689,7 +9745,7 @@ static int tg3_ioctl(struct net_device *
+@@ -9689,7 +9745,7 @@

                        return -EAGAIN;
  
                spin_lock_bh(&tp->lock);
                        return -EAGAIN;
  
                spin_lock_bh(&tp->lock);


@@ -1117,7 +1095,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
                spin_unlock_bh(&tp->lock);
  
                data->val_out = mii_regval;
                spin_unlock_bh(&tp->lock);
  
                data->val_out = mii_regval;

-@@ -9708,7 +9764,7 @@ static int tg3_ioctl(struct net_device *
+@@ -9708,7 +9764,7 @@

                        return -EAGAIN;
  
                spin_lock_bh(&tp->lock);
                        return -EAGAIN;
  
                spin_lock_bh(&tp->lock);


@@ -1126,7 +1104,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
                spin_unlock_bh(&tp->lock);
  
                return err;
                spin_unlock_bh(&tp->lock);
  
                return err;

-@@ -10177,6 +10233,12 @@ static void __devinit tg3_get_5906_nvram
+@@ -10177,6 +10233,12 @@

  /* Chips other than 5700/5701 use the NVRAM for fetching info. */
  static void __devinit tg3_nvram_init(struct tg3 *tp)
  {
  /* Chips other than 5700/5701 use the NVRAM for fetching info. */
  static void __devinit tg3_nvram_init(struct tg3 *tp)
  {


@@ -1139,7 +1117,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
        tw32_f(GRC_EEPROM_ADDR,
             (EEPROM_ADDR_FSM_RESET |
              (EEPROM_DEFAULT_CLOCK_PERIOD <<
        tw32_f(GRC_EEPROM_ADDR,
             (EEPROM_ADDR_FSM_RESET |
              (EEPROM_DEFAULT_CLOCK_PERIOD <<

-@@ -10317,6 +10379,9 @@ static int tg3_nvram_read(struct tg3 *tp
+@@ -10317,6 +10379,9 @@

  {
        int ret;
  
  {
        int ret;
  


@@ -1149,7 +1127,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
        if (!(tp->tg3_flags & TG3_FLAG_NVRAM))
                return tg3_nvram_read_using_eeprom(tp, offset, val);
  
        if (!(tp->tg3_flags & TG3_FLAG_NVRAM))
                return tg3_nvram_read_using_eeprom(tp, offset, val);
  

-@@ -10563,6 +10628,9 @@ static int tg3_nvram_write_block(struct 
+@@ -10563,6 +10628,9 @@

  {
        int ret;
  
  {
        int ret;
  


@@ -1159,7 +1137,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
        if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
                tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl &
                       ~GRC_LCLCTRL_GPIO_OUTPUT1);
        if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
                tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl &
                       ~GRC_LCLCTRL_GPIO_OUTPUT1);

-@@ -11610,7 +11678,6 @@ static int __devinit tg3_get_invariants(
+@@ -11610,7 +11678,6 @@

                tp->write32 = tg3_write_flush_reg32;
        }
  
                tp->write32 = tg3_write_flush_reg32;
        }
  


@@ -1167,7 +1145,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
        if ((tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) ||
            (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)) {
                tp->write32_tx_mbox = tg3_write32_tx_mbox;
        if ((tp->tg3_flags & TG3_FLAG_TXD_MBOX_HWBUG) ||
            (tp->tg3_flags & TG3_FLAG_MBOX_WRITE_REORDER)) {
                tp->write32_tx_mbox = tg3_write32_tx_mbox;

-@@ -11646,6 +11713,11 @@ static int __devinit tg3_get_invariants(
+@@ -11646,6 +11713,11 @@

              GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)))
                tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
  
              GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)))
                tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
  


@@ -1179,7 +1157,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
        /* Get eeprom hw config before calling tg3_set_power_state().
         * In particular, the TG3_FLG2_IS_NIC flag must be
         * determined before calling tg3_set_power_state() so that
        /* Get eeprom hw config before calling tg3_set_power_state().
         * In particular, the TG3_FLG2_IS_NIC flag must be
         * determined before calling tg3_set_power_state() so that

-@@ -12017,6 +12089,10 @@ static int __devinit tg3_get_device_addr
+@@ -12017,6 +12089,10 @@

        }
  
        if (!is_valid_ether_addr(&dev->dev_addr[0])) {
        }
  
        if (!is_valid_ether_addr(&dev->dev_addr[0])) {


@@ -1190,7 +1168,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
  #ifdef CONFIG_SPARC
                if (!tg3_get_default_macaddr_sparc(tp))
                        return 0;
  #ifdef CONFIG_SPARC
                if (!tg3_get_default_macaddr_sparc(tp))
                        return 0;

-@@ -12508,6 +12584,7 @@ static char * __devinit tg3_phy_string(s
+@@ -12508,6 +12584,7 @@

        case PHY_ID_BCM5704:    return "5704";
        case PHY_ID_BCM5705:    return "5705";
        case PHY_ID_BCM5750:    return "5750";
        case PHY_ID_BCM5704:    return "5704";
        case PHY_ID_BCM5705:    return "5705";
        case PHY_ID_BCM5750:    return "5750";


@@ -1198,7 +1176,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
        case PHY_ID_BCM5752:    return "5752";
        case PHY_ID_BCM5714:    return "5714";
        case PHY_ID_BCM5780:    return "5780";
        case PHY_ID_BCM5752:    return "5752";
        case PHY_ID_BCM5714:    return "5714";
        case PHY_ID_BCM5780:    return "5780";

-@@ -12695,6 +12772,13 @@ static int __devinit tg3_init_one(struct
+@@ -12695,6 +12772,13 @@

                tp->msg_enable = tg3_debug;
        else
                tp->msg_enable = TG3_DEF_MSG_ENABLE;
                tp->msg_enable = tg3_debug;
        else
                tp->msg_enable = TG3_DEF_MSG_ENABLE;


@@ -1212,11 +1190,9 @@ Index: linux-2.6.25.4/drivers/net/tg3.c
  
        /* The word/byte swap controls here control register access byte
         * swapping.  DMA data byte swapping is controlled in the GRC_MODE
  
        /* The word/byte swap controls here control register access byte
         * swapping.  DMA data byte swapping is controlled in the GRC_MODE

-Index: linux-2.6.25.4/drivers/net/tg3.h
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/tg3.h
-+++ linux-2.6.25.4/drivers/net/tg3.h
-@@ -2477,6 +2477,9 @@ struct tg3 {
+--- a/drivers/net/tg3.h
++++ b/drivers/net/tg3.h
+@@ -2477,6 +2477,9 @@

  #define TG3_FLG3_ENABLE_APE           0x00000002
  #define TG3_FLG3_5761_5784_AX_FIXES   0x00000004
  #define TG3_FLG3_5701_DMA_BUG         0x00000008
  #define TG3_FLG3_ENABLE_APE           0x00000002
  #define TG3_FLG3_5761_5784_AX_FIXES   0x00000004
  #define TG3_FLG3_5701_DMA_BUG         0x00000008


@@ -1226,7 +1202,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.h
  
        struct timer_list               timer;
        u16                             timer_counter;
  
        struct timer_list               timer;
        u16                             timer_counter;

-@@ -2532,6 +2535,7 @@ struct tg3 {
+@@ -2532,6 +2535,7 @@

  #define PHY_ID_BCM5714                        0x60008340
  #define PHY_ID_BCM5780                        0x60008350
  #define PHY_ID_BCM5755                        0xbc050cc0
  #define PHY_ID_BCM5714                        0x60008340
  #define PHY_ID_BCM5780                        0x60008350
  #define PHY_ID_BCM5755                        0xbc050cc0


@@ -1234,7 +1210,7 @@ Index: linux-2.6.25.4/drivers/net/tg3.h
  #define PHY_ID_BCM5787                        0xbc050ce0
  #define PHY_ID_BCM5756                        0xbc050ed0
  #define PHY_ID_BCM5784                        0xbc050fa0
  #define PHY_ID_BCM5787                        0xbc050ce0
  #define PHY_ID_BCM5756                        0xbc050ed0
  #define PHY_ID_BCM5784                        0xbc050fa0

-@@ -2568,7 +2572,7 @@ struct tg3 {
+@@ -2568,7 +2572,7 @@

         (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \
         (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \
         (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \
         (X) == PHY_ID_BCM5780 || (X) == PHY_ID_BCM5787 || \
         (X) == PHY_ID_BCM5755 || (X) == PHY_ID_BCM5756 || \
         (X) == PHY_ID_BCM5906 || (X) == PHY_ID_BCM5761 || \


@@ -1243,11 +1219,9 @@ Index: linux-2.6.25.4/drivers/net/tg3.h
  
        struct tg3_hw_stats             *hw_stats;
        dma_addr_t                      stats_mapping;
  
        struct tg3_hw_stats             *hw_stats;
        dma_addr_t                      stats_mapping;

-Index: linux-2.6.25.4/drivers/ssb/driver_mipscore.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/ssb/driver_mipscore.c
-+++ linux-2.6.25.4/drivers/ssb/driver_mipscore.c
-@@ -212,6 +212,7 @@ void ssb_mipscore_init(struct ssb_mipsco
+--- a/drivers/ssb/driver_mipscore.c
++++ b/drivers/ssb/driver_mipscore.c
+@@ -212,6 +212,7 @@

                        /* fallthrough */
                case SSB_DEV_PCI:
                case SSB_DEV_ETHERNET:
                        /* fallthrough */
                case SSB_DEV_PCI:
                case SSB_DEV_ETHERNET:

diff --git a/target/linux/brcm63xx/Makefile b/target/linux/brcm63xx/Makefile
index bfbed76d1bad8cc86db7a99326f00e53ae07d81f..924f21978c7c9f48c654d72c2847a77f232ccbc9 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.6
+LINUX_VERSION:=2.6.25.7

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/brcm63xx/patches-2.6.25/001-bcm963xx.patch b/target/linux/brcm63xx/patches-2.6.25/001-bcm963xx.patch
index 09afd52ae9c9579aa43752532df78896edee945a..909ff61a56de3fdf0827c563ccb503285f9a8f1f 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/001-bcm963xx.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/001-bcm963xx.patch
@@ -16,11 +16,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  include/asm-mips/cpu.h       |    7 ++++++-
  8 files changed, 61 insertions(+), 1 deletions(-)
 
  include/asm-mips/cpu.h       |    7 ++++++-
  8 files changed, 61 insertions(+), 1 deletions(-)
 

-Index: linux-2.6.25.4/arch/mips/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/Kconfig
-+++ linux-2.6.25.4/arch/mips/Kconfig
-@@ -59,6 +59,17 @@ config BCM47XX
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -59,6 +59,17 @@

        help
         Support for BCM47XX based boards
  
        help
         Support for BCM47XX based boards
  


@@ -38,11 +36,9 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
  config MIPS_COBALT
        bool "Cobalt Server"
        select CEVT_R4K
  config MIPS_COBALT
        bool "Cobalt Server"
        select CEVT_R4K

-Index: linux-2.6.25.4/arch/mips/Makefile
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/Makefile
-+++ linux-2.6.25.4/arch/mips/Makefile
-@@ -560,6 +560,10 @@ core-$(CONFIG_BCM47XX)            += arch/mips/bcm
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -560,6 +560,10 @@

  cflags-$(CONFIG_BCM47XX)      += -Iinclude/asm-mips/mach-bcm47xx
  load-$(CONFIG_BCM47XX)                := 0xffffffff80001000
  
  cflags-$(CONFIG_BCM47XX)      += -Iinclude/asm-mips/mach-bcm47xx
  load-$(CONFIG_BCM47XX)                := 0xffffffff80001000
  


@@ -53,11 +49,9 @@ Index: linux-2.6.25.4/arch/mips/Makefile
  #
  # SNI RM
  #
  #
  # SNI RM
  #

-Index: linux-2.6.25.4/arch/mips/kernel/cpu-probe.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/kernel/cpu-probe.c
-+++ linux-2.6.25.4/arch/mips/kernel/cpu-probe.c
-@@ -803,6 +803,21 @@ static inline void cpu_probe_broadcom(st
+--- a/arch/mips/kernel/cpu-probe.c
++++ b/arch/mips/kernel/cpu-probe.c
+@@ -803,6 +803,21 @@

        case PRID_IMP_BCM4710:
                c->cputype = CPU_BCM4710;
                break;
        case PRID_IMP_BCM4710:
                c->cputype = CPU_BCM4710;
                break;


@@ -79,7 +73,7 @@ Index: linux-2.6.25.4/arch/mips/kernel/cpu-probe.c
        default:
                c->cputype = CPU_UNKNOWN;
                break;
        default:
                c->cputype = CPU_UNKNOWN;
                break;

-@@ -887,6 +899,11 @@ static __cpuinit const char *cpu_to_name
+@@ -887,6 +902,11 @@

        case CPU_SR71000:       name = "Sandcraft SR71000"; break;
        case CPU_BCM3302:       name = "Broadcom BCM3302"; break;
        case CPU_BCM4710:       name = "Broadcom BCM4710"; break;
        case CPU_SR71000:       name = "Sandcraft SR71000"; break;
        case CPU_BCM3302:       name = "Broadcom BCM3302"; break;
        case CPU_BCM4710:       name = "Broadcom BCM4710"; break;


@@ -91,11 +85,9 @@ Index: linux-2.6.25.4/arch/mips/kernel/cpu-probe.c
        case CPU_PR4450:        name = "Philips PR4450"; break;
        case CPU_LOONGSON2:     name = "ICT Loongson-2"; break;
        default:
        case CPU_PR4450:        name = "Philips PR4450"; break;
        case CPU_LOONGSON2:     name = "ICT Loongson-2"; break;
        default:

-Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/mm/c-r4k.c
-+++ linux-2.6.25.4/arch/mips/mm/c-r4k.c
-@@ -882,6 +882,13 @@ static void __cpuinit probe_pcache(void)
+--- a/arch/mips/mm/c-r4k.c
++++ b/arch/mips/mm/c-r4k.c
+@@ -882,6 +882,13 @@

                if (!(config & MIPS_CONF_M))
                        panic("Don't know how to probe P-caches on this cpu.");
  
                if (!(config & MIPS_CONF_M))
                        panic("Don't know how to probe P-caches on this cpu.");
  


@@ -109,11 +101,9 @@ Index: linux-2.6.25.4/arch/mips/mm/c-r4k.c
                /*
                 * So we seem to be a MIPS32 or MIPS64 CPU
                 * So let's probe the I-cache ...
                /*
                 * So we seem to be a MIPS32 or MIPS64 CPU
                 * So let's probe the I-cache ...

-Index: linux-2.6.25.4/arch/mips/mm/tlbex.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/mm/tlbex.c
-+++ linux-2.6.25.4/arch/mips/mm/tlbex.c
-@@ -315,6 +315,11 @@ static void __cpuinit build_tlb_write_en
+--- a/arch/mips/mm/tlbex.c
++++ b/arch/mips/mm/tlbex.c
+@@ -315,6 +315,11 @@

        case CPU_25KF:
        case CPU_BCM3302:
        case CPU_BCM4710:
        case CPU_25KF:
        case CPU_BCM3302:
        case CPU_BCM4710:


@@ -125,19 +115,15 @@ Index: linux-2.6.25.4/arch/mips/mm/tlbex.c
        case CPU_LOONGSON2:
                if (m4kc_tlbp_war())
                        uasm_i_nop(p);
        case CPU_LOONGSON2:
                if (m4kc_tlbp_war())
                        uasm_i_nop(p);

-Index: linux-2.6.25.4/arch/mips/pci/Makefile
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/pci/Makefile
-+++ linux-2.6.25.4/arch/mips/pci/Makefile
-@@ -48,3 +48,4 @@ obj-$(CONFIG_TOSHIBA_RBTX4938)       += fixup-
+--- a/arch/mips/pci/Makefile
++++ b/arch/mips/pci/Makefile
+@@ -48,3 +48,4 @@

  obj-$(CONFIG_VICTOR_MPC30X)   += fixup-mpc30x.o
  obj-$(CONFIG_ZAO_CAPCELLA)    += fixup-capcella.o
  obj-$(CONFIG_WR_PPMC)         += fixup-wrppmc.o
 +obj-$(CONFIG_BCM963XX)                += fixup-bcm96348.o pci-bcm96348.o ops-bcm96348.o
  obj-$(CONFIG_VICTOR_MPC30X)   += fixup-mpc30x.o
  obj-$(CONFIG_ZAO_CAPCELLA)    += fixup-capcella.o
  obj-$(CONFIG_WR_PPMC)         += fixup-wrppmc.o
 +obj-$(CONFIG_BCM963XX)                += fixup-bcm96348.o pci-bcm96348.o ops-bcm96348.o

-Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/bootinfo.h
-+++ linux-2.6.25.4/include/asm-mips/bootinfo.h
+--- a/include/asm-mips/bootinfo.h
++++ b/include/asm-mips/bootinfo.h

 @@ -94,6 +94,19 @@
  #define MACH_MSP7120_FPGA       5     /* PMC-Sierra MSP7120 Emulation */
  #define MACH_MSP_OTHER        255     /* PMC-Sierra unknown board type */
 @@ -94,6 +94,19 @@
  #define MACH_MSP7120_FPGA       5     /* PMC-Sierra MSP7120 Emulation */
  #define MACH_MSP_OTHER        255     /* PMC-Sierra unknown board type */


@@ -158,10 +144,8 @@ Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
  #define CL_SIZE                       COMMAND_LINE_SIZE
  
  extern char *system_type;
  #define CL_SIZE                       COMMAND_LINE_SIZE
  
  extern char *system_type;

-Index: linux-2.6.25.4/include/asm-mips/cpu.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/cpu.h
-+++ linux-2.6.25.4/include/asm-mips/cpu.h
+--- a/include/asm-mips/cpu.h
++++ b/include/asm-mips/cpu.h

 @@ -111,6 +111,11 @@
  
  #define PRID_IMP_BCM4710      0x4000
 @@ -111,6 +111,11 @@
  
  #define PRID_IMP_BCM4710      0x4000


@@ -174,7 +158,7 @@ Index: linux-2.6.25.4/include/asm-mips/cpu.h
  
  /*
   * Definitions for 7:0 on legacy processors
  
  /*
   * Definitions for 7:0 on legacy processors

-@@ -196,7 +200,8 @@ enum cpu_type_enum {
+@@ -196,7 +201,8 @@

         */
        CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_74K, CPU_AU1000,
        CPU_AU1100, CPU_AU1200, CPU_AU1210, CPU_AU1250, CPU_AU1500, CPU_AU1550,
         */
        CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_74K, CPU_AU1000,
        CPU_AU1100, CPU_AU1200, CPU_AU1210, CPU_AU1250, CPU_AU1500, CPU_AU1550,

diff --git a/target/linux/brcm63xx/patches-2.6.25/002-bcm963xx_serial.patch b/target/linux/brcm63xx/patches-2.6.25/002-bcm963xx_serial.patch
index e97c33f2dae72254f9c3ba4276766cda03dd2773..7c46a79e74e5245a332ddcc77a3f6681d440cb7e 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/002-bcm963xx_serial.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/002-bcm963xx_serial.patch
@@ -9,11 +9,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  drivers/serial/Makefile |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
  drivers/serial/Makefile |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 

-Index: linux-2.6.25.4/drivers/serial/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/serial/Makefile
-+++ linux-2.6.25.4/drivers/serial/Makefile
-@@ -67,3 +67,4 @@ obj-$(CONFIG_SERIAL_NETX) += netx-serial
+--- a/drivers/serial/Makefile
++++ b/drivers/serial/Makefile
+@@ -67,3 +67,4 @@

  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o

diff --git a/target/linux/brcm63xx/patches-2.6.25/040-bcm963xx_flashmap.patch b/target/linux/brcm63xx/patches-2.6.25/040-bcm963xx_flashmap.patch
index d3638c2f4287cdc6346e2943bf92b5e7c6c0cb30..e4e6ff5c586a1bda782dcf0ef9afad4c08e1be5d 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/040-bcm963xx_flashmap.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/040-bcm963xx_flashmap.patch
@@ -11,11 +11,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  drivers/mtd/redboot.c     |   13 ++++++++++---
  3 files changed, 18 insertions(+), 3 deletions(-)
 
  drivers/mtd/redboot.c     |   13 ++++++++++---
  3 files changed, 18 insertions(+), 3 deletions(-)
 

-Index: linux-2.6.25.4/drivers/mtd/maps/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/maps/Kconfig
-+++ linux-2.6.25.4/drivers/mtd/maps/Kconfig
-@@ -262,6 +262,13 @@ config MTD_MTX1
+--- a/drivers/mtd/maps/Kconfig
++++ b/drivers/mtd/maps/Kconfig
+@@ -262,6 +262,13 @@

          Flash memory access on 4G Systems MTX-1 Board. If you have one of
          these boards and would like to use the flash chips on it, say 'Y'.
  
          Flash memory access on 4G Systems MTX-1 Board. If you have one of
          these boards and would like to use the flash chips on it, say 'Y'.
  


@@ -29,20 +27,16 @@ Index: linux-2.6.25.4/drivers/mtd/maps/Kconfig
  config MTD_DILNETPC
        tristate "CFI Flash device mapped on DIL/Net PC"
        depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT
  config MTD_DILNETPC
        tristate "CFI Flash device mapped on DIL/Net PC"
        depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT

-Index: linux-2.6.25.4/drivers/mtd/maps/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/maps/Makefile
-+++ linux-2.6.25.4/drivers/mtd/maps/Makefile
-@@ -68,3 +68,4 @@ obj-$(CONFIG_MTD_PLATRAM)    += plat-ram.o
+--- a/drivers/mtd/maps/Makefile
++++ b/drivers/mtd/maps/Makefile
+@@ -68,3 +68,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_BCM963XX)    += bcm963xx-flash.o
  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_BCM963XX)    += bcm963xx-flash.o

-Index: linux-2.6.25.4/drivers/mtd/redboot.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/redboot.c
-+++ linux-2.6.25.4/drivers/mtd/redboot.c
-@@ -39,7 +39,7 @@ static inline int redboot_checksum(struc
+--- a/drivers/mtd/redboot.c
++++ b/drivers/mtd/redboot.c
+@@ -39,7 +39,7 @@

        return 1;
  }
  
        return 1;
  }
  


@@ -51,7 +45,7 @@ Index: linux-2.6.25.4/drivers/mtd/redboot.c
                               struct mtd_partition **pparts,
                               unsigned long fis_origin)
  {
                               struct mtd_partition **pparts,
                               unsigned long fis_origin)
  {

-@@ -161,6 +161,14 @@ static int parse_redboot_partitions(stru
+@@ -161,6 +161,14 @@

                goto out;
        }
  
                goto out;
        }
  


@@ -66,7 +60,7 @@ Index: linux-2.6.25.4/drivers/mtd/redboot.c
        for (i = 0; i < numslots; i++) {
                struct fis_list *new_fl, **prev;
  
        for (i = 0; i < numslots; i++) {
                struct fis_list *new_fl, **prev;
  

-@@ -183,9 +191,8 @@ static int parse_redboot_partitions(stru
+@@ -183,9 +191,8 @@

                new_fl->img = &buf[i];
                  if (fis_origin) {
                          buf[i].flash_base -= fis_origin;
                new_fl->img = &buf[i];
                  if (fis_origin) {
                          buf[i].flash_base -= fis_origin;

diff --git a/target/linux/brcm63xx/patches-2.6.25/050-bcm963xx_add_trailing_zero.patch b/target/linux/brcm63xx/patches-2.6.25/050-bcm963xx_add_trailing_zero.patch
index adb3f8be567e106c24e176734d91f877d4eb733f..d13ca92664e2b0d25c8bb4d2b091d9ca7a2c3dbb 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/050-bcm963xx_add_trailing_zero.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/050-bcm963xx_add_trailing_zero.patch
@@ -11,11 +11,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  arch/mips/Makefile |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
  arch/mips/Makefile |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 

-Index: linux-2.6.25.4/arch/mips/Makefile
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/Makefile
-+++ linux-2.6.25.4/arch/mips/Makefile
-@@ -562,7 +562,7 @@ load-$(CONFIG_BCM47XX)             := 0xffffffff800
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -562,7 +562,7 @@

  
  core-$(CONFIG_BCM963XX)               += arch/mips/bcm963xx/
  cflags-$(CONFIG_BCM963XX)     += -Iinclude/asm-mips/mach-bcm963xx
  
  core-$(CONFIG_BCM963XX)               += arch/mips/bcm963xx/
  cflags-$(CONFIG_BCM963XX)     += -Iinclude/asm-mips/mach-bcm963xx

diff --git a/target/linux/brcm63xx/patches-2.6.25/060-bcm963xx_rewrite_irq_handling_code.patch b/target/linux/brcm63xx/patches-2.6.25/060-bcm963xx_rewrite_irq_handling_code.patch
index e3cff528c5ea96d109a3187e017e1840cccdf32c..349010486f47d72f594dd528b30d7c29d5454af3 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/060-bcm963xx_rewrite_irq_handling_code.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/060-bcm963xx_rewrite_irq_handling_code.patch
@@ -13,10 +13,8 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  include/asm-mips/mach-bcm963xx/bcm_intr.h |   18 +--
  3 files changed, 119 insertions(+), 220 deletions(-)
 
  include/asm-mips/mach-bcm963xx/bcm_intr.h |   18 +--
  3 files changed, 119 insertions(+), 220 deletions(-)
 

-Index: linux-2.6.25.4/arch/mips/bcm963xx/irq.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm963xx/irq.c
-+++ linux-2.6.25.4/arch/mips/bcm963xx/irq.c
+--- a/arch/mips/bcm963xx/irq.c
++++ b/arch/mips/bcm963xx/irq.c

 @@ -1,259 +1,159 @@
  /*
 -<:copyright-gpl 
 @@ -1,259 +1,159 @@
  /*
 -<:copyright-gpl 


@@ -382,11 +380,9 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/irq.c
 -EXPORT_SYMBOL(request_external_irq);
 -EXPORT_SYMBOL(BcmHalMapInterrupt);
 -
 -EXPORT_SYMBOL(request_external_irq);
 -EXPORT_SYMBOL(BcmHalMapInterrupt);
 -

-Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/serial/bcm63xx_cons.c
-+++ linux-2.6.25.4/drivers/serial/bcm63xx_cons.c
-@@ -267,7 +267,7 @@ static void bcm_interrupt(int irq, void 
+--- a/drivers/serial/bcm63xx_cons.c
++++ b/drivers/serial/bcm63xx_cons.c
+@@ -267,7 +267,7 @@

        }
  
        // Clear the interrupt
        }
  
        // Clear the interrupt


@@ -395,7 +391,7 @@ Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
        return IRQ_HANDLED;
  #endif
  #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
        return IRQ_HANDLED;
  #endif

-@@ -880,7 +880,7 @@ static int bcm63xx_cons_open(struct tty_
+@@ -880,7 +880,7 @@

        info->count++;
        tty->driver_data = info;
        info->tty = tty;
        info->count++;
        tty->driver_data = info;
        info->tty = tty;


@@ -404,7 +400,7 @@ Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c
  
        // Start up serial port
        retval = startup(info);
  
        // Start up serial port
        retval = startup(info);

-@@ -927,7 +927,7 @@ static struct tty_operations rs_ops = {
+@@ -927,7 +927,7 @@

  -------------------------------------------------------------------------- */
  static int __init bcm63xx_serialinit(void)
  {
  -------------------------------------------------------------------------- */
  static int __init bcm63xx_serialinit(void)
  {


@@ -413,7 +409,7 @@ Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c
        struct bcm_serial *info;
  
        // Print the driver version information
        struct bcm_serial *info;
  
        // Print the driver version information

-@@ -981,7 +981,12 @@ static int __init bcm63xx_serialinit(voi
+@@ -981,7 +981,12 @@

                 */
                if (!info->port)
                        return 0;
                 */
                if (!info->port)
                        return 0;


@@ -427,11 +423,9 @@ Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c
        }
  
        /* order matters here... the trick is that flags
        }
  
        /* order matters here... the trick is that flags

-Index: linux-2.6.25.4/include/asm-mips/mach-bcm963xx/bcm_intr.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/mach-bcm963xx/bcm_intr.h
-+++ linux-2.6.25.4/include/asm-mips/mach-bcm963xx/bcm_intr.h
-@@ -39,18 +39,12 @@ struct pt_regs;
+--- a/include/asm-mips/mach-bcm963xx/bcm_intr.h
++++ b/include/asm-mips/mach-bcm963xx/bcm_intr.h
+@@ -39,18 +39,12 @@

  typedef int (*FN_HANDLER) (int, void *);
  
  /* prototypes */
  typedef int (*FN_HANDLER) (int, void *);
  
  /* prototypes */

diff --git a/target/linux/brcm63xx/patches-2.6.25/070-bcm963xx_fix_uart_isr.patch b/target/linux/brcm63xx/patches-2.6.25/070-bcm963xx_fix_uart_isr.patch
index 38aef5da1c3e57ec0897055cf816567072ca93f3..a90bde3f897ced0dd733122de4d75971d5742378 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/070-bcm963xx_fix_uart_isr.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/070-bcm963xx_fix_uart_isr.patch
@@ -12,11 +12,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  drivers/serial/bcm63xx_cons.c |    6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)
 
  drivers/serial/bcm63xx_cons.c |    6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)
 

-Index: linux-2.6.25.4/drivers/serial/bcm63xx_cons.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/serial/bcm63xx_cons.c
-+++ linux-2.6.25.4/drivers/serial/bcm63xx_cons.c
-@@ -258,8 +258,14 @@ static void bcm_interrupt(int irq, void 
+--- a/drivers/serial/bcm63xx_cons.c
++++ b/drivers/serial/bcm63xx_cons.c
+@@ -258,8 +258,14 @@

        while (intStat) {
                if (intStat & RXINT)
                        receive_chars(info);
        while (intStat) {
                if (intStat & RXINT)
                        receive_chars(info);

diff --git a/target/linux/brcm63xx/patches-2.6.25/080-bcm963xx_remove_unused_int_handler.patch b/target/linux/brcm63xx/patches-2.6.25/080-bcm963xx_remove_unused_int_handler.patch
index 5ba30af3b22ddb0f31c54e7b999a28e7dcc51a31..0abfd9885545ce02a5ef4fc0517646673b319b77 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/080-bcm963xx_remove_unused_int_handler.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/080-bcm963xx_remove_unused_int_handler.patch
@@ -12,10 +12,8 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  2 files changed, 1 insertions(+), 60 deletions(-)
  delete mode 100644 arch/mips/bcm963xx/int-handler.S
 
  2 files changed, 1 insertions(+), 60 deletions(-)
  delete mode 100644 arch/mips/bcm963xx/int-handler.S
 

-Index: linux-2.6.25.4/arch/mips/bcm963xx/Makefile
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm963xx/Makefile
-+++ linux-2.6.25.4/arch/mips/bcm963xx/Makefile
+--- a/arch/mips/bcm963xx/Makefile
++++ b/arch/mips/bcm963xx/Makefile

 @@ -3,7 +3,7 @@
  #
  # Copyright (C) 2004 Broadcom Corporation
 @@ -3,7 +3,7 @@
  #
  # Copyright (C) 2004 Broadcom Corporation


@@ -25,9 +23,7 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/Makefile
  
  SRCBASE         := $(TOPDIR)
  EXTRA_CFLAGS    += -I$(SRCBASE)/include
  
  SRCBASE         := $(TOPDIR)
  EXTRA_CFLAGS    += -I$(SRCBASE)/include

-Index: linux-2.6.25.4/arch/mips/bcm963xx/int-handler.S
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm963xx/int-handler.S
+--- a/arch/mips/bcm963xx/int-handler.S

 +++ /dev/null
 @@ -1,59 +0,0 @@
 -/*
 +++ /dev/null
 @@ -1,59 +0,0 @@
 -/*

diff --git a/target/linux/brcm63xx/patches-2.6.25/090-bcm963xx_remove_obsolete_timer_code.patch b/target/linux/brcm63xx/patches-2.6.25/090-bcm963xx_remove_obsolete_timer_code.patch
index 5f7d6d8ee904a3d8d19b01002a0da3886095d1a4..72ccfea7f6e64f5918d06e7f2a2cbc4ffd25e1fb 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/090-bcm963xx_remove_obsolete_timer_code.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/090-bcm963xx_remove_obsolete_timer_code.patch
@@ -11,11 +11,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  arch/mips/bcm963xx/time.c  |   29 -----------------------------
  2 files changed, 0 insertions(+), 31 deletions(-)
 
  arch/mips/bcm963xx/time.c  |   29 -----------------------------
  2 files changed, 0 insertions(+), 31 deletions(-)
 

-Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm963xx/setup.c
-+++ linux-2.6.25.4/arch/mips/bcm963xx/setup.c
-@@ -465,8 +465,6 @@ void __init plat_mem_setup(void)
+--- a/arch/mips/bcm963xx/setup.c
++++ b/arch/mips/bcm963xx/setup.c
+@@ -465,8 +465,6 @@

        _machine_halt = brcm_machine_halt;
        pm_power_off = brcm_machine_halt;
  
        _machine_halt = brcm_machine_halt;
        pm_power_off = brcm_machine_halt;
  


@@ -24,11 +22,9 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
        /* mpi initialization */
        mpi_init();
  }
        /* mpi initialization */
        mpi_init();
  }

-Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm963xx/time.c
-+++ linux-2.6.25.4/arch/mips/bcm963xx/time.c
-@@ -71,26 +71,6 @@ static inline unsigned long __init cal_r
+--- a/arch/mips/bcm963xx/time.c
++++ b/arch/mips/bcm963xx/time.c
+@@ -71,26 +71,6 @@

        return (mips_hpt_frequency / HZ);
  }
  
        return (mips_hpt_frequency / HZ);
  }
  


@@ -55,7 +51,7 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
  void __init plat_time_init(void)
  {
        unsigned int est_freq, flags;
  void __init plat_time_init(void)
  {
        unsigned int est_freq, flags;

-@@ -107,12 +87,3 @@ void __init plat_time_init(void)
+@@ -107,12 +87,3 @@

                   (est_freq % 1000000) * 100 / 1000000);
        local_irq_restore(flags);
  }
                   (est_freq % 1000000) * 100 / 1000000);
        local_irq_restore(flags);
  }

diff --git a/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch b/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch
index ce75ba8e865239d1e00fceb1631f559447c5d0b0..9d08ab087bc3224e62903f2b04bd5a1cb0d0c83b 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/100-bcm963xx_add_new_timer_code.patch
@@ -12,11 +12,9 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  arch/mips/bcm963xx/time.c |   64 ++++++++++++++++++++------------------------
  2 files changed, 31 insertions(+), 35 deletions(-)
 
  arch/mips/bcm963xx/time.c |   64 ++++++++++++++++++++------------------------
  2 files changed, 31 insertions(+), 35 deletions(-)
 

-Index: linux-2.6.25.4/arch/mips/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/Kconfig
-+++ linux-2.6.25.4/arch/mips/Kconfig
-@@ -67,6 +67,8 @@ config BCM963XX
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -67,6 +67,8 @@

         select HW_HAS_PCI
         select DMA_NONCOHERENT
         select IRQ_CPU
         select HW_HAS_PCI
         select DMA_NONCOHERENT
         select IRQ_CPU


@@ -25,10 +23,8 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
         help
           This is a fmaily of boards based on the Broadcom MIPS32
  
         help
           This is a fmaily of boards based on the Broadcom MIPS32
  

-Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm963xx/time.c
-+++ linux-2.6.25.4/arch/mips/bcm963xx/time.c
+--- a/arch/mips/bcm963xx/time.c
++++ b/arch/mips/bcm963xx/time.c

 @@ -1,6 +1,7 @@
  /*
  <:copyright-gpl
 @@ -1,6 +1,7 @@
  /*
  <:copyright-gpl

diff --git a/target/linux/brcm63xx/patches-2.6.25/110-bcm963xx_fix_cfe_detection.patch b/target/linux/brcm63xx/patches-2.6.25/110-bcm963xx_fix_cfe_detection.patch
index e22f22126ff01f56eb7e68c37aaf8744dd3bff3c..3cf46026661cc3316e857d2aa088f631abb41e0d 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/110-bcm963xx_fix_cfe_detection.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/110-bcm963xx_fix_cfe_detection.patch
@@ -10,10 +10,8 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  drivers/mtd/maps/bcm963xx-flash.c |   11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)
 
  drivers/mtd/maps/bcm963xx-flash.c |   11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)
 

-Index: linux-2.6.25.4/drivers/mtd/maps/bcm963xx-flash.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/maps/bcm963xx-flash.c
-+++ linux-2.6.25.4/drivers/mtd/maps/bcm963xx-flash.c
+--- a/drivers/mtd/maps/bcm963xx-flash.c
++++ b/drivers/mtd/maps/bcm963xx-flash.c

 @@ -1,8 +1,7 @@
  /*
 - * $Id$
 @@ -1,8 +1,7 @@
  /*
 - * $Id$


@@ -25,7 +23,7 @@ Index: linux-2.6.25.4/drivers/mtd/maps/bcm963xx-flash.c
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by

-@@ -184,11 +183,13 @@ static int bcm963xx_parts_size = sizeof(
+@@ -184,11 +183,13 @@

  static int bcm963xx_detect_cfe(struct mtd_info *master)
  {
         int idoffset = 0x4e0;
  static int bcm963xx_detect_cfe(struct mtd_info *master)
  {
         int idoffset = 0x4e0;

diff --git a/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch b/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch
index 1f8dd96f0c192bd07c7488f08d45a4d7c8aea2ae..dd55cd163a2c5a62ea2c6f238c7c3ad3e2c7befd 100644 (file)
--- a/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch
+++ b/target/linux/brcm63xx/patches-2.6.25/500-bcm96345_fixes.patch
@@ -17,10 +17,8 @@ Signed-off-by: Axel Gembe <ago@bastart.eu.org>
  include/asm-mips/mach-bcm963xx/board.h |    2 ++
  4 files changed, 25 insertions(+), 11 deletions(-)
 
  include/asm-mips/mach-bcm963xx/board.h |    2 ++
  4 files changed, 25 insertions(+), 11 deletions(-)
 

-Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm963xx/setup.c
-+++ linux-2.6.25.4/arch/mips/bcm963xx/setup.c
+--- a/arch/mips/bcm963xx/setup.c
++++ b/arch/mips/bcm963xx/setup.c

 @@ -43,6 +43,7 @@
  #include <asm/bootinfo.h>
  #include <asm/cpu.h>
 @@ -43,6 +43,7 @@
  #include <asm/bootinfo.h>
  #include <asm/cpu.h>


@@ -29,7 +27,7 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
  
  extern void brcm_time_init(void);
  extern int boot_loader_type;
  
  extern void brcm_time_init(void);
  extern int boot_loader_type;

-@@ -465,6 +466,9 @@ void __init plat_mem_setup(void)
+@@ -465,6 +466,9 @@

        _machine_halt = brcm_machine_halt;
        pm_power_off = brcm_machine_halt;
  
        _machine_halt = brcm_machine_halt;
        pm_power_off = brcm_machine_halt;
  


@@ -41,10 +39,8 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/setup.c
 +              mpi_init();
 +      }
  }
 +              mpi_init();
 +      }
  }

-Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/bcm963xx/time.c
-+++ linux-2.6.25.4/arch/mips/bcm963xx/time.c
+--- a/arch/mips/bcm963xx/time.c
++++ b/arch/mips/bcm963xx/time.c

 @@ -40,6 +40,8 @@
  #include <6348_intr.h>
  #include <bcm_map_part.h>
 @@ -40,6 +40,8 @@
  #include <6348_intr.h>
  #include <bcm_map_part.h>


@@ -54,7 +50,7 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
  
  /*
   * calculateCpuSpeed()
  
  /*
   * calculateCpuSpeed()

-@@ -63,11 +65,12 @@ static inline unsigned long __init calcu
+@@ -63,11 +65,12 @@

  }
  
  
  }
  
  


@@ -68,10 +64,8 @@ Index: linux-2.6.25.4/arch/mips/bcm963xx/time.c
  
        printk("CPU frequency %lu.%02lu MHz\n", cpu_clock / 1000000,
                (cpu_clock % 1000000) * 100 / 1000000);
  
        printk("CPU frequency %lu.%02lu MHz\n", cpu_clock / 1000000,
                (cpu_clock % 1000000) * 100 / 1000000);

-Index: linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/pci/pci-bcm96348.c
-+++ linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c
+--- a/arch/mips/pci/pci-bcm96348.c
++++ b/arch/mips/pci/pci-bcm96348.c

 @@ -21,6 +21,8 @@
  #include <linux/kernel.h>
  #include <linux/init.h>
 @@ -21,6 +21,8 @@
  #include <linux/kernel.h>
  #include <linux/init.h>


@@ -81,7 +75,7 @@ Index: linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c
  #include <bcmpci.h>
  
  static struct resource bcm_pci_io_resource = {
  #include <bcmpci.h>
  
  static struct resource bcm_pci_io_resource = {

-@@ -47,16 +49,19 @@ struct pci_controller bcm96348_controlle
+@@ -47,16 +49,19 @@

  
  static __init int bcm96348_pci_init(void)
  {
  
  static __init int bcm96348_pci_init(void)
  {


@@ -110,11 +104,9 @@ Index: linux-2.6.25.4/arch/mips/pci/pci-bcm96348.c
  }
  
  arch_initcall(bcm96348_pci_init);
  }
  
  arch_initcall(bcm96348_pci_init);

-Index: linux-2.6.25.4/include/asm-mips/mach-bcm963xx/board.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/mach-bcm963xx/board.h
-+++ linux-2.6.25.4/include/asm-mips/mach-bcm963xx/board.h
-@@ -369,5 +369,7 @@ void kerSysWakeupMonitorTask( void );
+--- a/include/asm-mips/mach-bcm963xx/board.h
++++ b/include/asm-mips/mach-bcm963xx/board.h
+@@ -369,5 +369,7 @@

  
  extern int boot_loader_type;
  
  
  extern int boot_loader_type;
  

diff --git a/target/linux/etrax/Makefile b/target/linux/etrax/Makefile
index dfb7502aa720ea5e32fe71eab35c42506b18804d..95dbdcd821f99d4c8cdbe6e34c2c8da3a30b15ae 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.6
+LINUX_VERSION:=2.6.25.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 6a976d8ff6560984d90890a6dfb8435b7c5a5706..61cbf1b1da5996daa7c1780f0cdcb58190396ce8 100644 (file)
--- a/target/linux/etrax/patches/100-compile_fixes.patch
+++ b/target/linux/etrax/patches/100-compile_fixes.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.4/arch/cris/arch-v10/boot/Makefile
-===================================================================
---- linux-2.6.25.4.orig/arch/cris/arch-v10/boot/Makefile       2008-06-09 17:00:36.381498250 +0200
-+++ linux-2.6.25.4/arch/cris/arch-v10/boot/Makefile    2008-06-09 17:00:40.967491000 +0200
+--- a/arch/cris/arch-v10/boot/Makefile
++++ b/arch/cris/arch-v10/boot/Makefile

 @@ -2,7 +2,6 @@
  # arch/cris/arch-v10/boot/Makefile
  #
 @@ -2,7 +2,6 @@
  # arch/cris/arch-v10/boot/Makefile
  #


@@ -18,10 +16,8 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/boot/Makefile
  
  $(obj)/zImage:  $(obj)/compressed/vmlinux
        @cp $< $@
  
  $(obj)/zImage:  $(obj)/compressed/vmlinux
        @cp $< $@

-Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/Makefile
-===================================================================
---- linux-2.6.25.4.orig/arch/cris/arch-v10/boot/compressed/Makefile    2008-06-09 17:00:36.381498250 +0200
-+++ linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/Makefile 2008-06-09 17:00:40.967491000 +0200
+--- a/arch/cris/arch-v10/boot/compressed/Makefile
++++ b/arch/cris/arch-v10/boot/compressed/Makefile

 @@ -2,12 +2,10 @@
  # arch/cris/arch-v10/boot/compressed/Makefile
  #
 @@ -2,12 +2,10 @@
  # arch/cris/arch-v10/boot/compressed/Makefile
  #


@@ -49,10 +45,8 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/Makefile
  
  $(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)

-Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/misc.c
-===================================================================
---- linux-2.6.25.4.orig/arch/cris/arch-v10/boot/compressed/misc.c      2008-06-09 17:00:36.381498250 +0200
-+++ linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/misc.c   2008-06-09 17:00:40.967491000 +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.
   *


@@ -117,10 +111,8 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/misc.c
 -      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");
  }

-Index: linux-2.6.25.4/arch/cris/arch-v10/mm/init.c
-===================================================================
---- linux-2.6.25.4.orig/arch/cris/arch-v10/mm/init.c   2008-06-09 17:00:36.385496500 +0200
-+++ linux-2.6.25.4/arch/cris/arch-v10/mm/init.c        2008-06-09 17:00:40.967491000 +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);


@@ -131,10 +123,8 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/mm/init.c
  
  /* Initialize remaps of some I/O-ports. It is important that this
   * is called before any driver is initialized.
  
  /* Initialize remaps of some I/O-ports. It is important that this
   * is called before any driver is initialized.

-Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/head.S
-===================================================================
---- linux-2.6.25.4.orig/arch/cris/arch-v10/boot/compressed/head.S      2008-06-09 17:00:36.385496500 +0200
-+++ linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/head.S   2008-06-09 17:00:40.971489250 +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


@@ -289,10 +279,8 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/head.S
 +cmd_line_addr:
        .dword 0
  #include "../../lib/hw_settings.S"
 +cmd_line_addr:
        .dword 0
  #include "../../lib/hw_settings.S"

-Index: linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/decompress.ld
-===================================================================
---- linux-2.6.25.4.orig/arch/cris/arch-v10/boot/compressed/decompress.ld       2008-05-15 17:00:12.000000000 +0200
-+++ linux-2.6.25.4/arch/cris/arch-v10/boot/compressed/decompress.ld    2008-06-09 17:12:54.930425750 +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)
 @@ -1,4 +1,4 @@
 -OUTPUT_FORMAT(elf32-us-cris)
 +OUTPUT_FORMAT(elf32-cris)

diff --git a/target/linux/etrax/patches/200-samsung_flash.patch b/target/linux/etrax/patches/200-samsung_flash.patch
index f15c1116bbe7a897e099ced1d4bf4c13fa1febd1..ac4ac67818e44879ae57f53b00d79d8b1cd5c576 100644 (file)
--- a/target/linux/etrax/patches/200-samsung_flash.patch
+++ b/target/linux/etrax/patches/200-samsung_flash.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -297,8 +297,8 @@ struct mtd_info *cfi_cmdset_0002(struct 
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -297,8 +297,8 @@

                        return NULL;
                }
  
                        return NULL;
                }
  

diff --git a/target/linux/etrax/patches/201-flashsize.patch b/target/linux/etrax/patches/201-flashsize.patch
index 0348bb04990a72c836ada22432cc59751ad72382..859bb46fdc018b2cc79593fdb1abd9ea1c3fadcb 100644 (file)
--- a/target/linux/etrax/patches/201-flashsize.patch
+++ b/target/linux/etrax/patches/201-flashsize.patch
@@ -1,18 +1,14 @@
-Index: linux-2.6.25.4/arch/cris/arch-v10/lib/hw_settings.S
-===================================================================
---- linux-2.6.25.4.orig/arch/cris/arch-v10/lib/hw_settings.S
-+++ linux-2.6.25.4/arch/cris/arch-v10/lib/hw_settings.S
+--- 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
        .dword 0 ; No more register values
 +      .ascii "ACME_PART_MAGIC" 
 +      .dword 0xdeadc0de
 @@ -60,3 +60,5 @@
        .dword R_PORT_PB_SET
        .dword PB_SET_VALUE
        .dword 0 ; No more register values
 +      .ascii "ACME_PART_MAGIC" 
 +      .dword 0xdeadc0de

-Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c
-===================================================================
---- linux-2.6.25.4.orig/arch/cris/arch-v10/drivers/axisflashmap.c
-+++ linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c
-@@ -113,7 +113,7 @@ static struct map_info map_cse1 = {
+--- a/arch/cris/arch-v10/drivers/axisflashmap.c
++++ b/arch/cris/arch-v10/drivers/axisflashmap.c
+@@ -113,7 +113,7 @@

  
  /* If no partition-table was found, we use this default-set. */
  #define MAX_PARTITIONS         7
  
  /* If no partition-table was found, we use this default-set. */
  #define MAX_PARTITIONS         7


@@ -21,7 +17,7 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c
  
  /*
   * Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the
  
  /*
   * Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the

-@@ -122,19 +122,14 @@ static struct map_info map_cse1 = {
+@@ -122,19 +122,14 @@

   */
  static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = {
        {
   */
  static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = {
        {


@@ -46,7 +42,7 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c
        }
  };
  
        }
  };
  

-@@ -281,6 +276,11 @@ static int __init init_axis_flash(void)
+@@ -281,6 +276,11 @@

        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";
        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";


@@ -58,7 +54,7 @@ Index: linux-2.6.25.4/arch/cris/arch-v10/drivers/axisflashmap.c
  
        if (!(mymtd = flash_probe())) {
                /* There's no reason to use this module if no flash chip can
  
        if (!(mymtd = flash_probe())) {
                /* There's no reason to use this module if no flash chip can

-@@ -292,6 +292,31 @@ static int __init init_axis_flash(void)
+@@ -292,6 +292,31 @@

                       mymtd->name, mymtd->size);
                axisflash_mtd = mymtd;
        }
                       mymtd->name, mymtd->size);
                axisflash_mtd = mymtd;
        }

diff --git a/target/linux/etrax/patches/300-sysfs.patch b/target/linux/etrax/patches/300-sysfs.patch
index 4ffc15d6675a968594972af9d72fc04850085b45..3b0378421a077b055fa7e00d31f0b38d349c6be5 100644 (file)
--- a/target/linux/etrax/patches/300-sysfs.patch
+++ b/target/linux/etrax/patches/300-sysfs.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/serial/crisv10.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/serial/crisv10.c
-+++ linux-2.6.25.4/drivers/serial/crisv10.c
-@@ -27,6 +27,7 @@ static char *serial_version = "$Revision
+--- a/drivers/serial/crisv10.c
++++ b/drivers/serial/crisv10.c
+@@ -27,6 +27,7 @@

  #include <linux/kernel.h>
  #include <linux/mutex.h>
  #include <linux/bitops.h>
  #include <linux/kernel.h>
  #include <linux/mutex.h>
  #include <linux/bitops.h>


@@ -10,7 +8,7 @@ Index: linux-2.6.25.4/drivers/serial/crisv10.c
  
  #include <asm/io.h>
  #include <asm/irq.h>
  
  #include <asm/io.h>
  #include <asm/irq.h>

-@@ -4384,6 +4385,7 @@ static const struct tty_operations rs_op
+@@ -4384,6 +4385,7 @@

        .tiocmset = rs_tiocmset
  };
  
        .tiocmset = rs_tiocmset
  };
  


@@ -18,7 +16,7 @@ Index: linux-2.6.25.4/drivers/serial/crisv10.c
  static int __init
  rs_init(void)
  {
  static int __init
  rs_init(void)
  {

-@@ -4518,6 +4520,24 @@ rs_init(void)
+@@ -4518,6 +4520,24 @@

  #endif
  #endif /* CONFIG_SVINTO_SIM */
  
  #endif
  #endif /* CONFIG_SVINTO_SIM */
  

diff --git a/target/linux/etrax/patches/301-usb_support.patch b/target/linux/etrax/patches/301-usb_support.patch
index 8e80eea536ce27e5fbd206336dc0452dcd0a3e3d..5b443d42fa1550f2a8415d37ee95a100f841b442 100644 (file)
--- a/target/linux/etrax/patches/301-usb_support.patch
+++ b/target/linux/etrax/patches/301-usb_support.patch
@@ -1,6 +1,5 @@
-diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/drivers/usb/Makefile source-2.6.25-rc8/drivers/usb/Makefile
---- clean-2.6.25-rc8/drivers/usb/Makefile      2008-04-07 10:26:24.000000000 +0200
-+++ source-2.6.25-rc8/drivers/usb/Makefile     2008-04-07 10:29:40.000000000 +0200
+--- a/drivers/usb/Makefile
++++ b/drivers/usb/Makefile

 @@ -16,6 +16,7 @@
  obj-$(CONFIG_USB_SL811_HCD)   += host/
  obj-$(CONFIG_USB_U132_HCD)    += host/
 @@ -16,6 +16,7 @@
  obj-$(CONFIG_USB_SL811_HCD)   += host/
  obj-$(CONFIG_USB_U132_HCD)    += host/


@@ -9,18 +8,16 @@ diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/dr
  
  obj-$(CONFIG_USB_ACM)         += class/
  obj-$(CONFIG_USB_PRINTER)     += class/
  
  obj-$(CONFIG_USB_ACM)         += class/
  obj-$(CONFIG_USB_PRINTER)     += class/

-diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/drivers/usb/host/Makefile source-2.6.25-rc8/drivers/usb/host/Makefile
---- clean-2.6.25-rc8/drivers/usb/host/Makefile 2008-04-07 10:26:24.000000000 +0200
-+++ source-2.6.25-rc8/drivers/usb/host/Makefile        2008-04-07 10:29:40.000000000 +0200
+--- a/drivers/usb/host/Makefile
++++ b/drivers/usb/host/Makefile

 @@ -17,3 +17,5 @@
  obj-$(CONFIG_USB_U132_HCD)    += u132-hcd.o
  obj-$(CONFIG_USB_R8A66597_HCD)        += r8a66597-hcd.o
  
 +#obj-$(CONFIG_USB_CARNEOL)    += hc-crisv10.o
 +obj-$(CONFIG_ETRAX_USB_HOST)  += hc-crisv10.o
 @@ -17,3 +17,5 @@
  obj-$(CONFIG_USB_U132_HCD)    += u132-hcd.o
  obj-$(CONFIG_USB_R8A66597_HCD)        += r8a66597-hcd.o
  
 +#obj-$(CONFIG_USB_CARNEOL)    += hc-crisv10.o
 +obj-$(CONFIG_ETRAX_USB_HOST)  += hc-crisv10.o

-diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/drivers/usb/host/hc-cris-dbg.h source-2.6.25-rc8/drivers/usb/host/hc-cris-dbg.h
---- clean-2.6.25-rc8/drivers/usb/host/hc-cris-dbg.h    1970-01-01 01:00:00.000000000 +0100
-+++ source-2.6.25-rc8/drivers/usb/host/hc-cris-dbg.h   2008-04-07 10:29:40.000000000 +0200
+--- /dev/null
++++ b/drivers/usb/host/hc-cris-dbg.h

 @@ -0,0 +1,143 @@
 +
 +/* macros for debug output */
 @@ -0,0 +1,143 @@
 +
 +/* macros for debug output */


@@ -165,9 +162,8 @@ diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/dr
 +              };                                                      \
 +              s;                                                      \
 +      })
 +              };                                                      \
 +              s;                                                      \
 +      })

-diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/drivers/usb/host/hc-crisv10.c source-2.6.25-rc8/drivers/usb/host/hc-crisv10.c
---- clean-2.6.25-rc8/drivers/usb/host/hc-crisv10.c     1970-01-01 01:00:00.000000000 +0100
-+++ source-2.6.25-rc8/drivers/usb/host/hc-crisv10.c    2008-04-07 10:29:40.000000000 +0200
+--- /dev/null
++++ b/drivers/usb/host/hc-crisv10.c

 @@ -0,0 +1,4800 @@
 +/*
 + *
 @@ -0,0 +1,4800 @@
 +/*
 + *


@@ -4969,9 +4965,8 @@ diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/dr
 +/* Module hooks */
 +module_init(module_hcd_init);
 +module_exit(module_hcd_exit);
 +/* Module hooks */
 +module_init(module_hcd_init);
 +module_exit(module_hcd_exit);

-diff -x .org -x .orig -x '.c*' -x '.h*' -x .git -x .git -urN clean-2.6.25-rc8/drivers/usb/host/hc-crisv10.h source-2.6.25-rc8/drivers/usb/host/hc-crisv10.h
---- clean-2.6.25-rc8/drivers/usb/host/hc-crisv10.h     1970-01-01 01:00:00.000000000 +0100
-+++ source-2.6.25-rc8/drivers/usb/host/hc-crisv10.h    2008-04-07 10:29:40.000000000 +0200
+--- /dev/null
++++ b/drivers/usb/host/hc-crisv10.h

 @@ -0,0 +1,331 @@
 +#ifndef __LINUX_ETRAX_USB_H
 +#define __LINUX_ETRAX_USB_H
 @@ -0,0 +1,331 @@
 +#ifndef __LINUX_ETRAX_USB_H
 +#define __LINUX_ETRAX_USB_H

diff --git a/target/linux/ifxmips/Makefile b/target/linux/ifxmips/Makefile
index 46ee6fc8b68ca1ea75f207e127d812ca6eeac3da..4767dce71eb23ac12c204e432393b3703b656d28 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.25.6
+LINUX_VERSION:=2.6.25.7

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/ifxmips/patches/100-board.patch b/target/linux/ifxmips/patches/100-board.patch
index 60d2fe7372acab51c86ce84b2cd28c48efc00bd5..eea8c159d259441afbaa0e130faa11499953febb 100644 (file)
--- a/target/linux/ifxmips/patches/100-board.patch
+++ b/target/linux/ifxmips/patches/100-board.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/arch/mips/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/Kconfig
-+++ linux-2.6.25.4/arch/mips/Kconfig
-@@ -78,6 +78,21 @@ config MIPS_COBALT
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -78,6 +78,21 @@

        select SYS_SUPPORTS_LITTLE_ENDIAN
        select GENERIC_HARDIRQS_NO__DO_IRQ
  
        select SYS_SUPPORTS_LITTLE_ENDIAN
        select GENERIC_HARDIRQS_NO__DO_IRQ
  


@@ -24,7 +22,7 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
  config MACH_DECSTATION
        bool "DECstations"
        select BOOT_ELF32
  config MACH_DECSTATION
        bool "DECstations"
        select BOOT_ELF32

-@@ -693,6 +706,7 @@ source "arch/mips/sibyte/Kconfig"
+@@ -693,6 +708,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"


@@ -32,11 +30,9 @@ Index: linux-2.6.25.4/arch/mips/Kconfig
  
  endmenu
  
  
  endmenu
  

-Index: linux-2.6.25.4/arch/mips/Makefile
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/Makefile
-+++ linux-2.6.25.4/arch/mips/Makefile
-@@ -282,6 +282,13 @@ core-$(CONFIG_MIPS_COBALT)        += arch/mips/
+--- a/arch/mips/Makefile
++++ b/arch/mips/Makefile
+@@ -282,6 +282,13 @@

  cflags-$(CONFIG_MIPS_COBALT)  += -Iinclude/asm-mips/mach-cobalt
  load-$(CONFIG_MIPS_COBALT)    += 0xffffffff80080000
  
  cflags-$(CONFIG_MIPS_COBALT)  += -Iinclude/asm-mips/mach-cobalt
  load-$(CONFIG_MIPS_COBALT)    += 0xffffffff80080000
  


@@ -50,10 +46,8 @@ Index: linux-2.6.25.4/arch/mips/Makefile
  #
  # DECstation family
  #
  #
  # DECstation family
  #

-Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
-===================================================================
---- linux-2.6.25.4.orig/include/asm-mips/bootinfo.h
-+++ linux-2.6.25.4/include/asm-mips/bootinfo.h
+--- a/include/asm-mips/bootinfo.h
++++ b/include/asm-mips/bootinfo.h

 @@ -94,6 +94,12 @@
  #define MACH_MSP7120_FPGA       5     /* PMC-Sierra MSP7120 Emulation */
  #define MACH_MSP_OTHER        255     /* PMC-Sierra unknown board type */
 @@ -94,6 +94,12 @@
  #define MACH_MSP7120_FPGA       5     /* PMC-Sierra MSP7120 Emulation */
  #define MACH_MSP_OTHER        255     /* PMC-Sierra unknown board type */


@@ -67,11 +61,9 @@ Index: linux-2.6.25.4/include/asm-mips/bootinfo.h
  #define CL_SIZE                       COMMAND_LINE_SIZE
  
  extern char *system_type;
  #define CL_SIZE                       COMMAND_LINE_SIZE
  
  extern char *system_type;

-Index: linux-2.6.25.4/arch/mips/kernel/traps.c
-===================================================================
---- linux-2.6.25.4.orig/arch/mips/kernel/traps.c
-+++ linux-2.6.25.4/arch/mips/kernel/traps.c
-@@ -1379,6 +1379,7 @@ void __cpuinit per_cpu_trap_init(void)
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -1379,6 +1379,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 c3091be13a1570c94419b06e2bb36805818f4f23..a2fba850325b032c328f941abb2df9386794fbcf 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.25.4/drivers/char/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/char/Makefile  2008-06-07 10:59:30.000000000 +0100
-+++ linux-2.6.25.4/drivers/char/Makefile       2008-06-07 10:59:42.000000000 +0100
+--- a/drivers/char/Makefile
++++ b/drivers/char/Makefile

 @@ -113,6 +113,12 @@
  obj-$(CONFIG_JS_RTC)          += js-rtc.o
  js-rtc-y = rtc.o
 @@ -113,6 +113,12 @@
  obj-$(CONFIG_JS_RTC)          += js-rtc.o
  js-rtc-y = rtc.o


@@ -15,19 +13,15 @@ Index: linux-2.6.25.4/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.25.4/drivers/mtd/maps/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/maps/Makefile      2008-06-07 10:59:30.000000000 +0100
-+++ linux-2.6.25.4/drivers/mtd/maps/Makefile   2008-06-07 10:59:42.000000000 +0100
+--- a/drivers/mtd/maps/Makefile
++++ b/drivers/mtd/maps/Makefile

 @@ -68,3 +68,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
 @@ -68,3 +68,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.25.4/drivers/net/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/Kconfig    2008-06-07 10:59:30.000000000 +0100
-+++ linux-2.6.25.4/drivers/net/Kconfig 2008-06-07 10:59:42.000000000 +0100
+--- 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"


@@ -41,10 +35,8 @@ Index: linux-2.6.25.4/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.25.4/drivers/serial/Kconfig
-===================================================================
---- linux-2.6.25.4.orig/drivers/serial/Kconfig 2008-06-07 10:59:30.000000000 +0100
-+++ linux-2.6.25.4/drivers/serial/Kconfig      2008-06-07 10:59:42.000000000 +0100
+--- a/drivers/serial/Kconfig
++++ b/drivers/serial/Kconfig

 @@ -1327,6 +1327,14 @@
          Currently, only 8250 compatible ports are supported, but
          others can easily be added.
 @@ -1327,6 +1327,14 @@
          Currently, only 8250 compatible ports are supported, but
          others can easily be added.


@@ -60,20 +52,16 @@ Index: linux-2.6.25.4/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.25.4/drivers/serial/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/serial/Makefile        2008-06-07 10:59:30.000000000 +0100
-+++ linux-2.6.25.4/drivers/serial/Makefile     2008-06-07 10:59:42.000000000 +0100
+--- a/drivers/serial/Makefile
++++ b/drivers/serial/Makefile

 @@ -66,4 +66,5 @@
  obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
 +obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o
 @@ -66,4 +66,5 @@
  obj-$(CONFIG_SERIAL_NETX) += netx-serial.o
  obj-$(CONFIG_SERIAL_OF_PLATFORM) += of_serial.o
  obj-$(CONFIG_SERIAL_KS8695) += serial_ks8695.o
 +obj-$(CONFIG_SERIAL_IFXMIPS) += ifxmips_asc.o
  obj-$(CONFIG_SERIAL_QE) += ucc_uart.o

-Index: linux-2.6.25.4/drivers/watchdog/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/watchdog/Makefile      2008-06-07 10:59:30.000000000 +0100
-+++ linux-2.6.25.4/drivers/watchdog/Makefile   2008-06-07 10:59:42.000000000 +0100
+--- a/drivers/watchdog/Makefile
++++ b/drivers/watchdog/Makefile

 @@ -96,6 +96,7 @@
  obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
  obj-$(CONFIG_AR7_WDT) += ar7_wdt.o
 @@ -96,6 +96,7 @@
  obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o
  obj-$(CONFIG_AR7_WDT) += ar7_wdt.o


@@ -82,10 +70,8 @@ Index: linux-2.6.25.4/drivers/watchdog/Makefile
  
  # PARISC Architecture
  
  
  # PARISC Architecture
  

-Index: linux-2.6.25.4/drivers/net/Makefile
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/Makefile   2008-06-07 11:00:16.000000000 +0100
-+++ linux-2.6.25.4/drivers/net/Makefile        2008-06-07 11:01:08.000000000 +0100
+--- a/drivers/net/Makefile
++++ b/drivers/net/Makefile

 @@ -254,3 +254,4 @@
  obj-$(CONFIG_NETXEN_NIC) += netxen/
  obj-$(CONFIG_NIU) += niu.o
 @@ -254,3 +254,4 @@
  obj-$(CONFIG_NETXEN_NIC) += netxen/
  obj-$(CONFIG_NIU) += niu.o

diff --git a/target/linux/ifxmips/patches/160-cfi-swap.patch b/target/linux/ifxmips/patches/160-cfi-swap.patch
index cf749be10de01fe58e961bad8cc49246fedeb47f..51b82023ad7de03da26a90e98ddcc000302f56dd 100644 (file)
--- a/target/linux/ifxmips/patches/160-cfi-swap.patch
+++ b/target/linux/ifxmips/patches/160-cfi-swap.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/mtd/chips/cfi_cmdset_0002.c
-+++ linux-2.6.25.4/drivers/mtd/chips/cfi_cmdset_0002.c
-@@ -1015,7 +1015,9 @@ static int __xipram do_write_oneword(str
+--- a/drivers/mtd/chips/cfi_cmdset_0002.c
++++ b/drivers/mtd/chips/cfi_cmdset_0002.c
+@@ -1015,7 +1015,9 @@

        int retry_cnt = 0;
  
        adr += chip->start;
        int retry_cnt = 0;
  
        adr += chip->start;

diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile
index f519108b63db2cb6d94eab05937aa82e56c476e3..fec02efc34891b6284296807a3e6b5d5e66cdd4f 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.25.6
+LINUX_VERSION:=2.6.25.7

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/ps3/Makefile b/target/linux/ps3/Makefile
index 3faf64430f8b3d9e760f1e055df31d9de7b05bc4..6fb4eb44103f898ad5413fbf7be519f5eb7dba5d 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.6
+LINUX_VERSION:=2.6.25.7

 
 KERNEL_CC:=
 
 
 KERNEL_CC:=
 

diff --git a/target/linux/ps3/patches-2.6.25/100-ps3-system-bus-quiet-match-output.patch b/target/linux/ps3/patches-2.6.25/100-ps3-system-bus-quiet-match-output.patch
index 53e88bdabcb297ac7c09b84d6287b0a79da567af..c2ae9f2cc8448a4dd042f51de005fa1658b0ea6b 100644 (file)
--- a/target/linux/ps3/patches-2.6.25/100-ps3-system-bus-quiet-match-output.patch
+++ b/target/linux/ps3/patches-2.6.25/100-ps3-system-bus-quiet-match-output.patch
@@ -9,7 +9,7 @@ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
 
 --- a/arch/powerpc/platforms/ps3/system-bus.c
 +++ b/arch/powerpc/platforms/ps3/system-bus.c
 
 --- a/arch/powerpc/platforms/ps3/system-bus.c
 +++ b/arch/powerpc/platforms/ps3/system-bus.c

-@@ -349,9 +349,14 @@ static int ps3_system_bus_match(struct d
+@@ -349,9 +349,14 @@

  
        result = dev->match_id == drv->match_id;
  
  
        result = dev->match_id == drv->match_id;
  


@@ -27,7 +27,7 @@ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
        return result;
  }
  
        return result;
  }
  

-@@ -362,7 +367,7 @@ static int ps3_system_bus_probe(struct d
+@@ -362,7 +367,7 @@

        struct ps3_system_bus_driver *drv;
  
        BUG_ON(!dev);
        struct ps3_system_bus_driver *drv;
  
        BUG_ON(!dev);


@@ -36,7 +36,7 @@ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
  
        drv = ps3_system_bus_dev_to_system_bus_drv(dev);
        BUG_ON(!drv);
  
        drv = ps3_system_bus_dev_to_system_bus_drv(dev);
        BUG_ON(!drv);

-@@ -370,10 +375,10 @@ static int ps3_system_bus_probe(struct d
+@@ -370,10 +375,10 @@

        if (drv->probe)
                result = drv->probe(dev);
        else
        if (drv->probe)
                result = drv->probe(dev);
        else


@@ -49,7 +49,7 @@ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
        return result;
  }
  
        return result;
  }
  

-@@ -384,7 +389,7 @@ static int ps3_system_bus_remove(struct 
+@@ -384,7 +389,7 @@

        struct ps3_system_bus_driver *drv;
  
        BUG_ON(!dev);
        struct ps3_system_bus_driver *drv;
  
        BUG_ON(!dev);


@@ -58,7 +58,7 @@ Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
  
        drv = ps3_system_bus_dev_to_system_bus_drv(dev);
        BUG_ON(!drv);
  
        drv = ps3_system_bus_dev_to_system_bus_drv(dev);
        BUG_ON(!drv);

-@@ -395,7 +400,7 @@ static int ps3_system_bus_remove(struct 
+@@ -395,7 +400,7 @@

                dev_dbg(&dev->core, "%s:%d %s: no remove method\n",
                        __func__, __LINE__, drv->core.name);
  
                dev_dbg(&dev->core, "%s:%d %s: no remove method\n",
                        __func__, __LINE__, drv->core.name);
  

diff --git a/target/linux/rdc/Makefile b/target/linux/rdc/Makefile
index ea81351561b0636dc2fe30d63445847d0d14d74e..8c948239d4cce6bfcc8e109a351eef7bec770022 100644 (file)
--- a/target/linux/rdc/Makefile
+++ b/target/linux/rdc/Makefile
@@ -11,7 +11,7 @@ BOARD:=rdc
 BOARDNAME:=RDC 321x
 FEATURES:=squashfs jffs2 pci
 
 BOARDNAME:=RDC 321x
 FEATURES:=squashfs jffs2 pci
 

-LINUX_VERSION:=2.6.25.6
+LINUX_VERSION:=2.6.25.7

 
 include $(INCLUDE_DIR)/target.mk
 
 
 include $(INCLUDE_DIR)/target.mk
 

diff --git a/target/linux/rdc/patches/001-rdc3210_flash_map.patch b/target/linux/rdc/patches/001-rdc3210_flash_map.patch
index ec80e30e5bdf867c1d9b3f648b665d23f5f3b540..4c12471ec352800945512c4314ed3e060a86c31b 100644 (file)
--- a/target/linux/rdc/patches/001-rdc3210_flash_map.patch
+++ b/target/linux/rdc/patches/001-rdc3210_flash_map.patch
@@ -1,10 +1,8 @@
-Index: linux-2.6.24.7/drivers/mtd/maps/Kconfig
-===================================================================
---- linux-2.6.24.7.orig/drivers/mtd/maps/Kconfig
-+++ linux-2.6.24.7/drivers/mtd/maps/Kconfig
-@@ -117,6 +117,50 @@ config MTD_PNC2000
-         PNC-2000 is the name of Network Camera product from PHOTRON
-         Ltd. in Japan. It uses CFI-compliant flash.
+--- a/drivers/mtd/maps/Kconfig
++++ b/drivers/mtd/maps/Kconfig
+@@ -110,6 +110,50 @@
+         Sun Microsystems boardsets.  This driver will require CFI support
+         in the kernel, so if you did not enable CFI previously, do that now.

  
 +config MTD_RDC3210
 +      tristate "CFI Flash device mapped on RDC3210"
  
 +config MTD_RDC3210
 +      tristate "CFI Flash device mapped on RDC3210"


@@ -53,13 +51,11 @@ Index: linux-2.6.24.7/drivers/mtd/maps/Kconfig
  config MTD_SC520CDP
        tristate "CFI Flash device mapped on AMD SC520 CDP"
        depends on X86 && MTD_CFI && MTD_CONCAT
  config MTD_SC520CDP
        tristate "CFI Flash device mapped on AMD SC520 CDP"
        depends on X86 && MTD_CFI && MTD_CONCAT

-Index: linux-2.6.24.7/drivers/mtd/maps/Makefile
-===================================================================
---- linux-2.6.24.7.orig/drivers/mtd/maps/Makefile
-+++ linux-2.6.24.7/drivers/mtd/maps/Makefile
-@@ -30,6 +30,7 @@ obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcms
+--- a/drivers/mtd/maps/Makefile
++++ b/drivers/mtd/maps/Makefile
+@@ -29,6 +29,7 @@
+ obj-$(CONFIG_MTD_PMC_MSP_EVM)   += pmcmsp-flash.o

  obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcmsp-ramroot.o
  obj-$(CONFIG_MTD_PMC_MSP_RAMROOT)+= pmcmsp-ramroot.o

- obj-$(CONFIG_MTD_PNC2000)     += pnc2000.o

  obj-$(CONFIG_MTD_PCMCIA)      += pcmciamtd.o
 +obj-$(CONFIG_MTD_RDC3210)     += rdc3210.o
  obj-$(CONFIG_MTD_RPXLITE)     += rpxlite.o
  obj-$(CONFIG_MTD_PCMCIA)      += pcmciamtd.o
 +obj-$(CONFIG_MTD_RDC3210)     += rdc3210.o
  obj-$(CONFIG_MTD_RPXLITE)     += rpxlite.o

diff --git a/target/linux/rdc/patches/003-rootfstype.patch b/target/linux/rdc/patches/003-rootfstype.patch
index 15e002ad7f8f610d2009a69e9b401088519d83e3..55a4cd49f53094f069325ea060e449701e4afc15 100644 (file)
--- a/target/linux/rdc/patches/003-rootfstype.patch
+++ b/target/linux/rdc/patches/003-rootfstype.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.24.7/init/do_mounts.c
-===================================================================
---- linux-2.6.24.7.orig/init/do_mounts.c
-+++ linux-2.6.24.7/init/do_mounts.c
-@@ -256,6 +256,8 @@ static void __init get_fs_names(char *pa
+--- a/init/do_mounts.c
++++ b/init/do_mounts.c
+@@ -163,6 +163,8 @@

  {
        char *s = page;
  
  {
        char *s = page;
  

diff --git a/target/linux/rdc/patches/600-x86_lzma.patch b/target/linux/rdc/patches/600-x86_lzma.patch
index 269340d194da8d5a9269cf1abaa5f734943c3aed..8d17f0f3c2a9ace00d3fd58429d8271e0626c150 100644 (file)
--- a/target/linux/rdc/patches/600-x86_lzma.patch
+++ b/target/linux/rdc/patches/600-x86_lzma.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.c
-===================================================================

 --- /dev/null
 --- /dev/null

-+++ linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.c
++++ b/arch/x86/boot/compressed/LzmaDecode.c

 @@ -0,0 +1,586 @@
 +/*
 +  LzmaDecode.c
 @@ -0,0 +1,586 @@
 +/*
 +  LzmaDecode.c


@@ -589,10 +587,8 @@ Index: linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.c
 +  *outSizeProcessed = nowPos;
 +  return LZMA_RESULT_OK;
 +}
 +  *outSizeProcessed = nowPos;
 +  return LZMA_RESULT_OK;
 +}

-Index: linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.h
-===================================================================

 --- /dev/null
 --- /dev/null

-+++ linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.h
++++ b/arch/x86/boot/compressed/LzmaDecode.h

 @@ -0,0 +1,100 @@
 +/* 
 +  LzmaDecode.h
 @@ -0,0 +1,100 @@
 +/* 
 +  LzmaDecode.h


@@ -694,10 +690,8 @@ Index: linux-2.6.24.7/arch/x86/boot/compressed/LzmaDecode.h
 +    UInt32 *outSizeProcessed);
 +
 +#endif
 +    UInt32 *outSizeProcessed);
 +
 +#endif

-Index: linux-2.6.24.7/arch/x86/boot/compressed/lzma_misc.c
-===================================================================

 --- /dev/null
 --- /dev/null

-+++ linux-2.6.24.7/arch/x86/boot/compressed/lzma_misc.c
++++ b/arch/x86/boot/compressed/lzma_misc.c

 @@ -0,0 +1,281 @@
 +/*
 + * lzma_misc.c
 @@ -0,0 +1,281 @@
 +/*
 + * lzma_misc.c


@@ -980,11 +974,9 @@ Index: linux-2.6.24.7/arch/x86/boot/compressed/lzma_misc.c
 +      lzma_unzip();
 +      return;
 +}
 +      lzma_unzip();
 +      return;
 +}

-Index: linux-2.6.24.7/scripts/Makefile.lib
-===================================================================
---- linux-2.6.24.7.orig/scripts/Makefile.lib
-+++ linux-2.6.24.7/scripts/Makefile.lib
-@@ -166,4 +166,9 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS)
+--- a/scripts/Makefile.lib
++++ b/scripts/Makefile.lib
+@@ -172,4 +172,9 @@

  quiet_cmd_gzip = GZIP    $@
  cmd_gzip = gzip -f -9 < $< > $@
  
  quiet_cmd_gzip = GZIP    $@
  cmd_gzip = gzip -f -9 < $< > $@
  


@@ -995,18 +987,15 @@ Index: linux-2.6.24.7/scripts/Makefile.lib
 +cmd_lzma = bash -e scripts/lzma_kern $< $@ -lc7 -lp0 -pb0
 +# to use lzmacomp,
 +# cmd_lzma = lzmacomp $< 700 > $@
 +cmd_lzma = bash -e scripts/lzma_kern $< $@ -lc7 -lp0 -pb0
 +# to use lzmacomp,
 +# cmd_lzma = lzmacomp $< 700 > $@

-Index: linux-2.6.24.7/scripts/lzma_kern
-===================================================================

 --- /dev/null
 --- /dev/null

-+++ linux-2.6.24.7/scripts/lzma_kern
++++ b/scripts/lzma_kern

 @@ -0,0 +1,4 @@
 +get-size() { echo "$5" ;}
 +printf -v len '%.8x' "$(get-size $(ls -l "$1"))"
 +lzma e "$@"
 +echo -ne "\x$(echo $len | cut -c 7,8)\x$(echo $len | cut -c 5,6)\x$(echo $len | cut -c 3,4)\x$(echo $len | cut -c 1,2)" >> "$2"
 @@ -0,0 +1,4 @@
 +get-size() { echo "$5" ;}
 +printf -v len '%.8x' "$(get-size $(ls -l "$1"))"
 +lzma e "$@"
 +echo -ne "\x$(echo $len | cut -c 7,8)\x$(echo $len | cut -c 5,6)\x$(echo $len | cut -c 3,4)\x$(echo $len | cut -c 1,2)" >> "$2"

-diff -urN linux-2.6.25.4/arch/x86/boot/compressed/Makefile linux-2.6.25.4.new/arch/x86/boot/compressed/Makefile
---- linux-2.6.25.4/arch/x86/boot/compressed/Makefile   2008-05-15 17:00:12.000000000 +0200
-+++ linux-2.6.25.4.new/arch/x86/boot/compressed/Makefile       2008-06-11 14:42:09.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
  #
 @@ -4,7 +4,7 @@
  # create a compressed vmlinux image from the original vmlinux
  #

diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 8aa3996bb1ff64d2337ad6978443aeb34e926150..94f66e50b1cbc88d07344633fdc40e758f38e27d 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.6
+LINUX_VERSION:=2.6.25.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