X-Authentication-Warning: cassiopeia.home: geert owned process doing -bs
Date: Sun, 27 Apr 1997 00:43:17 +0200 (MET DST)
From: Geert Uytterhoeven <Geert.Uytterhoeven@cs.kuleuven.ac.be>
To: Linux/m68k <linux-m68k@phil.uni-sb.de>
Subject: L68K: ataboot and FPUless machines with 2.1.35
Sender: owner-linux-m68k@phil.uni-sb.de
Reply-To: linux-m68k@phil.uni-sb.de


This one is missing in 2.1.35...

--- linux-m68k-2.1.35/arch/m68k/boot/atari/bootstrap.c.orig	Sat Apr 26 16:46:38 1997
+++ linux-m68k-2.1.35/arch/m68k/boot/atari/bootstrap.c	Sat Apr 26 20:48:42 1997
@@ -8,6 +8,8 @@
 ** for more details.
 **
 ** History:
+**	27 Mar 1997 FPU-less machines couldn't boot kernels that use bootinfo
+**		    interface version 1.0 (Geert)
 **	01 Feb 1997 Implemented kernel decompression (Roman)
 **	28 Nov 1996 Fixed and tested previous change (James)
 **	27 Nov 1996 Compatibility with bootinfo interface version 1.0 (Geert)
@@ -416,7 +418,7 @@
     kernel_name = "vmlinux";
 
     /* print the startup message */
-    puts("\fLinux/68k Atari Bootstrap version 2.2"
+    puts("\fLinux/68k Atari Bootstrap version 2.3"
 #ifdef USE_BOOTP
 	 " (with BOOTP)"
 #endif
@@ -1299,7 +1301,7 @@
 	compat_bootinfo.cputype |= COMPAT_FPU_68040;
     else if (bi.fputype & FPU_68060)
 	compat_bootinfo.cputype |= COMPAT_FPU_68060;
-    else {
+    else if (bi.fputype) {
 	printf("FPU type 0x%08lx not supported by kernel\n", bi.fputype);
 	return(0);
     }

Greetings,

						Geert

--
Geert Uytterhoeven                     Geert.Uytterhoeven@cs.kuleuven.ac.be
Wavelets, Linux/m68k on Amiga          http://www.cs.kuleuven.ac.be/~geert/
Department of Computer Science -- Katholieke Universiteit Leuven -- Belgium