Changeset 2820


Ignore:
Timestamp:
2006-01-04T20:20:43+01:00 (12 years ago)
Author:
nbd
Message:

allow nvram access to kernel modules on brcm-2.6

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/openwrt/target/linux/linux-2.6/patches/brcm/001-bcm947xx.patch

    r2718 r2820  
    11diff -urN linux.old/arch/mips/Kconfig linux.dev/arch/mips/Kconfig 
    2 --- linux.old/arch/mips/Kconfig 2005-12-15 13:26:49.758027500 +0100 
    3 +++ linux.dev/arch/mips/Kconfig 2005-12-15 12:57:27.889182500 +0100 
     2--- linux.old/arch/mips/Kconfig 2005-12-19 01:36:54.000000000 +0100 
     3+++ linux.dev/arch/mips/Kconfig 2005-12-28 16:37:32.810257250 +0100 
    44@@ -244,6 +244,17 @@ 
    55         Members include the Acer PICA, MIPS Magnum 4000, MIPS Millenium and 
     
    2121        select DMA_NONCOHERENT 
    2222diff -urN linux.old/arch/mips/Makefile linux.dev/arch/mips/Makefile 
    23 --- linux.old/arch/mips/Makefile        2005-12-15 13:26:49.766024000 +0100 
    24 +++ linux.dev/arch/mips/Makefile        2005-12-15 12:57:27.921168500 +0100 
     23--- linux.old/arch/mips/Makefile        2005-12-19 01:36:54.000000000 +0100 
     24+++ linux.dev/arch/mips/Makefile        2005-12-28 16:37:32.814257500 +0100 
    2525@@ -689,6 +689,13 @@ 
    2626 load-$(CONFIG_SIBYTE_BIGSUR)   := 0xffffffff80100000 
     
    3939diff -urN linux.old/arch/mips/bcm947xx/Makefile linux.dev/arch/mips/bcm947xx/Makefile 
    4040--- linux.old/arch/mips/bcm947xx/Makefile       1970-01-01 01:00:00.000000000 +0100 
    41 +++ linux.dev/arch/mips/bcm947xx/Makefile       2005-12-15 14:32:03.580639500 +0100 
     41+++ linux.dev/arch/mips/bcm947xx/Makefile       2005-12-28 16:37:32.814257500 +0100 
    4242@@ -0,0 +1,6 @@ 
    4343+# 
     
    4949diff -urN linux.old/arch/mips/bcm947xx/broadcom/Makefile linux.dev/arch/mips/bcm947xx/broadcom/Makefile 
    5050--- linux.old/arch/mips/bcm947xx/broadcom/Makefile      1970-01-01 01:00:00.000000000 +0100 
    51 +++ linux.dev/arch/mips/bcm947xx/broadcom/Makefile      2005-12-17 20:51:17.749271000 +0100 
     51+++ linux.dev/arch/mips/bcm947xx/broadcom/Makefile      2005-12-28 16:37:32.814257500 +0100 
    5252@@ -0,0 +1,6 @@ 
    5353+# 
     
    5959diff -urN linux.old/arch/mips/bcm947xx/broadcom/bcmsrom.c linux.dev/arch/mips/bcm947xx/broadcom/bcmsrom.c 
    6060--- linux.old/arch/mips/bcm947xx/broadcom/bcmsrom.c     1970-01-01 01:00:00.000000000 +0100 
    61 +++ linux.dev/arch/mips/bcm947xx/broadcom/bcmsrom.c     2005-12-17 01:21:23.007883000 +0100 
     61+++ linux.dev/arch/mips/bcm947xx/broadcom/bcmsrom.c     2005-12-28 16:37:32.814257500 +0100 
    6262@@ -0,0 +1,481 @@ 
    6363+/* 
     
    544544diff -urN linux.old/arch/mips/bcm947xx/broadcom/bcmutils.c linux.dev/arch/mips/bcm947xx/broadcom/bcmutils.c 
    545545--- linux.old/arch/mips/bcm947xx/broadcom/bcmutils.c    1970-01-01 01:00:00.000000000 +0100 
    546 +++ linux.dev/arch/mips/bcm947xx/broadcom/bcmutils.c    2005-12-17 17:53:52.387365000 +0100 
     546+++ linux.dev/arch/mips/bcm947xx/broadcom/bcmutils.c    2005-12-28 16:37:32.814257500 +0100 
    547547@@ -0,0 +1,356 @@ 
    548548+/* 
     
    904904diff -urN linux.old/arch/mips/bcm947xx/broadcom/cfe_env.c linux.dev/arch/mips/bcm947xx/broadcom/cfe_env.c 
    905905--- linux.old/arch/mips/bcm947xx/broadcom/cfe_env.c     1970-01-01 01:00:00.000000000 +0100 
    906 +++ linux.dev/arch/mips/bcm947xx/broadcom/cfe_env.c     2005-12-17 21:40:08.166726750 +0100 
     906+++ linux.dev/arch/mips/bcm947xx/broadcom/cfe_env.c     2005-12-28 16:37:32.818257750 +0100 
    907907@@ -0,0 +1,234 @@ 
    908908+/* 
     
    11421142diff -urN linux.old/arch/mips/bcm947xx/broadcom/linux_osl.c linux.dev/arch/mips/bcm947xx/broadcom/linux_osl.c 
    11431143--- linux.old/arch/mips/bcm947xx/broadcom/linux_osl.c   1970-01-01 01:00:00.000000000 +0100 
    1144 +++ linux.dev/arch/mips/bcm947xx/broadcom/linux_osl.c   2005-12-15 17:11:05.818041750 +0100 
     1144+++ linux.dev/arch/mips/bcm947xx/broadcom/linux_osl.c   2005-12-28 16:37:32.834258750 +0100 
    11451145@@ -0,0 +1,102 @@ 
    11461146+/* 
     
    12481248diff -urN linux.old/arch/mips/bcm947xx/broadcom/nvram.c linux.dev/arch/mips/bcm947xx/broadcom/nvram.c 
    12491249--- linux.old/arch/mips/bcm947xx/broadcom/nvram.c       1970-01-01 01:00:00.000000000 +0100 
    1250 +++ linux.dev/arch/mips/bcm947xx/broadcom/nvram.c       2005-12-18 04:59:36.185204500 +0100 
    1251 @@ -0,0 +1,165 @@ 
     1250+++ linux.dev/arch/mips/bcm947xx/broadcom/nvram.c       2005-12-28 19:30:54.804469750 +0100 
     1251@@ -0,0 +1,192 @@ 
    12521252+/* 
    12531253+ * NVRAM variable manipulation (Linux kernel half) 
     
    13841384+ 
    13851385+/* Early (before mm or mtd) read-only access to NVRAM */ 
    1386 +char * __init nvram_get(const char *name) 
     1386+char * __init early_nvram_get(const char *name) 
    13871387+{ 
    13881388+       char *var, *value, *end, *eq; 
     
    14151415+       return NULL; 
    14161416+} 
     1417+ 
     1418+char *nvram_get(const char *name) 
     1419+{ 
     1420+       char *var, *value, *end, *eq; 
     1421+ 
     1422+       if (!name) 
     1423+               return NULL; 
     1424+ 
     1425+       if (!nvram_buf[0]) 
     1426+               return NULL; 
     1427+        
     1428+       /* Look for name=value and return value */ 
     1429+       var = &nvram_buf[sizeof(struct nvram_header)]; 
     1430+       end = nvram_buf + sizeof(nvram_buf) - 2; 
     1431+       end[0] = end[1] = '\0'; 
     1432+       for (; *var; var = value + strlen(value) + 1) { 
     1433+               if (!(eq = strchr(var, '='))) 
     1434+                       break; 
     1435+               value = eq + 1; 
     1436+               if ((eq - var) == strlen(name) && strncmp(var, name, (eq - var)) == 0) 
     1437+                       return value; 
     1438+       } 
     1439+        
     1440+       return NULL; 
     1441+} 
     1442+ 
     1443+EXPORT_SYMBOL(nvram_get); 
    14171444diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbmips.c linux.dev/arch/mips/bcm947xx/broadcom/sbmips.c 
    14181445--- linux.old/arch/mips/bcm947xx/broadcom/sbmips.c      1970-01-01 01:00:00.000000000 +0100 
    1419 +++ linux.dev/arch/mips/bcm947xx/broadcom/sbmips.c      2005-12-15 16:46:31.122961250 +0100 
     1446+++ linux.dev/arch/mips/bcm947xx/broadcom/sbmips.c      2005-12-28 19:19:50.570957750 +0100 
    14201447@@ -0,0 +1,1038 @@ 
    14211448+/* 
     
    18371864+               BCMINIT(sb_setirq)(sbh, 4, SB_PCI, 0); 
    18381865+               ASSERT(eir); 
    1839 +               value = BCMINIT(nvram_get)("et0phyaddr"); 
     1866+               value = BCMINIT(early_nvram_get)("et0phyaddr"); 
    18401867+               if (value && !strcmp(value, "31")) { 
    18411868+                       /* Enable internal UART */ 
     
    24592486diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbpci.c linux.dev/arch/mips/bcm947xx/broadcom/sbpci.c 
    24602487--- linux.old/arch/mips/bcm947xx/broadcom/sbpci.c       1970-01-01 01:00:00.000000000 +0100 
    2461 +++ linux.dev/arch/mips/bcm947xx/broadcom/sbpci.c       2005-12-18 05:36:53.351735500 +0100 
     2488+++ linux.dev/arch/mips/bcm947xx/broadcom/sbpci.c       2005-12-28 16:37:32.854260000 +0100 
    24622489@@ -0,0 +1,533 @@ 
    24632490+/* 
     
    29963023diff -urN linux.old/arch/mips/bcm947xx/broadcom/sbutils.c linux.dev/arch/mips/bcm947xx/broadcom/sbutils.c 
    29973024--- linux.old/arch/mips/bcm947xx/broadcom/sbutils.c     1970-01-01 01:00:00.000000000 +0100 
    2998 +++ linux.dev/arch/mips/bcm947xx/broadcom/sbutils.c     2005-12-17 01:21:12.951254500 +0100 
     3025+++ linux.dev/arch/mips/bcm947xx/broadcom/sbutils.c     2005-12-28 16:37:32.858260250 +0100 
    29993026@@ -0,0 +1,2370 @@ 
    30003027+/* 
     
    53705397diff -urN linux.old/arch/mips/bcm947xx/broadcom/sflash.c linux.dev/arch/mips/bcm947xx/broadcom/sflash.c 
    53715398--- linux.old/arch/mips/bcm947xx/broadcom/sflash.c      1970-01-01 01:00:00.000000000 +0100 
    5372 +++ linux.dev/arch/mips/bcm947xx/broadcom/sflash.c      2005-12-15 16:59:20.045933750 +0100 
     5399+++ linux.dev/arch/mips/bcm947xx/broadcom/sflash.c      2005-12-28 16:37:32.870261000 +0100 
    53735400@@ -0,0 +1,418 @@ 
    53745401+/* 
     
    57925819diff -urN linux.old/arch/mips/bcm947xx/include/bcmdevs.h linux.dev/arch/mips/bcm947xx/include/bcmdevs.h 
    57935820--- linux.old/arch/mips/bcm947xx/include/bcmdevs.h      1970-01-01 01:00:00.000000000 +0100 
    5794 +++ linux.dev/arch/mips/bcm947xx/include/bcmdevs.h      2005-12-15 15:25:24.905340500 +0100 
     5821+++ linux.dev/arch/mips/bcm947xx/include/bcmdevs.h      2005-12-28 16:37:32.874261250 +0100 
    57955822@@ -0,0 +1,391 @@ 
    57965823+/* 
     
    61876214diff -urN linux.old/arch/mips/bcm947xx/include/bcmendian.h linux.dev/arch/mips/bcm947xx/include/bcmendian.h 
    61886215--- linux.old/arch/mips/bcm947xx/include/bcmendian.h    1970-01-01 01:00:00.000000000 +0100 
    6189 +++ linux.dev/arch/mips/bcm947xx/include/bcmendian.h    2005-12-15 15:25:47.146730500 +0100 
     6216+++ linux.dev/arch/mips/bcm947xx/include/bcmendian.h    2005-12-28 16:37:32.874261250 +0100 
    61906217@@ -0,0 +1,152 @@ 
    61916218+/* 
     
    63436370diff -urN linux.old/arch/mips/bcm947xx/include/bcmnvram.h linux.dev/arch/mips/bcm947xx/include/bcmnvram.h 
    63446371--- linux.old/arch/mips/bcm947xx/include/bcmnvram.h     1970-01-01 01:00:00.000000000 +0100 
    6345 +++ linux.dev/arch/mips/bcm947xx/include/bcmnvram.h     2005-12-15 16:04:35.850827500 +0100 
    6346 @@ -0,0 +1,87 @@ 
     6372+++ linux.dev/arch/mips/bcm947xx/include/bcmnvram.h     2005-12-28 19:28:28.399320000 +0100 
     6373@@ -0,0 +1,95 @@ 
    63476374+/* 
    63486375+ * NVRAM variable manipulation 
     
    63866413+ * @return     value of variable or NULL if undefined 
    63876414+ */ 
    6388 +extern char * __init nvram_get(const char *name); 
     6415+extern char * __init early_nvram_get(const char *name); 
     6416+ 
     6417+/* 
     6418+ * Get the value of an NVRAM variable. The pointer returned may be 
     6419+ * invalid after a set. 
     6420+ * @param      name    name of variable to get 
     6421+ * @return     value of variable or NULL if undefined 
     6422+ */ 
     6423+extern char *nvram_get(const char *name); 
    63896424+ 
    63906425+/*  
     
    63936428+ * @return     value of variable or NUL if undefined 
    63946429+ */ 
    6395 +#define nvram_safe_get(name) (BCMINIT(nvram_get)(name) ? : "") 
     6430+#define nvram_safe_get(name) (BCMINIT(early_nvram_get)(name) ? : "") 
    63966431+ 
    63976432+/* 
     
    64046439+static inline int 
    64056440+nvram_match(char *name, char *match) { 
    6406 +       const char *value = BCMINIT(nvram_get)(name); 
     6441+       const char *value = BCMINIT(early_nvram_get)(name); 
    64076442+       return (value && !strcmp(value, match)); 
    64086443+} 
     
    64176452+static inline int 
    64186453+nvram_invmatch(char *name, char *invmatch) { 
    6419 +       const char *value = BCMINIT(nvram_get)(name); 
     6454+       const char *value = BCMINIT(early_nvram_get)(name); 
    64206455+       return (value && strcmp(value, invmatch)); 
    64216456+} 
     
    64346469diff -urN linux.old/arch/mips/bcm947xx/include/bcmsrom.h linux.dev/arch/mips/bcm947xx/include/bcmsrom.h 
    64356470--- linux.old/arch/mips/bcm947xx/include/bcmsrom.h      1970-01-01 01:00:00.000000000 +0100 
    6436 +++ linux.dev/arch/mips/bcm947xx/include/bcmsrom.h      2005-12-15 15:34:32.919589250 +0100 
     6471+++ linux.dev/arch/mips/bcm947xx/include/bcmsrom.h      2005-12-28 16:37:32.874261250 +0100 
    64376472@@ -0,0 +1,23 @@ 
    64386473+/* 
     
    64616496diff -urN linux.old/arch/mips/bcm947xx/include/bcmutils.h linux.dev/arch/mips/bcm947xx/include/bcmutils.h 
    64626497--- linux.old/arch/mips/bcm947xx/include/bcmutils.h     1970-01-01 01:00:00.000000000 +0100 
    6463 +++ linux.dev/arch/mips/bcm947xx/include/bcmutils.h     2005-12-15 16:44:25.619117750 +0100 
     6498+++ linux.dev/arch/mips/bcm947xx/include/bcmutils.h     2005-12-28 16:37:32.874261250 +0100 
    64646499@@ -0,0 +1,308 @@ 
    64656500+/* 
     
    67736808diff -urN linux.old/arch/mips/bcm947xx/include/bitfuncs.h linux.dev/arch/mips/bcm947xx/include/bitfuncs.h 
    67746809--- linux.old/arch/mips/bcm947xx/include/bitfuncs.h     1970-01-01 01:00:00.000000000 +0100 
    6775 +++ linux.dev/arch/mips/bcm947xx/include/bitfuncs.h     2005-12-15 15:34:40.268048500 +0100 
     6810+++ linux.dev/arch/mips/bcm947xx/include/bitfuncs.h     2005-12-28 16:37:32.874261250 +0100 
    67766811@@ -0,0 +1,85 @@ 
    67776812+/* 
     
    68626897diff -urN linux.old/arch/mips/bcm947xx/include/flash.h linux.dev/arch/mips/bcm947xx/include/flash.h 
    68636898--- linux.old/arch/mips/bcm947xx/include/flash.h        1970-01-01 01:00:00.000000000 +0100 
    6864 +++ linux.dev/arch/mips/bcm947xx/include/flash.h        2005-12-15 15:34:44.280299250 +0100 
     6899+++ linux.dev/arch/mips/bcm947xx/include/flash.h        2005-12-28 16:37:32.874261250 +0100 
    68656900@@ -0,0 +1,188 @@ 
    68666901+/* 
     
    70547089diff -urN linux.old/arch/mips/bcm947xx/include/flashutl.h linux.dev/arch/mips/bcm947xx/include/flashutl.h 
    70557090--- linux.old/arch/mips/bcm947xx/include/flashutl.h     1970-01-01 01:00:00.000000000 +0100 
    7056 +++ linux.dev/arch/mips/bcm947xx/include/flashutl.h     2005-12-15 15:34:48.160541750 +0100 
     7091+++ linux.dev/arch/mips/bcm947xx/include/flashutl.h     2005-12-28 16:37:32.878261500 +0100 
    70577092@@ -0,0 +1,27 @@ 
    70587093+/* 
     
    70857120diff -urN linux.old/arch/mips/bcm947xx/include/hndmips.h linux.dev/arch/mips/bcm947xx/include/hndmips.h 
    70867121--- linux.old/arch/mips/bcm947xx/include/hndmips.h      1970-01-01 01:00:00.000000000 +0100 
    7087 +++ linux.dev/arch/mips/bcm947xx/include/hndmips.h      2005-12-15 15:34:53.396869000 +0100 
     7122+++ linux.dev/arch/mips/bcm947xx/include/hndmips.h      2005-12-28 16:37:32.878261500 +0100 
    70887123@@ -0,0 +1,16 @@ 
    70897124+/* 
     
    71057140diff -urN linux.old/arch/mips/bcm947xx/include/linux_osl.h linux.dev/arch/mips/bcm947xx/include/linux_osl.h 
    71067141--- linux.old/arch/mips/bcm947xx/include/linux_osl.h    1970-01-01 01:00:00.000000000 +0100 
    7107 +++ linux.dev/arch/mips/bcm947xx/include/linux_osl.h    2005-12-15 17:23:39.225126750 +0100 
     7142+++ linux.dev/arch/mips/bcm947xx/include/linux_osl.h    2005-12-28 16:37:32.878261500 +0100 
    71087143@@ -0,0 +1,331 @@ 
    71097144+/* 
     
    74407475diff -urN linux.old/arch/mips/bcm947xx/include/linuxver.h linux.dev/arch/mips/bcm947xx/include/linuxver.h 
    74417476--- linux.old/arch/mips/bcm947xx/include/linuxver.h     1970-01-01 01:00:00.000000000 +0100 
    7442 +++ linux.dev/arch/mips/bcm947xx/include/linuxver.h     2005-12-15 16:02:45.467929000 +0100 
     7477+++ linux.dev/arch/mips/bcm947xx/include/linuxver.h     2005-12-28 16:37:32.878261500 +0100 
    74437478@@ -0,0 +1,389 @@ 
    74447479+/* 
     
    78337868diff -urN linux.old/arch/mips/bcm947xx/include/mipsinc.h linux.dev/arch/mips/bcm947xx/include/mipsinc.h 
    78347869--- linux.old/arch/mips/bcm947xx/include/mipsinc.h      1970-01-01 01:00:00.000000000 +0100 
    7835 +++ linux.dev/arch/mips/bcm947xx/include/mipsinc.h      2005-12-15 16:47:29.886633750 +0100 
     7870+++ linux.dev/arch/mips/bcm947xx/include/mipsinc.h      2005-12-28 16:37:32.878261500 +0100 
    78367871@@ -0,0 +1,552 @@ 
    78377872+/* 
     
    83898424diff -urN linux.old/arch/mips/bcm947xx/include/osl.h linux.dev/arch/mips/bcm947xx/include/osl.h 
    83908425--- linux.old/arch/mips/bcm947xx/include/osl.h  1970-01-01 01:00:00.000000000 +0100 
    8391 +++ linux.dev/arch/mips/bcm947xx/include/osl.h  2005-12-15 15:35:08.321801750 +0100 
     8426+++ linux.dev/arch/mips/bcm947xx/include/osl.h  2005-12-28 16:37:32.878261500 +0100 
    83928427@@ -0,0 +1,42 @@ 
    83938428+/* 
     
    84358470diff -urN linux.old/arch/mips/bcm947xx/include/pcicfg.h linux.dev/arch/mips/bcm947xx/include/pcicfg.h 
    84368471--- linux.old/arch/mips/bcm947xx/include/pcicfg.h       1970-01-01 01:00:00.000000000 +0100 
    8437 +++ linux.dev/arch/mips/bcm947xx/include/pcicfg.h       2005-12-15 15:36:31.719013750 +0100 
     8472+++ linux.dev/arch/mips/bcm947xx/include/pcicfg.h       2005-12-28 16:37:32.882261750 +0100 
    84388473@@ -0,0 +1,398 @@ 
    84398474+/* 
     
    88378872diff -urN linux.old/arch/mips/bcm947xx/include/proto/ethernet.h linux.dev/arch/mips/bcm947xx/include/proto/ethernet.h 
    88388873--- linux.old/arch/mips/bcm947xx/include/proto/ethernet.h       1970-01-01 01:00:00.000000000 +0100 
    8839 +++ linux.dev/arch/mips/bcm947xx/include/proto/ethernet.h       2005-12-15 12:57:27.869191250 +0100 
     8874+++ linux.dev/arch/mips/bcm947xx/include/proto/ethernet.h       2005-12-28 16:37:32.882261750 +0100 
    88408875@@ -0,0 +1,145 @@ 
    88418876+/******************************************************************************* 
     
    89869021diff -urN linux.old/arch/mips/bcm947xx/include/s5.h linux.dev/arch/mips/bcm947xx/include/s5.h 
    89879022--- linux.old/arch/mips/bcm947xx/include/s5.h   1970-01-01 01:00:00.000000000 +0100 
    8988 +++ linux.dev/arch/mips/bcm947xx/include/s5.h   2005-12-15 12:57:27.869191250 +0100 
     9023+++ linux.dev/arch/mips/bcm947xx/include/s5.h   2005-12-28 16:37:32.882261750 +0100 
    89899024@@ -0,0 +1,103 @@ 
    89909025+#ifndef _S5_H_ 
     
    90939128diff -urN linux.old/arch/mips/bcm947xx/include/sbchipc.h linux.dev/arch/mips/bcm947xx/include/sbchipc.h 
    90949129--- linux.old/arch/mips/bcm947xx/include/sbchipc.h      1970-01-01 01:00:00.000000000 +0100 
    9095 +++ linux.dev/arch/mips/bcm947xx/include/sbchipc.h      2005-12-15 15:35:20.458560250 +0100 
     9130+++ linux.dev/arch/mips/bcm947xx/include/sbchipc.h      2005-12-28 16:37:32.882261750 +0100 
    90969131@@ -0,0 +1,440 @@ 
    90979132+/* 
     
    95379572diff -urN linux.old/arch/mips/bcm947xx/include/sbconfig.h linux.dev/arch/mips/bcm947xx/include/sbconfig.h 
    95389573--- linux.old/arch/mips/bcm947xx/include/sbconfig.h     1970-01-01 01:00:00.000000000 +0100 
    9539 +++ linux.dev/arch/mips/bcm947xx/include/sbconfig.h     2005-12-15 15:35:24.538815250 +0100 
     9574+++ linux.dev/arch/mips/bcm947xx/include/sbconfig.h     2005-12-28 16:37:32.898262750 +0100 
    95409575@@ -0,0 +1,342 @@ 
    95419576+/* 
     
    98839918diff -urN linux.old/arch/mips/bcm947xx/include/sbextif.h linux.dev/arch/mips/bcm947xx/include/sbextif.h 
    98849919--- linux.old/arch/mips/bcm947xx/include/sbextif.h      1970-01-01 01:00:00.000000000 +0100 
    9885 +++ linux.dev/arch/mips/bcm947xx/include/sbextif.h      2005-12-15 16:48:55.651993750 +0100 
     9920+++ linux.dev/arch/mips/bcm947xx/include/sbextif.h      2005-12-28 16:37:32.898262750 +0100 
    98869921@@ -0,0 +1,242 @@ 
    98879922+/* 
     
    1012910164diff -urN linux.old/arch/mips/bcm947xx/include/sbmemc.h linux.dev/arch/mips/bcm947xx/include/sbmemc.h 
    1013010165--- linux.old/arch/mips/bcm947xx/include/sbmemc.h       1970-01-01 01:00:00.000000000 +0100 
    10131 +++ linux.dev/arch/mips/bcm947xx/include/sbmemc.h       2005-12-15 15:35:31.567254500 +0100 
     10166+++ linux.dev/arch/mips/bcm947xx/include/sbmemc.h       2005-12-28 16:37:32.902263000 +0100 
    1013210167@@ -0,0 +1,148 @@ 
    1013310168+/* 
     
    1028110316diff -urN linux.old/arch/mips/bcm947xx/include/sbmips.h linux.dev/arch/mips/bcm947xx/include/sbmips.h 
    1028210317--- linux.old/arch/mips/bcm947xx/include/sbmips.h       1970-01-01 01:00:00.000000000 +0100 
    10283 +++ linux.dev/arch/mips/bcm947xx/include/sbmips.h       2005-12-15 16:46:57.616617000 +0100 
     10318+++ linux.dev/arch/mips/bcm947xx/include/sbmips.h       2005-12-28 16:37:32.902263000 +0100 
    1028410319@@ -0,0 +1,62 @@ 
    1028510320+/* 
     
    1034710382diff -urN linux.old/arch/mips/bcm947xx/include/sbpci.h linux.dev/arch/mips/bcm947xx/include/sbpci.h 
    1034810383--- linux.old/arch/mips/bcm947xx/include/sbpci.h        1970-01-01 01:00:00.000000000 +0100 
    10349 +++ linux.dev/arch/mips/bcm947xx/include/sbpci.h        2005-12-15 15:35:36.795581250 +0100 
     10384+++ linux.dev/arch/mips/bcm947xx/include/sbpci.h        2005-12-28 16:37:32.902263000 +0100 
    1035010385@@ -0,0 +1,122 @@ 
    1035110386+/* 
     
    1047310508diff -urN linux.old/arch/mips/bcm947xx/include/sbsdram.h linux.dev/arch/mips/bcm947xx/include/sbsdram.h 
    1047410509--- linux.old/arch/mips/bcm947xx/include/sbsdram.h      1970-01-01 01:00:00.000000000 +0100 
    10475 +++ linux.dev/arch/mips/bcm947xx/include/sbsdram.h      2005-12-15 15:35:40.175792500 +0100 
     10510+++ linux.dev/arch/mips/bcm947xx/include/sbsdram.h      2005-12-28 16:37:32.902263000 +0100 
    1047610511@@ -0,0 +1,75 @@ 
    1047710512+/* 
     
    1055210587diff -urN linux.old/arch/mips/bcm947xx/include/sbutils.h linux.dev/arch/mips/bcm947xx/include/sbutils.h 
    1055310588--- linux.old/arch/mips/bcm947xx/include/sbutils.h      1970-01-01 01:00:00.000000000 +0100 
    10554 +++ linux.dev/arch/mips/bcm947xx/include/sbutils.h      2005-12-15 16:00:47.404550500 +0100 
     10589+++ linux.dev/arch/mips/bcm947xx/include/sbutils.h      2005-12-28 16:37:32.902263000 +0100 
    1055510590@@ -0,0 +1,136 @@ 
    1055610591+/* 
     
    1069210727diff -urN linux.old/arch/mips/bcm947xx/include/sflash.h linux.dev/arch/mips/bcm947xx/include/sflash.h 
    1069310728--- linux.old/arch/mips/bcm947xx/include/sflash.h       1970-01-01 01:00:00.000000000 +0100 
    10694 +++ linux.dev/arch/mips/bcm947xx/include/sflash.h       2005-12-15 16:49:23.001703000 +0100 
     10729+++ linux.dev/arch/mips/bcm947xx/include/sflash.h       2005-12-28 16:37:32.902263000 +0100 
    1069510730@@ -0,0 +1,36 @@ 
    1069610731+/* 
     
    1073210767diff -urN linux.old/arch/mips/bcm947xx/include/trxhdr.h linux.dev/arch/mips/bcm947xx/include/trxhdr.h 
    1073310768--- linux.old/arch/mips/bcm947xx/include/trxhdr.h       1970-01-01 01:00:00.000000000 +0100 
    10734 +++ linux.dev/arch/mips/bcm947xx/include/trxhdr.h       2005-12-15 15:35:49.220357750 +0100 
     10769+++ linux.dev/arch/mips/bcm947xx/include/trxhdr.h       2005-12-28 16:37:32.902263000 +0100 
    1073510770@@ -0,0 +1,33 @@ 
    1073610771+/* 
     
    1076910804diff -urN linux.old/arch/mips/bcm947xx/include/typedefs.h linux.dev/arch/mips/bcm947xx/include/typedefs.h 
    1077010805--- linux.old/arch/mips/bcm947xx/include/typedefs.h     1970-01-01 01:00:00.000000000 +0100 
    10771 +++ linux.dev/arch/mips/bcm947xx/include/typedefs.h     2005-12-15 15:35:52.436558750 +0100 
     10806+++ linux.dev/arch/mips/bcm947xx/include/typedefs.h     2005-12-28 16:37:32.906263250 +0100 
    1077210807@@ -0,0 +1,326 @@ 
    1077310808+/* 
     
    1109911134diff -urN linux.old/arch/mips/bcm947xx/int-handler.S linux.dev/arch/mips/bcm947xx/int-handler.S 
    1110011135--- linux.old/arch/mips/bcm947xx/int-handler.S  1970-01-01 01:00:00.000000000 +0100 
    11101 +++ linux.dev/arch/mips/bcm947xx/int-handler.S  2005-12-15 12:57:27.877187750 +0100 
     11136+++ linux.dev/arch/mips/bcm947xx/int-handler.S  2005-12-28 16:37:32.906263250 +0100 
    1110211137@@ -0,0 +1,48 @@ 
    1110311138+/* 
     
    1115111186diff -urN linux.old/arch/mips/bcm947xx/irq.c linux.dev/arch/mips/bcm947xx/irq.c 
    1115211187--- linux.old/arch/mips/bcm947xx/irq.c  1970-01-01 01:00:00.000000000 +0100 
    11153 +++ linux.dev/arch/mips/bcm947xx/irq.c  2005-12-15 12:57:27.877187750 +0100 
     11188+++ linux.dev/arch/mips/bcm947xx/irq.c  2005-12-28 16:37:32.906263250 +0100 
    1115411189@@ -0,0 +1,67 @@ 
    1115511190+/* 
     
    1122211257diff -urN linux.old/arch/mips/bcm947xx/pci.c linux.dev/arch/mips/bcm947xx/pci.c 
    1122311258--- linux.old/arch/mips/bcm947xx/pci.c  1970-01-01 01:00:00.000000000 +0100 
    11224 +++ linux.dev/arch/mips/bcm947xx/pci.c  2005-12-18 07:01:36.731635000 +0100 
     11259+++ linux.dev/arch/mips/bcm947xx/pci.c  2005-12-28 16:37:32.906263250 +0100 
    1122511260@@ -0,0 +1,215 @@ 
    1122611261+#include <linux/kernel.h> 
     
    1144111476diff -urN linux.old/arch/mips/bcm947xx/prom.c linux.dev/arch/mips/bcm947xx/prom.c 
    1144211477--- linux.old/arch/mips/bcm947xx/prom.c 1970-01-01 01:00:00.000000000 +0100 
    11443 +++ linux.dev/arch/mips/bcm947xx/prom.c 2005-12-15 12:57:27.877187750 +0100 
     11478+++ linux.dev/arch/mips/bcm947xx/prom.c 2005-12-28 16:37:32.906263250 +0100 
    1144411479@@ -0,0 +1,59 @@ 
    1144511480+/* 
     
    1150411539diff -urN linux.old/arch/mips/bcm947xx/setup.c linux.dev/arch/mips/bcm947xx/setup.c 
    1150511540--- linux.old/arch/mips/bcm947xx/setup.c        1970-01-01 01:00:00.000000000 +0100 
    11506 +++ linux.dev/arch/mips/bcm947xx/setup.c        2005-12-18 06:34:52.106215250 +0100 
     11541+++ linux.dev/arch/mips/bcm947xx/setup.c        2005-12-28 19:29:25.870911750 +0100 
    1150711542@@ -0,0 +1,157 @@ 
    1150811543+/* 
     
    1164211677+ 
    1164311678+       /* reverse serial ports if the nvram variable kernel_args starts with console=ttyS1 */ 
    11644 +       s = nvram_get("kernel_args"); 
     11679+       s = early_nvram_get("kernel_args"); 
    1164511680+       if (!s) s = ""; 
    1164611681+       if (!strncmp(s, "console=ttyS1", 13)) { 
     
    1166511700diff -urN linux.old/arch/mips/bcm947xx/time.c linux.dev/arch/mips/bcm947xx/time.c 
    1166611701--- linux.old/arch/mips/bcm947xx/time.c 1970-01-01 01:00:00.000000000 +0100 
    11667 +++ linux.dev/arch/mips/bcm947xx/time.c 2005-12-15 12:57:27.877187750 +0100 
     11702+++ linux.dev/arch/mips/bcm947xx/time.c 2005-12-28 16:37:32.906263250 +0100 
    1166811703@@ -0,0 +1,59 @@ 
    1166911704+/* 
     
    1172711762+} 
    1172811763diff -urN linux.old/arch/mips/kernel/cpu-probe.c linux.dev/arch/mips/kernel/cpu-probe.c 
    11729 --- linux.old/arch/mips/kernel/cpu-probe.c      2005-12-15 13:26:49.766024000 +0100 
    11730 +++ linux.dev/arch/mips/kernel/cpu-probe.c      2005-12-15 12:57:27.901177250 +0100 
     11764--- linux.old/arch/mips/kernel/cpu-probe.c      2005-12-19 01:36:54.000000000 +0100 
     11765+++ linux.dev/arch/mips/kernel/cpu-probe.c      2005-12-28 16:37:32.934265000 +0100 
    1173111766@@ -656,6 +656,28 @@ 
    1173211767 } 
     
    1176911804                break; 
    1177011805diff -urN linux.old/arch/mips/kernel/head.S linux.dev/arch/mips/kernel/head.S 
    11771 --- linux.old/arch/mips/kernel/head.S   2005-12-15 13:26:49.766024000 +0100 
    11772 +++ linux.dev/arch/mips/kernel/head.S   2005-12-15 12:57:27.901177250 +0100 
     11806--- linux.old/arch/mips/kernel/head.S   2005-12-19 01:36:54.000000000 +0100 
     11807+++ linux.dev/arch/mips/kernel/head.S   2005-12-28 16:37:32.934265000 +0100 
    1177311808@@ -107,6 +107,14 @@ 
    1177411809 #endif 
     
    1178711822         * Necessary for machines which link their kernels at KSEG0. 
    1178811823diff -urN linux.old/arch/mips/kernel/proc.c linux.dev/arch/mips/kernel/proc.c 
    11789 --- linux.old/arch/mips/kernel/proc.c   2005-12-15 13:26:49.766024000 +0100 
    11790 +++ linux.dev/arch/mips/kernel/proc.c   2005-12-15 12:57:27.921168500 +0100 
     11824--- linux.old/arch/mips/kernel/proc.c   2005-12-19 01:36:54.000000000 +0100 
     11825+++ linux.dev/arch/mips/kernel/proc.c   2005-12-28 16:37:32.946265750 +0100 
    1179111826@@ -82,6 +82,8 @@ 
    1179211827        [CPU_VR4181]    = "NEC VR4181", 
     
    1179911834  
    1180011835diff -urN linux.old/arch/mips/mm/tlbex.c linux.dev/arch/mips/mm/tlbex.c 
    11801 --- linux.old/arch/mips/mm/tlbex.c      2005-12-15 13:26:49.794011750 +0100 
    11802 +++ linux.dev/arch/mips/mm/tlbex.c      2005-12-15 12:57:27.945158000 +0100 
     11836--- linux.old/arch/mips/mm/tlbex.c      2005-12-19 01:36:54.000000000 +0100 
     11837+++ linux.dev/arch/mips/mm/tlbex.c      2005-12-28 16:37:32.970267250 +0100 
    1180311838@@ -858,6 +858,8 @@ 
    1180411839        case CPU_4KSC: 
     
    1181111846  
    1181211847diff -urN linux.old/include/asm-mips/bootinfo.h linux.dev/include/asm-mips/bootinfo.h 
    11813 --- linux.old/include/asm-mips/bootinfo.h       2005-12-15 13:26:49.818001250 +0100 
    11814 +++ linux.dev/include/asm-mips/bootinfo.h       2005-12-15 12:57:27.969147500 +0100 
     11848--- linux.old/include/asm-mips/bootinfo.h       2005-12-19 01:36:54.000000000 +0100 
     11849+++ linux.dev/include/asm-mips/bootinfo.h       2005-12-28 16:37:32.970267250 +0100 
    1181511850@@ -218,6 +218,12 @@ 
    1181611851 #define MACH_GROUP_TITAN       22      /* PMC-Sierra Titan             */ 
     
    1182711862 const char *get_system_type(void); 
    1182811863diff -urN linux.old/include/asm-mips/cpu.h linux.dev/include/asm-mips/cpu.h 
    11829 --- linux.old/include/asm-mips/cpu.h    2005-12-15 13:26:49.818001250 +0100 
    11830 +++ linux.dev/include/asm-mips/cpu.h    2005-12-15 12:57:27.969147500 +0100 
     11864--- linux.old/include/asm-mips/cpu.h    2005-12-19 01:36:54.000000000 +0100 
     11865+++ linux.dev/include/asm-mips/cpu.h    2005-12-28 16:37:32.974267500 +0100 
    1183111866@@ -102,6 +102,13 @@ 
    1183211867 #define PRID_IMP_SR71000        0x0400 
     
    1185511890  * ISA Level encodings 
    1185611891diff -urN linux.old/include/linux/init.h linux.dev/include/linux/init.h 
    11857 --- linux.old/include/linux/init.h      2005-12-15 13:26:49.818001250 +0100 
    11858 +++ linux.dev/include/linux/init.h      2005-12-15 12:57:27.973145750 +0100 
     11892--- linux.old/include/linux/init.h      2005-12-19 01:36:54.000000000 +0100 
     11893+++ linux.dev/include/linux/init.h      2005-12-28 16:37:32.982268000 +0100 
    1185911894@@ -86,6 +86,8 @@ 
    1186011895        static initcall_t __initcall_##fn __attribute_used__ \ 
     
    1186711902 #define arch_initcall(fn)              __define_initcall("3",fn) 
    1186811903diff -urN linux.old/include/linux/pci_ids.h linux.dev/include/linux/pci_ids.h 
    11869 --- linux.old/include/linux/pci_ids.h   2005-12-15 13:26:49.818001250 +0100 
    11870 +++ linux.dev/include/linux/pci_ids.h   2005-12-15 12:57:27.977144000 +0100 
    11871 @@ -1835,6 +1835,7 @@ 
     11904--- linux.old/include/linux/pci_ids.h   2005-12-19 01:36:54.000000000 +0100 
     11905+++ linux.dev/include/linux/pci_ids.h   2005-12-28 16:37:32.994268750 +0100 
     11906@@ -1836,6 +1836,7 @@ 
    1187211907 #define PCI_DEVICE_ID_TIGON3_5901_2    0x170e 
    1187311908 #define PCI_DEVICE_ID_BCM4401          0x4401 
Note: See TracChangeset for help on using the changeset viewer.