13 files changed, 8 insertions, 225 deletions

diff --git a/arch/sparc/include/asm/asmmacro.h b/arch/sparc/include/asm/asmmacro.h
index a619a4d97aae..a995bf8aba3f 100644
--- a/arch/sparc/include/asm/asmmacro.h
+++ b/arch/sparc/include/asm/asmmacro.h
@@ -34,12 +34,7 @@
 /* sun4 probably wants half word accesses to ASI_SEGMAP, while sun4c+
    likes byte accesses. These are to avoid ifdef mania. */
 
-#ifdef CONFIG_SUN4
-#define lduXa   lduha
-#define stXa    stha
-#else
 #define lduXa   lduba
 #define stXa    stba
-#endif
 
 #endif /* !(_SPARC_ASMMACRO_H) */
diff --git a/arch/sparc/include/asm/elf_32.h b/arch/sparc/include/asm/elf_32.h
index d043f80bc2fd..b7ab60547827 100644
--- a/arch/sparc/include/asm/elf_32.h
+++ b/arch/sparc/include/asm/elf_32.h
@@ -105,11 +105,8 @@ typedef struct {
 #define ELF_DATA        ELFDATA2MSB
 
 #define USE_ELF_CORE_DUMP
-#ifndef CONFIG_SUN4
+
 #define ELF_EXEC_PAGESIZE       4096
-#else
-#define ELF_EXEC_PAGESIZE       8192
-#endif
 
 
 /* This is the location that an ET_DYN program is loaded if exec'ed.  Typical
@@ -126,7 +123,7 @@ typedef struct {
 /* Sun4c has none of the capabilities, most sun4m's have them all.
  * XXX This is gross, set some global variable at boot time. -DaveM
  */
-#define ELF_HWCAP       ((ARCH_SUN4C_SUN4) ? 0 : \
+#define ELF_HWCAP       ((ARCH_SUN4C) ? 0 : \
                          (HWCAP_SPARC_FLUSH | HWCAP_SPARC_STBAR | \
                           HWCAP_SPARC_SWAP | \
                           ((srmmu_modtype != Cypress && \
diff --git a/arch/sparc/include/asm/mostek.h b/arch/sparc/include/asm/mostek.h
index a99590c4c507..98b44dd93e4b 100644
--- a/arch/sparc/include/asm/mostek.h
+++ b/arch/sparc/include/asm/mostek.h
@@ -128,44 +128,6 @@ struct mostek48t08 {
         struct mostek48t02 regs;     /* Here is what we are interested in.   */
 };
 
-#ifdef CONFIG_SUN4
-enum sparc_clock_type { MSTK48T02, MSTK48T08, \
-INTERSIL, MSTK_INVALID };
-#else
-enum sparc_clock_type { MSTK48T02, MSTK48T08, \
-MSTK_INVALID };
-#endif
-
-#ifdef CONFIG_SUN4
-/* intersil on a sun 4/260 code  data from harris doc */
-struct intersil_dt {
-        volatile unsigned char int_csec;
-        volatile unsigned char int_hour;
-        volatile unsigned char int_min;
-        volatile unsigned char int_sec;
-        volatile unsigned char int_month;
-        volatile unsigned char int_day;
-        volatile unsigned char int_year;
-        volatile unsigned char int_dow;
-};
-
-struct intersil {
-        struct intersil_dt clk;
-        struct intersil_dt cmp;
-        volatile unsigned char int_intr_reg;
-        volatile unsigned char int_cmd_reg;
-};
-
-#define INTERSIL_STOP        0x0
-#define INTERSIL_START       0x8
-#define INTERSIL_INTR_DISABLE   0x0
-#define INTERSIL_INTR_ENABLE   0x10
-#define INTERSIL_32K            0x0
-#define INTERSIL_NORMAL         0x0
-#define INTERSIL_24H            0x4
-#define INTERSIL_INT_100HZ      0x2
-
-/* end of intersil info */
-#endif
+enum sparc_clock_type { MSTK48T02, MSTK48T08, MSTK_INVALID };
 
 #endif /* !(_SPARC_MOSTEK_H) */
diff --git a/arch/sparc/include/asm/oplib_32.h b/arch/sparc/include/asm/oplib_32.h
index b2631da259e0..699da05235c8 100644
--- a/arch/sparc/include/asm/oplib_32.h
+++ b/arch/sparc/include/asm/oplib_32.h
@@ -21,7 +21,6 @@ enum prom_major_version {
         PROM_V2,      /* sun4c and early sun4m V2 prom */
         PROM_V3,      /* sun4m and later, up to sun4d/sun4e machines V3 */
         PROM_P1275,   /* IEEE compliant ISA based Sun PROM, only sun4u */
-        PROM_SUN4,    /* Old sun4 proms are totally different, but we'll shoehorn it to make it fit */
 };
 
 extern enum prom_major_version prom_vers;
diff --git a/arch/sparc/include/asm/page_32.h b/arch/sparc/include/asm/page_32.h
index cf5fb70ca1c1..d1806edc0958 100644
--- a/arch/sparc/include/asm/page_32.h
+++ b/arch/sparc/include/asm/page_32.h
@@ -8,11 +8,8 @@
 #ifndef _SPARC_PAGE_H
 #define _SPARC_PAGE_H
 
-#ifdef CONFIG_SUN4
-#define PAGE_SHIFT   13
-#else
 #define PAGE_SHIFT   12
-#endif
+
 #ifndef __ASSEMBLY__
 /* I have my suspicions... -DaveM */
 #define PAGE_SIZE    (1UL << PAGE_SHIFT)
diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
index 08237fda8874..e0cabe790ec1 100644
--- a/arch/sparc/include/asm/pgtable_32.h
+++ b/arch/sparc/include/asm/pgtable_32.h
@@ -14,11 +14,7 @@
 #include <linux/spinlock.h>
 #include <linux/swap.h>
 #include <asm/types.h>
-#ifdef CONFIG_SUN4
-#include <asm/pgtsun4.h>
-#else
 #include <asm/pgtsun4c.h>
-#endif
 #include <asm/pgtsrmmu.h>
 #include <asm/vac-ops.h>
 #include <asm/oplib.h>
diff --git a/arch/sparc/include/asm/sun4paddr.h b/arch/sparc/include/asm/sun4paddr.h
deleted file mode 100644
index d52985f19f42..000000000000
--- a/arch/sparc/include/asm/sun4paddr.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * sun4paddr.h:  Various physical addresses on sun4 machines
- *
- * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au)
- * Copyright (C) 1998 Chris Davis (cdavis@cois.on.ca)
- * 
- * Now supports more sun4's
- */
-
-#ifndef _SPARC_SUN4PADDR_H
-#define _SPARC_SUN4PADDR_H
-
-#define SUN4_IE_PHYSADDR                0xf5000000
-#define SUN4_UNUSED_PHYSADDR            0
-
-/* these work for me */
-#define SUN4_200_MEMREG_PHYSADDR        0xf4000000
-#define SUN4_200_CLOCK_PHYSADDR         0xf3000000
-#define SUN4_200_BWTWO_PHYSADDR         0xfd000000
-#define SUN4_200_ETH_PHYSADDR           0xf6000000
-#define SUN4_200_SI_PHYSADDR            0xff200000
-
-/* these were here before */
-#define SUN4_300_MEMREG_PHYSADDR        0xf4000000
-#define SUN4_300_CLOCK_PHYSADDR         0xf2000000
-#define SUN4_300_TIMER_PHYSADDR         0xef000000
-#define SUN4_300_ETH_PHYSADDR           0xf9000000
-#define SUN4_300_BWTWO_PHYSADDR         0xfb400000
-#define SUN4_300_DMA_PHYSADDR           0xfa001000
-#define SUN4_300_ESP_PHYSADDR           0xfa000000
-
-/* Are these right? */
-#define SUN4_400_MEMREG_PHYSADDR        0xf4000000
-#define SUN4_400_CLOCK_PHYSADDR         0xf2000000
-#define SUN4_400_TIMER_PHYSADDR         0xef000000
-#define SUN4_400_ETH_PHYSADDR           0xf9000000
-#define SUN4_400_BWTWO_PHYSADDR         0xfb400000
-#define SUN4_400_DMA_PHYSADDR           0xfa001000
-#define SUN4_400_ESP_PHYSADDR           0xfa000000
-
-/* 
-        these are the actual values set and used in the code. Unused items set 
-        to SUN_UNUSED_PHYSADDR 
- */
-
-extern int sun4_memreg_physaddr; /* memory register (ecc?) */
-extern int sun4_clock_physaddr;  /* system clock */
-extern int sun4_timer_physaddr;  /* timer, where applicable */
-extern int sun4_eth_physaddr;    /* onboard ethernet (ie/le) */
-extern int sun4_si_physaddr;     /* sun3 scsi adapter */
-extern int sun4_bwtwo_physaddr;  /* onboard bw2 */
-extern int sun4_dma_physaddr;    /* scsi dma */
-extern int sun4_esp_physaddr;    /* esp scsi */
-extern int sun4_ie_physaddr;     /* interrupt enable */
-
-#endif /* !(_SPARC_SUN4PADDR_H) */
diff --git a/arch/sparc/include/asm/sun4prom.h b/arch/sparc/include/asm/sun4prom.h
deleted file mode 100644
index 9c8b4cbf629a..000000000000
--- a/arch/sparc/include/asm/sun4prom.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * sun4prom.h -- interface to sun4 PROM monitor.  We don't use most of this,
- *               so most of these are just placeholders.
- */
-
-#ifndef _SUN4PROM_H_
-#define _SUN4PROM_H_
-
-/*
- * Although this looks similar to an romvec for a OpenProm machine, it is 
- * actually closer to what was used in the Sun2 and Sun3.
- *
- * V2 entries exist only in version 2 PROMs and later, V3 in version 3 and later.
- * 
- * Many of the function prototypes are guesses.  Some are certainly wrong.
- * Use with care.
- */
-
-typedef struct {
-        char            *initSP;                /* Initial system stack ptr */
-        void            (*startmon)(void);      /* Initial PC for hardware */
-        int             *diagberr;              /* Bus err handler for diags */
-        struct linux_arguments_v0 **bootParam; /* Info for bootstrapped pgm */
-        unsigned int    *memorysize;            /* Usable memory in bytes */
-        unsigned char   (*getchar)(void);       /* Get char from input device */ 
-        void            (*putchar)(char);       /* Put char to output device */
-        int             (*mayget)(void);        /* Maybe get char, or -1 */
-        int             (*mayput)(int);         /* Maybe put char, or -1 */
-        unsigned char   *echo;                  /* Should getchar echo? */
-        unsigned char   *insource;              /* Input source selector */
-        unsigned char   *outsink;               /* Output sink selector */
-        int             (*getkey)(void);        /* Get next key if one exists */
-        void            (*initgetkey)(void);    /* Initialize get key */
-        unsigned int    *translation;           /* Kbd translation selector */
-        unsigned char   *keybid;                /* Keyboard ID byte */
-        int             *screen_x;              /* V2: Screen x pos (r/o) */
-        int             *screen_y;              /* V2: Screen y pos (r/o) */
-        struct keybuf   *keybuf;                /* Up/down keycode buffer */
-        char            *monid;                 /* Monitor version ID */
-        void            (*fbwritechar)(char);   /* Write a character to FB */
-        int             *fbAddr;                /* Address of frame buffer */
-        char            **font;                 /* Font table for FB */
-        void            (*fbwritestr)(char *);  /* Write string to FB */
-        void            (*reboot)(char *);      /* e.g. reboot("sd()vmlinux") */
-        unsigned char   *linebuf;               /* The line input buffer */
-        unsigned char   **lineptr;              /* Cur pointer into linebuf */
-        int             *linesize;              /* length of line in linebuf */
-        void            (*getline)(char *);     /* Get line from user */
-        unsigned char   (*getnextchar)(void);   /* Get next char from linebuf */
-        unsigned char   (*peeknextchar)(void);  /* Peek at next char */
-        int             *fbthere;               /* =1 if frame buffer there */
-        int             (*getnum)(void);        /* Grab hex num from line */
-        int             (*printf)(char *, ...); /* See prom_printf() instead */ 
-        void            (*printhex)(int);       /* Format N digits in hex */
-        unsigned char   *leds;                  /* RAM copy of LED register */
-        void            (*setLEDs)(unsigned char *);    /* Sets LED's and RAM copy */
-        void            (*NMIaddr)(void *);     /* Addr for level 7 vector */
-        void            (*abortentry)(void);    /* Entry for keyboard abort */
-        int             *nmiclock;              /* Counts up in msec */
-        int             *FBtype;                /* Frame buffer type */
-        unsigned int    romvecversion;          /* Version number for this romvec */
-        struct globram  *globram;               /* monitor global variables ??? */
-        void *          kbdaddr;                /* Addr of keyboard in use */
-        int             *keyrinit;              /* ms before kbd repeat */
-        unsigned char   *keyrtick;              /* ms between repetitions */
-        unsigned int    *memoryavail;           /* V1: Main mem usable size */
-        long            *resetaddr;             /* where to jump on a reset */
-        long            *resetmap;              /* pgmap entry for resetaddr */
-        void            (*exittomon)(void);     /* Exit from user program */
-        unsigned char   **memorybitmap;         /* V1: &{0 or &bits} */
-        void            (*setcxsegmap)(int ctxt, char *va, int pmeg);   /* Set seg in any context */
-        void            (**vector_cmd)(void *); /* V2: Handler for 'v' cmd */
-        unsigned long   *expectedtrapsig;       /* V3: Location of the expected trap signal */
-        unsigned long   *trapvectorbasetable;   /* V3: Address of the trap vector table */
-        int             unused1;
-        int             unused2;
-        int             unused3;
-        int             unused4;
-} linux_sun4_romvec;
-
-extern linux_sun4_romvec *sun4_romvec;
-
-#endif /* _SUN4PROM_H_ */
diff --git a/arch/sparc/include/asm/system_32.h b/arch/sparc/include/asm/system_32.h
index b4b024445fc9..4e18ef272336 100644
--- a/arch/sparc/include/asm/system_32.h
+++ b/arch/sparc/include/asm/system_32.h
@@ -34,13 +34,7 @@ enum sparc_cpu {
 
 extern enum sparc_cpu sparc_cpu_model;
 
-#ifndef CONFIG_SUN4
-#define ARCH_SUN4C_SUN4 (sparc_cpu_model==sun4c)
-#define ARCH_SUN4 0
-#else
-#define ARCH_SUN4C_SUN4 1
-#define ARCH_SUN4 1
-#endif
+#define ARCH_SUN4C (sparc_cpu_model==sun4c)
 
 #define SUN4M_NCPUS            4              /* Architectural limit of sun4m. */
 
diff --git a/arch/sparc/include/asm/system_64.h b/arch/sparc/include/asm/system_64.h
index db9e742a406a..98acb3b9d4a1 100644
--- a/arch/sparc/include/asm/system_64.h
+++ b/arch/sparc/include/asm/system_64.h
@@ -26,9 +26,8 @@ enum sparc_cpu {
 
 #define sparc_cpu_model sun4u
 
-/* This cannot ever be a sun4c nor sun4 :) That's just history. */
-#define ARCH_SUN4C_SUN4 0
-#define ARCH_SUN4 0
+/* This cannot ever be a sun4c :) That's just history. */
+#define ARCH_SUN4C 0
 
 extern char reboot_command[];
 
diff --git a/arch/sparc/include/asm/thread_info_32.h b/arch/sparc/include/asm/thread_info_32.h
index cbb892d0dff0..29899fd5b1b2 100644
--- a/arch/sparc/include/asm/thread_info_32.h
+++ b/arch/sparc/include/asm/thread_info_32.h
@@ -80,11 +80,7 @@ register struct thread_info *current_thread_info_reg asm("g6");
 /*
  * thread information allocation
  */
-#if PAGE_SHIFT == 13
-#define THREAD_INFO_ORDER  0
-#else /* PAGE_SHIFT */
 #define THREAD_INFO_ORDER  1
-#endif
 
 #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
 
diff --git a/arch/sparc/include/asm/timer_32.h b/arch/sparc/include/asm/timer_32.h
index 361e53898dd7..adab3def007c 100644
--- a/arch/sparc/include/asm/timer_32.h
+++ b/arch/sparc/include/asm/timer_32.h
@@ -9,7 +9,6 @@
 #define _SPARC_TIMER_H
 
 #include <asm/system.h>  /* For SUN4M_NCPUS */
-#include <asm/sun4paddr.h>
 #include <asm/btfixup.h>
 
 /* Timer structures. The interrupt timer has two properties which
@@ -34,12 +33,7 @@ struct sun4c_timer_info {
   __volatile__ unsigned int timer_limit14;
 };
 
-#define SUN4C_TIMER_PHYSADDR   0xf3000000
-#ifdef CONFIG_SUN4
-#define SUN_TIMER_PHYSADDR SUN4_300_TIMER_PHYSADDR
-#else
-#define SUN_TIMER_PHYSADDR SUN4C_TIMER_PHYSADDR
-#endif
+#define SUN_TIMER_PHYSADDR   0xf3000000
 
 /* A sun4m has two blocks of registers which are probably of the same
  * structure. LSI Logic's L64851 is told to _decrement_ from the limit
diff --git a/arch/sparc/include/asm/vac-ops.h b/arch/sparc/include/asm/vac-ops.h
index d10527611f11..a63e88ef0426 100644
--- a/arch/sparc/include/asm/vac-ops.h
+++ b/arch/sparc/include/asm/vac-ops.h
@@ -76,11 +76,7 @@
  * cacheable bit in the pte's of all such pages.
  */
 
-#ifdef CONFIG_SUN4
-#define S4CVAC_BADBITS     0x0001e000
-#else
 #define S4CVAC_BADBITS    0x0000f000
-#endif
 
 /* The following is true if vaddr1 and vaddr2 would cause
  * a 'bad alias'.
@@ -94,10 +90,7 @@
  */
 struct sun4c_vac_props {
         unsigned int num_bytes;     /* Size of the cache */
-        unsigned int num_lines;     /* Number of cache lines */
         unsigned int do_hwflushes;  /* Hardware flushing available? */
-        enum { VAC_NONE, VAC_WRITE_THROUGH,
-            VAC_WRITE_BACK } type;  /* What type of VAC? */
         unsigned int linesize;      /* Size of each line in bytes */
         unsigned int log2lsize;     /* log2(linesize) */
         unsigned int on;            /* VAC is enabled */