X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/blobdiff_plain/434886441bf5aa327a6e7fa93ea2e1fc18c2de3c..6080181b861dd0889598b54:/sys/boot/pc32/boot2/boot1.S

diff --git a/sys/boot/pc32/boot2/boot1.S b/sys/boot/pc32/boot2/boot1.S
index 35680684c3..f7194f752d 100644
--- a/sys/boot/pc32/boot2/boot1.S
+++ b/sys/boot/pc32/boot2/boot1.S
@@ -45,7 +45,7 @@
  * purpose.
  *
  * $FreeBSD: src/sys/boot/i386/boot2/boot1.s,v 1.23 2003/08/22 01:59:28 imp Exp $
- * $DragonFly: src/sys/boot/pc32/boot2/boot1.S,v 1.9 2004/09/30 18:31:58 dillon Exp $
+ * $DragonFly: src/sys/boot/pc32/boot2/boot1.S,v 1.10 2008/09/13 11:45:45 corecode Exp $
  */
 
 #include "../bootasm.h"
@@ -61,7 +61,9 @@
 // Misc. Constants
 		.set SIZ_PAG,0x1000		// Page size
 		.set SIZ_SEC,0x200		// Sector size
+#ifndef NSECT
 		.set NSECT,0x10
+#endif
 
 		.globl start
 		.globl xread
@@ -215,6 +217,10 @@ main.4: 	xor %dx,%dx			// Partition:drive
 //
 main.5: 	pushw %dx			// Save args
 		movb $NSECT,%dh			// Sector count
+#ifdef DISKLABEL64
+						// In disklabel64 boot2 starts
+		addl $7,0x8(%si)		// offset 0x1000.
+#endif
 		callw nread			// Read disk
 		mov $MEM_BTX_ORG,%bx		// Base of BTX header
 		mov 0xa(%bx),%si		// Get BTX text length (btx.S)