From 1c5b9b33c7a317d6674a777da04846362c9fbf73 Mon Sep 17 00:00:00 2001
From: leo <leo@NetBSD.org>
Date: Tue, 27 May 1997 10:28:30 +0000
Subject: [PATCH] Make the bootloader 68060 aware.

---
 sys/arch/atari/stand/tostools/libtos/bsdstart.s | 6 +++---
 sys/arch/atari/stand/tostools/libtos/kparamb.h  | 5 +++--
 sys/arch/atari/stand/tostools/loadbsd/loadbsd.c | 7 +++++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/sys/arch/atari/stand/tostools/libtos/bsdstart.s b/sys/arch/atari/stand/tostools/libtos/bsdstart.s
index 21607b9940eb..31b8c67ce55b 100644
--- a/sys/arch/atari/stand/tostools/libtos/bsdstart.s
+++ b/sys/arch/atari/stand/tostools/libtos/bsdstart.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: bsdstart.s,v 1.3 1996/12/26 15:07:33 leo Exp $	*/
+/*	$NetBSD: bsdstart.s,v 1.4 1997/05/27 10:28:30 leo Exp $	*/
 
 /*
  * Copyright (c) 1995 L. Weppelman
@@ -70,10 +70,10 @@ _bsd_startup:
 	movl	a3@(28),d5		| start of fastram
 	movl	a3@(32),a1		| end of symbols
 	subl	a5,a5			| target, load to 0
-	btst	#4,d2			| Is this an 68040?
+	andb	#0x50,d2		| Is this an 68040/68060?
 	beqs	0f
 
-	| Turn off 68040 MMU
+	| Turn off 68040 type MMU
 	.word 0x4e7b,0xd003		| movec a5,tc
 	.word 0x4e7b,0xd806		| movec a5,urp
 	.word 0x4e7b,0xd807		| movec a5,srp
diff --git a/sys/arch/atari/stand/tostools/libtos/kparamb.h b/sys/arch/atari/stand/tostools/libtos/kparamb.h
index 8c7f0d514b36..7d4d3c342c22 100644
--- a/sys/arch/atari/stand/tostools/libtos/kparamb.h
+++ b/sys/arch/atari/stand/tostools/libtos/kparamb.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: kparamb.h,v 1.2 1996/01/19 13:54:12 leo Exp $	*/
+/*	$NetBSD: kparamb.h,v 1.3 1997/05/27 10:28:32 leo Exp $	*/
 
 /*
  * Copyright (c) 1995 L. Weppelman
@@ -55,13 +55,14 @@ struct kparamb {
 #define	ATARI_68020	(1<<2)		/* 68020 CPU			*/
 #define	ATARI_68030	(1<<3)		/* 68030 CPU			*/
 #define	ATARI_68040	(1<<4)		/* 68040 CPU			*/
+#define	ATARI_68060	(1<<6)		/* 68060 CPU			*/
 #define	ATARI_TT	(1L<<11)	/* This is a TT030		*/
 #define	ATARI_FALCON	(1L<<12)	/* This is a Falcon		*/
 
 #define	ATARI_CLKBROKEN	(1<<16)		/* GEMDOS has faulty year base	*/
 
 #define	ATARI_ANYCPU	(ATARI_68000|ATARI_68010|ATARI_68020|ATARI_68030 \
-			|ATARI_68040)
+			|ATARI_68040|ATARI_68060)
 
 /*
  * Definitions for boothowto
diff --git a/sys/arch/atari/stand/tostools/loadbsd/loadbsd.c b/sys/arch/atari/stand/tostools/loadbsd/loadbsd.c
index 3cbd54d81a97..8c60eb2e164e 100644
--- a/sys/arch/atari/stand/tostools/loadbsd/loadbsd.c
+++ b/sys/arch/atari/stand/tostools/loadbsd/loadbsd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: loadbsd.c,v 1.11 1996/01/09 09:55:15 leo Exp $	*/
+/*	$NetBSD: loadbsd.c,v 1.12 1997/05/27 10:28:47 leo Exp $	*/
 
 /*
  * Copyright (c) 1995 L. Weppelman
@@ -52,7 +52,7 @@ int	s_flag  = 0;		/* St-ram only			*/
 int	t_flag  = 0;		/* Just test, do not execute	*/
 int	v_flag  = 0;		/* show version			*/
 
-const char version[] = "$Revision: 1.11 $";
+const char version[] = "$Revision: 1.12 $";
 
 /*
  * Default name of kernel to boot, large enough to patch
@@ -276,6 +276,9 @@ get_sys_info()
 					case 40:
 						kparam.bootflags |= ATARI_68040;
 						break;
+					case 60:
+						kparam.bootflags |= ATARI_68060;
+						break;
 					default:
 						fatal(-1, "Unknown CPU-type");
 				}