Module Name: src
Committed By: jakllsch
Date: Sun Jan 2 02:01:58 UTC 2011
Modified Files:
src/sys/arch/i386/stand/bootxx: pbr.S
Log Message:
Correct comments referencing PRIMARY_LOAD_ADDRESS to match current reality.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/i386/stand/bootxx/pbr.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/i386/stand/bootxx/pbr.S
diff -u src/sys/arch/i386/stand/bootxx/pbr.S:1.17 src/sys/arch/i386/stand/bootxx/pbr.S:1.18
--- src/sys/arch/i386/stand/bootxx/pbr.S:1.17 Mon Nov 30 21:37:16 2009
+++ src/sys/arch/i386/stand/bootxx/pbr.S Sun Jan 2 02:01:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: pbr.S,v 1.17 2009/11/30 21:37:16 dsl Exp $ */
+/* $NetBSD: pbr.S,v 1.18 2011/01/02 02:01:58 jakllsch Exp $ */
/*-
* Copyright (c) 2003,2004 The NetBSD Foundation, Inc.
@@ -40,11 +40,11 @@
* The job of this code is to read in the phase 1 bootstrap.
*
* Makefile supplies:
- * PRIMARY_LOAD_ADDRESS: Address we load code to (0x600).
+ * PRIMARY_LOAD_ADDRESS: Address we load code to (0x1000).
* BOOTXX_SECTORS: Number of sectors we load (15).
* X86_BOOT_MAGIC_1: A random magic number.
*
- * Although this code is executing at 0x7c00, it is linked to address 0x600.
+ * Although this code is executing at 0x7c00, it is linked to address 0x1000.
* All data references MUST be fixed up using R().
*/
@@ -91,7 +91,7 @@
* (for a floppy) or the mbr boot code. Since the boot program will
* be loaded to address 1000:0, we don't need to relocate ourselves
* and can load the subsequent blocks (that load boot) to an address
- * of our choosing. 0:600 is a not unreasonable choice.
+ * of our choosing. 0:1000 is a not unreasonable choice.
*
* On entry the BIOS drive number is in %dl and %esi may contain the
* sector we were loaded from (if we were loaded by NetBSD mbr code).
