summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile4
-rw-r--r--arch/mips/config.in85
-rw-r--r--arch/mips/kernel/Makefile7
-rw-r--r--arch/mips/kernel/setup.c14
-rw-r--r--arch/mips/mm/Makefile4
-rw-r--r--drivers/Makefile4
-rw-r--r--drivers/char/Makefile16
-rw-r--r--drivers/net/Makefile16
-rw-r--r--drivers/net/Space.c11
-rw-r--r--drivers/scsi/Makefile4
-rw-r--r--drivers/scsi/hosts.c11
-rw-r--r--init/main.c7
12 files changed, 161 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index 3cf1ac1ea..37b189804 100644
--- a/Makefile
+++ b/Makefile
@@ -194,6 +194,10 @@ ifeq ($(CONFIG_IRDA),y)
DRIVERS := $(DRIVERS) drivers/net/irda/irda_drivers.a
endif
+ifeq ($(CONFIG_TC),y)
+DRIVERS := $(DRIVERS) drivers/tc/tc.a
+endif
+
include arch/$(ARCH)/Makefile
.S.s:
diff --git a/arch/mips/config.in b/arch/mips/config.in
index 3babc3263..e46aa0e2e 100644
--- a/arch/mips/config.in
+++ b/arch/mips/config.in
@@ -14,6 +14,8 @@ comment 'Machine selection'
bool 'Support for Acer PICA 1 chipset' CONFIG_ACER_PICA_61
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
bool 'Support for Algorithmics P4032' CONFIG_ALGOR_P4032
+ bool 'Support for BAGET MIPS series' CONFIG_BAGET_MIPS
+ bool 'Support for DECstations' CONFIG_DECSTATION
fi
bool 'Support for Mips Magnum 4000' CONFIG_MIPS_MAGNUM_4000
bool 'Support for Olivetti M700-10' CONFIG_OLIVETTI_M700
@@ -70,13 +72,13 @@ if [ "$CONFIG_PCI" = "y" ]; then
fi
if [ "$CONFIG_DECSTATION" = "y" ]; then
- bool 'Compile the kernel into the ECOFF object format' CONFIG_ECOFF_KERNEL
define_bool CONFIG_CPU_LITTLE_ENDIAN y
else
- define_bool CONFIG_ELF_KERNEL y
bool 'Generate little endian code' CONFIG_CPU_LITTLE_ENDIAN
fi
+define_bool CONFIG_ELF_KERNEL y
+
if [ "$CONFIG_CPU_LITTLE_ENDIAN" = "n" ]; then
define_bool CONFIG_BINFMT_IRIX y
define_bool CONFIG_FORWARD_KEYBOARD y
@@ -85,7 +87,6 @@ define_bool CONFIG_BINFMT_AOUT n
define_bool CONFIG_BINFMT_ELF y
tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then
- tristate 'Kernel support for MISC binaries' CONFIG_BINFMT_MISC
tristate 'Kernel support for JAVA binaries (obsolete)' CONFIG_BINFMT_JAVA
fi
@@ -94,7 +95,7 @@ bool 'System V IPC' CONFIG_SYSVIPC
bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT
bool 'Sysctl support' CONFIG_SYSCTL
-if [ "$CONFIG_SGI" != "y" ]; then
+if [ "$CONFIG_SGI" != "y" -a "$CONFIG_DECSTATION" != "y" -a "$CONFIG_BAGET_MIPS" != "y" ]; then
tristate 'Parallel port support' CONFIG_PARPORT
fi
endmenu
@@ -113,6 +114,16 @@ fi
endmenu
+if [ "$CONFIG_DECSTATION" = "y" ]; then
+ mainmenu_option next_comment
+ comment 'TURBOchannel support'
+ bool 'TURBOchannel support' CONFIG_TC
+# if [ "$CONFIG_TC" = "y" ]; then
+# tristate 'MAGMA Parallel port support' CONFIG_PARPORT
+# fi
+ endmenu
+fi
+
source drivers/block/Config.in
if [ "$CONFIG_NET" = "y" ]; then
@@ -125,7 +136,7 @@ comment 'SCSI support'
tristate 'SCSI support' CONFIG_SCSI
if [ "$CONFIG_SCSI" != "n" ]; then
- if [ "$CONFIG_SGI" = "y" ]; then
+ if [ "$CONFIG_SGI" = "y" -o "$CONFIG_DECSTATION" = "y" ]; then
comment 'SCSI support type (disk, tape, CDrom)'
dep_tristate 'SCSI disk support' CONFIG_BLK_DEV_SD $CONFIG_SCSI
@@ -141,9 +152,15 @@ if [ "$CONFIG_SCSI" != "n" ]; then
#mainmenu_option next_comment
comment 'SCSI low-level drivers'
-
+ if [ "$CONFIG_SGI" = "y" ]; then
dep_tristate 'SGI wd93 Scsi Driver' CONFIG_SCSI_SGIWD93 $CONFIG_SCSI
else
+ if [ "$CONFIG_TC" = "y" ]; then
+ dep_tristate 'DEC NCR53C94 Scsi Driver' CONFIG_SCSI_DECNCR $CONFIG_SCSI
+ fi
+ dep_tristate 'DEC SII Scsi Driver' CONFIG_SCSI_DECSII $CONFIG_SCSI
+ fi
+ else
source drivers/scsi/Config.in
fi
fi
@@ -155,7 +172,7 @@ if [ "$CONFIG_NET" = "y" ]; then
bool 'Network device support' CONFIG_NETDEVICES
if [ "$CONFIG_NETDEVICES" = "y" ]; then
- if [ "$CONFIG_SGI" != "y" ]; then
+ if [ "$CONFIG_SGI" != "y" -a "$CONFIG_DECSTATION" != "y" -a "$CONFIG_BAGET_MIPS" != "y" ]; then
source drivers/net/Config.in
else
tristate 'Dummy net driver support' CONFIG_DUMMY
@@ -168,13 +185,22 @@ if [ "$CONFIG_NET" = "y" ]; then
if [ ! "$CONFIG_PPP" = "n" ]; then
comment 'CCP compressors for PPP are only built as modules.'
fi
+ if [ "$CONFIG_SGI" = "y" ]; then
bool 'SGI Seeq ethernet controller support' CONFIG_SGISEEQ
fi
+ if [ "$CONFIG_DECSTATION" = "y" ]; then
+ bool 'DEC LANCE ethernet controller support' CONFIG_DECLANCE
+ fi
+ if [ "$CONFIG_BAGET_MIPS" = "y" ]; then
+ tristate 'Baget AMD LANCE support' CONFIG_BAGETLANCE
+ tristate 'Baget Backplane Shared Memory support' CONFIG_BAGETBSM
+ fi
+ fi
fi
endmenu
fi
-if [ "$CONFIG_SGI" != "y" ]; then
+if [ "$CONFIG_SGI" != "y" -a "$CONFIG_DECSTATION" != "y" -a "$CONFIG_BAGET_MIPS" != "y" ]; then
source drivers/net/hamradio/Config.in
@@ -200,7 +226,34 @@ if [ "$CONFIG_SGI" != "y" ]; then
endmenu
fi
-source drivers/char/Config.in
+if [ "$CONFIG_DECSTATION" != "y" ]; then
+ source drivers/char/Config.in
+else
+ mainmenu_option next_comment
+ comment 'DECstation Character devices'
+
+ bool 'Virtual terminal' CONFIG_VT
+ if [ "$CONFIG_VT" = "y" ]; then
+ bool 'Support for console on virtual terminal' CONFIG_VT_CONSOLE
+ fi
+ tristate 'Standard/generic (dumb) serial support' CONFIG_SERIAL
+ if [ "$CONFIG_SERIAL" = "y" ]; then
+ bool 'DZ11 Serial Support' CONFIG_DZ
+ if [ "$CONFIG_TC" = "y" ]; then
+ bool 'Z85C30 Serial Support' CONFIG_ZS
+ fi
+ bool ' Support for console on serial port' CONFIG_SERIAL_CONSOLE
+ fi
+ bool 'PROM Console Support' CONFIG_PROM_CONSOLE
+ bool 'Unix98 PTY support' CONFIG_UNIX98_PTYS
+ if [ "$CONFIG_UNIX98_PTYS" = "y" ]; then
+ int 'Maximum number of Unix98 PTYs in use (0-2048)' CONFIG_UNIX98_PTY_COUNT 256
+ fi
+ bool 'Keyboard Support' CONFIG_KEYBOARD
+ bool 'Mouse Support' CONFIG_MOUSE
+# bool 'Enhanced Real Time Clock Support' CONFIG_RTC
+ endmenu
+fi
source fs/Config.in
@@ -213,21 +266,25 @@ if [ "$CONFIG_VT" = "y" ]; then
define_bool CONFIG_DUMMY_CONSOLE y
fi
else
+ if [ "$CONFIG_DECSTATION" != "y" ]; then
bool 'VGA text console' CONFIG_VGA_CONSOLE
+ fi
bool 'Support for frame buffer devices' CONFIG_FB
source drivers/video/Config.in
fi
endmenu
fi
-mainmenu_option next_comment
-comment 'Sound'
+if [ "$CONFIG_DECSTATION" != "y" ]; then
+ mainmenu_option next_comment
+ comment 'Sound'
-tristate 'Sound card support' CONFIG_SOUND
-if [ "$CONFIG_SOUND" != "n" ]; then
+ tristate 'Sound card support' CONFIG_SOUND
+ if [ "$CONFIG_SOUND" != "n" ]; then
source drivers/sound/Config.in
+ fi
+ endmenu
fi
-endmenu
if [ "$CONFIG_SGI" = "y" ]; then
source drivers/sgi/Config.in
diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile
index ef8709bcd..9d296130d 100644
--- a/arch/mips/kernel/Makefile
+++ b/arch/mips/kernel/Makefile
@@ -26,8 +26,11 @@ endif
# SGI's have very different interrupt/timer hardware.
#
ifndef CONFIG_SGI
-O_OBJS += time.o
-OX_OBJS += irq.o
+ ifndef CONFIG_DECSTATION
+ ifndef CONFIG_BAGET_MIPS
+ O_OBJS += irq.o time.o
+ endif
+ endif
endif
#
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index c5f280a3e..1d9b76b5c 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -1,4 +1,4 @@
-/* $Id: setup.c,v 1.12 1999/02/06 03:57:41 adevries Exp $
+/* $Id: setup.c,v 1.13 1999/03/13 12:33:26 tsbogend Exp $
*
* This file is subject to the terms and conditions of the GNU General Public
* License. See the file "COPYING" in the main directory of this archive
@@ -103,7 +103,6 @@ unsigned long mips_memory_upper = KSEG0; /* this is set by kernel_entry() */
unsigned long mips_cputype = CPU_UNKNOWN;
unsigned long mips_machtype = MACH_UNKNOWN;
unsigned long mips_machgroup = MACH_GROUP_UNKNOWN;
-unsigned long mips_tlb_entries = 48; /* Guess which CPU I've got :) */
unsigned char aux_device_present;
extern int _end;
@@ -150,6 +149,7 @@ __initfunc(void setup_arch(char **cmdline_p,
unsigned long tmp;
unsigned long *initrd_header;
#endif
+ void baget_setup(void);
void cobalt_setup(void);
void decstation_setup(void);
void deskstation_setup(void);
@@ -173,11 +173,21 @@ __initfunc(void setup_arch(char **cmdline_p,
switch(mips_machgroup)
{
+#ifdef CONFIG_BAGET_MIPS
+ case MACH_GROUP_UNKNOWN:
+ baget_setup();
+ break;
+#endif
#ifdef CONFIG_COBALT_MICRO_SERVER
case MACH_GROUP_COBALT:
cobalt_setup();
break;
#endif
+#ifdef CONFIG_DECSTATION
+ case MACH_GROUP_DEC:
+ decstation_setup();
+ break;
+#endif
#ifdef CONFIG_MIPS_JAZZ
case MACH_GROUP_JAZZ:
jazz_setup();
diff --git a/arch/mips/mm/Makefile b/arch/mips/mm/Makefile
index 19060aec7..8f0b902a6 100644
--- a/arch/mips/mm/Makefile
+++ b/arch/mips/mm/Makefile
@@ -15,4 +15,8 @@ ifdef CONFIG_SGI
O_OBJS += umap.o
endif
+ifdef CONFIG_BAGET_MIPS
+O_OBJS += umap.o
+endif
+
include $(TOPDIR)/Rules.make
diff --git a/drivers/Makefile b/drivers/Makefile
index acd62b540..8f060eaef 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -34,6 +34,10 @@ ifdef CONFIG_NUBUS
SUB_DIRS += nubus
endif
+ifdef CONFIG_TC
+SUB_DIRS += tc
+endif
+
ifdef CONFIG_VT
SUB_DIRS += video
MOD_SUB_DIRS += video
diff --git a/drivers/char/Makefile b/drivers/char/Makefile
index 7544ffb4a..9a3bab5e1 100644
--- a/drivers/char/Makefile
+++ b/drivers/char/Makefile
@@ -31,20 +31,30 @@ endif
ifeq ($(CONFIG_SERIAL),y)
ifeq ($(CONFIG_SUN_SERIAL),)
ifeq ($(CONFIG_SGI_SERIAL),)
+ ifeq ($(CONFIG_DECSTATION),)
+ ifeq ($(CONFIG_BAGET_MIPS),)
LX_OBJS += serial.o
endif
endif
+ endif
+ endif
else
ifeq ($(CONFIG_SERIAL),m)
ifeq ($(CONFIG_SUN_SERIAL),)
ifeq ($(CONFIG_SGI_SERIAL),)
+ ifeq ($(CONFIG_DECSTATION),)
+ ifeq ($(CONFIG_BAGET_MIPS),)
MX_OBJS += serial.o
endif
endif
endif
+ endif
+ endif
endif
ifndef CONFIG_SUN_KEYBOARD
+ifndef CONFIG_DECSTATION
+ifndef CONFIG_BAGET_MIPS
ifdef CONFIG_VT
L_OBJS += keyboard.o
endif
@@ -55,6 +65,8 @@ ifdef CONFIG_MAGIC_SYSRQ
L_OBJS += sysrq.o
endif
endif
+endif
+endif
ifeq ($(CONFIG_ATARI_DSP56K),y)
L_OBJS += dsp56k.o
@@ -444,6 +456,10 @@ else
endif
endif
+ifeq ($(CONFIG_DZ),y)
+ L_OBJS += dz.o
+endif
+
include $(TOPDIR)/Rules.make
fastdep:
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 572e4ec27..22fe2bae3 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -875,6 +875,22 @@ else
endif
endif
+ifeq ($(CONFIG_BAGETLANCE),y)
+L_OBJS += bagetlance.o
+else
+ ifeq ($(CONFIG_BAGETLANCE),m)
+ M_OBJS += bagetlance.o
+ endif
+endif
+
+ifeq ($(CONFIG_DECLANCE),y)
+L_OBJS += declance.o
+else
+ ifeq ($(CONFIG_DECLANCE),m)
+ M_OBJS += declance.o
+ endif
+endif
+
ifeq ($(CONFIG_ATARILANCE),y)
L_OBJS += atarilance.o
else
diff --git a/drivers/net/Space.c b/drivers/net/Space.c
index eece1bfe3..8c3f51ee7 100644
--- a/drivers/net/Space.c
+++ b/drivers/net/Space.c
@@ -109,6 +109,8 @@ extern int am79c961_probe(struct device *dev);
extern int epic100_probe(struct device *dev);
extern int rtl8139_probe(struct device *dev);
extern int hplance_probe(struct device *dev);
+extern int bagetlance_probe(struct device *);
+extern int dec_lance_probe(struct device *);
extern int via_rhine_probe(struct device *dev);
extern int tc515_probe(struct device *dev);
extern int lance_probe(struct device *dev);
@@ -438,6 +440,15 @@ struct devprobe mips_probes[] __initdata = {
#ifdef CONFIG_MIPS_JAZZ_SONIC
{sonic_probe, 0},
#endif
+#ifdef CONFIG_DECLANCE /* DECstation on-board controller */
+ {dec_lance_probe, 0}, /* and maybe TURBOchannel option boards */
+#endif
+#ifdef CONFIG_BAGETLANCE /* Lance-based Baget ethernet boards */
+ {bagetlance_probe, 0},
+#endif
+#ifdef CONFIG_BAGETBSM /* Baget backplane shared memory */
+ {bsm_probe, 0},
+#endif
{NULL, 0},
};
diff --git a/drivers/scsi/Makefile b/drivers/scsi/Makefile
index 28c11f7b6..b7d5c5814 100644
--- a/drivers/scsi/Makefile
+++ b/drivers/scsi/Makefile
@@ -588,6 +588,10 @@ ifeq ($(CONFIG_JAZZ_ESP),y)
L_OBJS += NCR53C9x.o jazz_esp.o
endif
+ifeq ($(CONFIG_SCSI_DECNCR),y)
+L_OBJS += NCR53C9x.o dec_esp.o
+endif
+
include $(TOPDIR)/Rules.make
53c8xx_d.h: 53c7,8xx.scr script_asm.pl
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 58698132b..79781bc42 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -291,10 +291,6 @@
#include "scsi_debug.h"
#endif
-#ifdef CONFIG_JAZZ_ESP
-#include "jazz_esp.h"
-#endif
-
#ifdef CONFIG_SCSI_ACORNSCSI_3
#include "../acorn/scsi/acornscsi.h"
#endif
@@ -323,6 +319,10 @@
#include "jazz_esp.h"
#endif
+#ifdef CONFIG_SCSI_DECNCR
+#include "dec_esp.h"
+#endif
+
/*
* Moved ppa driver to the end of the probe list
* since it is a removable host adapter.
@@ -576,6 +576,9 @@ static Scsi_Host_Template builtin_scsi_hosts[] =
POWERTECSCSI,
#endif
#endif
+#ifdef CONFIG_SCSI_DECNCR
+ SCSI_DEC_ESP,
+#endif
/* "Removable host adapters" below this line (Parallel Port/USB/other) */
#ifdef CONFIG_SCSI_PPA
PPA,
diff --git a/init/main.c b/init/main.c
index 640826507..2e502b1e0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -84,6 +84,10 @@ extern void binfmt_setup(void);
extern void free_initmem(void);
extern void filesystem_setup(void);
+#ifdef CONFIG_TC
+extern void tc_init(void);
+#endif
+
#ifdef CONFIG_ARCH_ACORN
extern void ecard_init(void);
#endif
@@ -1282,6 +1286,9 @@ static void __init do_basic_setup(void)
#ifdef CONFIG_DIO
dio_init();
#endif
+#ifdef CONFIG_TC
+ tc_init();
+#endif
/* Networking initialization needs a process context */
sock_init();
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 15:38:02 +0000