cleanup ifxmips pci code

[openwrt.git] / target / linux / brcm47xx / patches-2.6.25 / 130-remove_scache.patch

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 eea4e26..d36b4d8 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.23/arch/mips/Kconfig
-===================================================================
---- linux-2.6.23.orig/arch/mips/Kconfig        2007-10-13 02:23:41.484492317 +0200
-+++ linux-2.6.23/arch/mips/Kconfig     2007-10-13 02:47:02.784347843 +0200
-@@ -192,7 +192,6 @@
+--- 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.23/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

-@@ -1281,13 +1280,6 @@
+@@ -1421,13 +1420,6 @@

        bool
        select BOARD_SCACHE
  
        bool
        select BOARD_SCACHE
  


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

-Index: linux-2.6.23/arch/mips/kernel/cpu-probe.c
-===================================================================
---- linux-2.6.23.orig/arch/mips/kernel/cpu-probe.c     2007-10-13 02:23:11.210767122 +0200
-+++ linux-2.6.23/arch/mips/kernel/cpu-probe.c  2007-10-13 02:47:02.788348072 +0200
-@@ -701,6 +701,8 @@
+--- 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,19 +33,17 @@ Index: linux-2.6.23/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.23/arch/mips/mm/c-r4k.c
-===================================================================
---- linux-2.6.23.orig/arch/mips/mm/c-r4k.c     2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23/arch/mips/mm/c-r4k.c  2007-10-13 02:47:02.792348301 +0200
-@@ -1086,7 +1086,6 @@
+--- 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 mips_sc_init(void);
  
  
  extern int r5k_sc_init(void);
  extern int rm7k_sc_init(void);
 -extern int mips_sc_init(void);
  

- static void __init setup_scache(void)
+ static void __cpuinit setup_scache(void)

  {
  {

-@@ -1140,29 +1139,17 @@
+@@ -1157,29 +1156,17 @@

  #endif
  
        default:
  #endif
  
        default:


@@ -84,11 +78,9 @@ Index: linux-2.6.23/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.23/arch/mips/mm/Makefile
-===================================================================
---- linux-2.6.23.orig/arch/mips/mm/Makefile    2007-10-09 22:31:38.000000000 +0200
-+++ linux-2.6.23/arch/mips/mm/Makefile 2007-10-13 02:47:23.393522295 +0200
-@@ -31,6 +31,5 @@
+--- 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