summaryrefslogtreecommitdiff
path: root/sys/arch/atari/conf
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1995-12-14 05:29:32 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1995-12-14 05:29:32 +0000
commit86b4fdd623d3c50d7bfd9427c2c9208454cd0da7 (patch)
tree5d95abcaf58d01703a30c7ab600537d3b8f67989 /sys/arch/atari/conf
parente2cd6c399798843e13e76f49dc8ee048b51f99f1 (diff)
update from netbsd (verbatim)
Diffstat (limited to 'sys/arch/atari/conf')
-rw-r--r--sys/arch/atari/conf/ATARITT2
-rw-r--r--sys/arch/atari/conf/BOOT2
-rw-r--r--sys/arch/atari/conf/FALCON2
-rw-r--r--sys/arch/atari/conf/GENERIC3
-rw-r--r--sys/arch/atari/conf/Makefile.atari2
-rw-r--r--sys/arch/atari/conf/files.atari4
6 files changed, 8 insertions, 7 deletions
diff --git a/sys/arch/atari/conf/ATARITT b/sys/arch/atari/conf/ATARITT
index 95345459d2b..ac46604ffb0 100644
--- a/sys/arch/atari/conf/ATARITT
+++ b/sys/arch/atari/conf/ATARITT
@@ -1,5 +1,5 @@
#
-# $NetBSD: ATARITT,v 1.6.2.1 1995/11/15 21:55:59 leo Exp $
+# $NetBSD: ATARITT,v 1.7 1995/11/30 00:57:44 jtc Exp $
#
# ATARI-TT
#
diff --git a/sys/arch/atari/conf/BOOT b/sys/arch/atari/conf/BOOT
index 91a9d6f7177..aad736bbbe1 100644
--- a/sys/arch/atari/conf/BOOT
+++ b/sys/arch/atari/conf/BOOT
@@ -1,5 +1,5 @@
#
-# $NetBSD: BOOT,v 1.4.2.1 1995/11/15 21:56:03 leo Exp $
+# $NetBSD: BOOT,v 1.5 1995/11/30 00:57:46 jtc Exp $
#
# BOOT
#
diff --git a/sys/arch/atari/conf/FALCON b/sys/arch/atari/conf/FALCON
index dfbe1aba1ec..b7946954a6e 100644
--- a/sys/arch/atari/conf/FALCON
+++ b/sys/arch/atari/conf/FALCON
@@ -1,5 +1,5 @@
#
-# $NetBSD: FALCON,v 1.3.2.1 1995/11/15 21:56:06 leo Exp $
+# $NetBSD: FALCON,v 1.4 1995/11/30 00:57:48 jtc Exp $
#
# ATARI-FALCON
#
diff --git a/sys/arch/atari/conf/GENERIC b/sys/arch/atari/conf/GENERIC
index ee274f8f438..fa8d92b6785 100644
--- a/sys/arch/atari/conf/GENERIC
+++ b/sys/arch/atari/conf/GENERIC
@@ -1,5 +1,5 @@
#
-# $NetBSD: GENERIC,v 1.7.2.3 1995/11/15 21:56:08 leo Exp $
+# $NetBSD: GENERIC,v 1.9 1995/11/30 21:53:07 leo Exp $
#
# Generic atari
#
@@ -90,6 +90,7 @@ options TT_SCSI # SCSI-support for TT
options FALCON_SCSI # SCSI-support for Falcon
options TT_VIDEO # Graphics support for TT
options FALCON_VIDEO # Graphics support for FALCON
+options STATCLOCK # Separate {stat,prof}clock
#
# Build one kernel that can boot from any disk.
diff --git a/sys/arch/atari/conf/Makefile.atari b/sys/arch/atari/conf/Makefile.atari
index 9d3dac3c37e..a790c68344b 100644
--- a/sys/arch/atari/conf/Makefile.atari
+++ b/sys/arch/atari/conf/Makefile.atari
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.atari,v 1.7.2.1 1995/10/22 21:12:22 leo Exp $
+# $NetBSD: Makefile.atari,v 1.8 1995/11/30 00:57:51 jtc Exp $
#
# Makefile for NetBSD Atari-TT
#
diff --git a/sys/arch/atari/conf/files.atari b/sys/arch/atari/conf/files.atari
index 42545450be3..00716d0231c 100644
--- a/sys/arch/atari/conf/files.atari
+++ b/sys/arch/atari/conf/files.atari
@@ -1,5 +1,5 @@
#
-# $NetBSD: files.atari,v 1.12 1995/08/28 19:31:16 leo Exp $
+# $NetBSD: files.atari,v 1.13 1995/12/01 19:53:07 leo Exp $
#
maxpartitions 16
@@ -109,7 +109,7 @@ file arch/m68k/m68k/copy.s
# Emulation modules
# 6888x emulator (FPU_EMULATE)
-file arch/m68k/fpe/fpu_emulate.c fpu_emulate
+include "../../m68k/fpe/files.fpe"
# Compatibility modules