[LV-kern-commit] CVS: kernel-2.4/Documentation/i386 boot.txt,1.1.1.1,1.2

[Andy P. <at...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/Documentation/i386
In directory usw-pr-cvs1:/tmp/cvs-serv7449/i386

Modified Files:
	boot.txt 
Log Message:
synch 2.4.15 commit 28


Index: boot.txt
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/Documentation/i386/boot.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- boot.txt	14 Jan 2001 20:05:28 -0000	1.1.1.1
+++ boot.txt	9 Apr 2002 16:55:41 -0000	1.2
@@ -2,7 +2,7 @@
 		     ----------------------------
 
 		    H. Peter Anvin <hp...@zy...>
-			Last update 2000-07-27
+			Last update 2000-10-29
 
 On the i386 platform, the Linux kernel uses a rather complicated boot
 convention.  This has evolved partially due to historical aspects, as
@@ -145,10 +145,20 @@
 most of the fields in the header.  The following fields should be
 filled out, however:
 
+  vid_mode:
+	Please see the section on SPECIAL COMMAND LINE OPTIONS.
+
   type_of_loader:
-	If your boot loader has an identifier assigned in
-	arch/i386/boot/setup.S, enter that value.  Otherwise, enter
-	0xFF here.
+	If your boot loader has an assigned id (see table below), enter
+	0xTV here, where T is an identifier for the boot loader and V is
+	a version number.  Otherwise, enter 0xFF here.
+
+	Assigned boot loader ids:
+	0  LILO
+	1  Loadlin
+	2  bootsect-loader
+	3  SYSLINUX
+	4  EtherBoot
 
   loadflags, heap_end_ptr:
 	If the protocol version is 2.01 or higher, enter the
@@ -312,8 +322,8 @@
 
   mem=<size>
 	<size> is an integer in C notation optionally followed by K, M
-	or G (meaning << 10, << 20 or << 30).  This specifies to the
-	kernel the memory size.  This affects the possible placement
+	or G (meaning << 10, << 20 or << 30).  This specifies the end
+	of memory to the kernel. This affects the possible placement
 	of an initrd, since an initrd should be placed near end of
 	memory.  Note that this is an option to *both* the kernel and
 	the bootloader!
@@ -385,8 +395,8 @@
 appropriate time.  The use of these hooks should probably be
 considered an absolutely last resort!
 
-IMPORTANT: All the hooks are required to preserve %ebp, %esi and %edi
-across invocation.
+IMPORTANT: All the hooks are required to preserve %esp, %ebp, %esi and
+%edi across invocation.
 
   realmode_swtch:
 	A 16-bit real mode far subroutine invoked immediately before