Commit 5110bd21 authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files

sparc: remove CONFIG_SUN4 



While doing some easy cleanups on the sparc code I noticed that the
CONFIG_SUN4 code seems to be worse than the rest - there were some
"I don't know how it should work, but the current code definitely cannot
work." places.

And while I have seen people running Linux on machines like a
SPARCstation 5 a few years ago I don't recall having seen sun4
machines, even less ones running Linux.

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b69416b5

arch/sparc/Kconfig

+0 −15
Original line number Diff line number Diff line
@@ -210,17 +210,6 @@ config SUN_PM 
	  Enable power management and CPU standby features on supported

	  SPARC platforms.



config SUN4

	bool "Support for SUN4 machines (disables SUN4[CDM] support)"

	depends on !SMP

	default n

	help

	  Say Y here if, and only if, your machine is a sun4. Note that

	  a kernel compiled with this option will run only on sun4.

	  (And the current version will probably work only on sun4/330.)



if !SUN4



config PCI

	bool "Support for PCI and PS/2 keyboard/mouse"

	help
@@ -233,8 +222,6 @@ config PCI_SYSCALL 


source "drivers/pci/Kconfig"



endif



config SUN_OPENPROMFS

	tristate "Openprom tree appears in /proc/openprom"

	help
@@ -266,9 +253,7 @@ source "net/Kconfig" 


source "drivers/Kconfig"



if !SUN4

source "drivers/sbus/char/Kconfig"

endif



# This one must be before the filesystem configs. -DaveM

arch/sparc/include/asm/asmmacro.h

+0 −5
Original line number Diff line number Diff line
@@ -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) */

arch/sparc/include/asm/elf_32.h

+2 −5
Original line number Diff line number Diff line
@@ -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 && \

arch/sparc/include/asm/mostek.h

+1 −39
Original line number Diff line number Diff line
@@ -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) */

arch/sparc/include/asm/oplib_32.h

+0 −1
Original line number Diff line number Diff line
@@ -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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE