2 files changed, 15 insertions, 126 deletions

diff --git a/arch/m68k/include/asm/mcfne.h b/arch/m68k/include/asm/mcf8390.h
index bf638be0958c..a72a20819a54 100644
--- a/arch/m68k/include/asm/mcfne.h
+++ b/arch/m68k/include/asm/mcf8390.h
@@ -1,7 +1,7 @@
 /****************************************************************************/
 
 /*
- *      mcfne.h -- NE2000 in ColdFire eval boards.
+ *      mcf8390.h -- NS8390 support for ColdFire eval boards.
  *
  *      (C) Copyright 1999-2000, Greg Ungerer (gerg@snapgear.com)
  *      (C) Copyright 2000,      Lineo (www.lineo.com)
@@ -14,8 +14,8 @@
  */
 
 /****************************************************************************/
-#ifndef mcfne_h
-#define mcfne_h
+#ifndef mcf8390_h
+#define mcf8390_h
 /****************************************************************************/
 
 
@@ -37,6 +37,7 @@
 #if defined(CONFIG_ARN5206)
 #define NE2000_ADDR             0x40000300
 #define NE2000_ODDOFFSET        0x00010000
+#define NE2000_ADDRSIZE         0x00020000
 #define NE2000_IRQ_VECTOR       0xf0
 #define NE2000_IRQ_PRIORITY     2
 #define NE2000_IRQ_LEVEL        4
@@ -46,6 +47,7 @@
 #if defined(CONFIG_M5206eC3)
 #define NE2000_ADDR             0x40000300
 #define NE2000_ODDOFFSET        0x00010000
+#define NE2000_ADDRSIZE         0x00020000
 #define NE2000_IRQ_VECTOR       0x1c
 #define NE2000_IRQ_PRIORITY     2
 #define NE2000_IRQ_LEVEL        4
@@ -54,6 +56,7 @@
 
 #if defined(CONFIG_M5206e) && defined(CONFIG_NETtel)
 #define NE2000_ADDR             0x30000300
+#define NE2000_ADDRSIZE         0x00001000
 #define NE2000_IRQ_VECTOR       25
 #define NE2000_IRQ_PRIORITY     1
 #define NE2000_IRQ_LEVEL        3
@@ -63,6 +66,7 @@
 #if defined(CONFIG_M5307C3)
 #define NE2000_ADDR             0x40000300
 #define NE2000_ODDOFFSET        0x00010000
+#define NE2000_ADDRSIZE         0x00020000
 #define NE2000_IRQ_VECTOR       0x1b
 #define NE2000_BYTE             volatile unsigned short
 #endif
@@ -70,6 +74,7 @@
 #if defined(CONFIG_M5272) && defined(CONFIG_NETtel)
 #define NE2000_ADDR             0x30600300
 #define NE2000_ODDOFFSET        0x00008000
+#define NE2000_ADDRSIZE         0x00010000
 #define NE2000_IRQ_VECTOR       67
 #undef  BSWAP
 #define BSWAP(w)                (w)
@@ -82,6 +87,7 @@
 #define NE2000_ADDR0            0x30600300
 #define NE2000_ADDR1            0x30800300
 #define NE2000_ODDOFFSET        0x00008000
+#define NE2000_ADDRSIZE         0x00010000
 #define NE2000_IRQ_VECTOR0      27
 #define NE2000_IRQ_VECTOR1      29
 #undef  BSWAP
@@ -94,6 +100,7 @@
 #if defined(CONFIG_M5307) && defined(CONFIG_SECUREEDGEMP3)
 #define NE2000_ADDR             0x30600300
 #define NE2000_ODDOFFSET        0x00008000
+#define NE2000_ADDRSIZE         0x00010000
 #define NE2000_IRQ_VECTOR       27
 #undef  BSWAP
 #define BSWAP(w)                (w)
@@ -105,6 +112,7 @@
 #if defined(CONFIG_ARN5307)
 #define NE2000_ADDR             0xfe600300
 #define NE2000_ODDOFFSET        0x00010000
+#define NE2000_ADDRSIZE         0x00020000
 #define NE2000_IRQ_VECTOR       0x1b
 #define NE2000_IRQ_PRIORITY     2
 #define NE2000_IRQ_LEVEL        3
@@ -114,129 +122,10 @@
 #if defined(CONFIG_M5407C3)
 #define NE2000_ADDR             0x40000300
 #define NE2000_ODDOFFSET        0x00010000
+#define NE2000_ADDRSIZE         0x00020000
 #define NE2000_IRQ_VECTOR       0x1b
 #define NE2000_BYTE             volatile unsigned short
 #endif
 
 /****************************************************************************/
-
-/*
- *      Side-band address space for odd address requires re-mapping
- *      many of the standard ISA access functions.
- */
-#ifdef NE2000_ODDOFFSET
-
-#undef outb
-#undef outb_p
-#undef inb
-#undef inb_p
-#undef outsb
-#undef outsw
-#undef insb
-#undef insw
-
-#define outb    ne2000_outb
-#define inb     ne2000_inb
-#define outb_p  ne2000_outb
-#define inb_p   ne2000_inb
-#define outsb   ne2000_outsb
-#define outsw   ne2000_outsw
-#define insb    ne2000_insb
-#define insw    ne2000_insw
-
-
-#ifndef COLDFIRE_NE2000_FUNCS
-
-void ne2000_outb(unsigned int val, unsigned int addr);
-int  ne2000_inb(unsigned int addr);
-void ne2000_insb(unsigned int addr, void *vbuf, int unsigned long len);
-void ne2000_insw(unsigned int addr, void *vbuf, unsigned long len);
-void ne2000_outsb(unsigned int addr, void *vbuf, unsigned long len);
-void ne2000_outsw(unsigned int addr, void *vbuf, unsigned long len);
-
-#else
-
-/*
- *      This macro converts a conventional register address into the
- *      real memory pointer of the mapped NE2000 device.
- *      On most NE2000 implementations on ColdFire boards the chip is
- *      mapped in kinda funny, due to its ISA heritage.
- */
-#define NE2000_PTR(addr)        ((addr&0x1)?(NE2000_ODDOFFSET+addr-1):(addr))
-#define NE2000_DATA_PTR(addr)   (addr)
-
-
-void ne2000_outb(unsigned int val, unsigned int addr)
-{
-        NE2000_BYTE     *rp;
-
-        rp = (NE2000_BYTE *) NE2000_PTR(addr);
-        *rp = RSWAP(val);
-}
-
-int ne2000_inb(unsigned int addr)
-{
-        NE2000_BYTE     *rp, val;
-
-        rp = (NE2000_BYTE *) NE2000_PTR(addr);
-        val = *rp;
-        return((int) ((NE2000_BYTE) RSWAP(val)));
-}
-
-void ne2000_insb(unsigned int addr, void *vbuf, int unsigned long len)
-{
-        NE2000_BYTE     *rp, val;
-        unsigned char   *buf;
-
-        buf = (unsigned char *) vbuf;
-        rp = (NE2000_BYTE *) NE2000_DATA_PTR(addr);
-        for (; (len > 0); len--) {
-                val = *rp;
-                *buf++ = RSWAP(val);
-        }
-}
-
-void ne2000_insw(unsigned int addr, void *vbuf, unsigned long len)
-{
-        volatile unsigned short *rp;
-        unsigned short          w, *buf;
-
-        buf = (unsigned short *) vbuf;
-        rp = (volatile unsigned short *) NE2000_DATA_PTR(addr);
-        for (; (len > 0); len--) {
-                w = *rp;
-                *buf++ = BSWAP(w);
-        }
-}
-
-void ne2000_outsb(unsigned int addr, const void *vbuf, unsigned long len)
-{
-        NE2000_BYTE     *rp, val;
-        unsigned char   *buf;
-
-        buf = (unsigned char *) vbuf;
-        rp = (NE2000_BYTE *) NE2000_DATA_PTR(addr);
-        for (; (len > 0); len--) {
-                val = *buf++;
-                *rp = RSWAP(val);
-        }
-}
-
-void ne2000_outsw(unsigned int addr, const void *vbuf, unsigned long len)
-{
-        volatile unsigned short *rp;
-        unsigned short          w, *buf;
-
-        buf = (unsigned short *) vbuf;
-        rp = (volatile unsigned short *) NE2000_DATA_PTR(addr);
-        for (; (len > 0); len--) {
-                w = *buf++;
-                *rp = BSWAP(w);
-        }
-}
-
-#endif /* COLDFIRE_NE2000_FUNCS */
-#endif /* NE2000_OFFOFFSET */
-
-/****************************************************************************/
-#endif  /* mcfne_h */
+#endif  /* mcf8390_h */
diff --git a/arch/m68k/kernel/module.c b/arch/m68k/kernel/module.c
index 34849c4c6e3d..eb46fd6038ca 100644
--- a/arch/m68k/kernel/module.c
+++ b/arch/m68k/kernel/module.c
@@ -47,7 +47,7 @@ int apply_relocate(Elf32_Shdr *sechdrs,
                         *location += sym->st_value;
                         break;
                 case R_68K_PC32:
-                        /* Add the value, subtract its postition */
+                        /* Add the value, subtract its position */
                         *location += sym->st_value - (uint32_t)location;
                         break;
                 default:
@@ -87,7 +87,7 @@ int apply_relocate_add(Elf32_Shdr *sechdrs,
                         *location = rel[i].r_addend + sym->st_value;
                         break;
                 case R_68K_PC32:
-                        /* Add the value, subtract its postition */
+                        /* Add the value, subtract its position */
                         *location = rel[i].r_addend + sym->st_value - (uint32_t)location;
                         break;
                 default: