Index: boot2/Makefile
===================================================================
RCS file: /usr/cvs/src/sys/boot/i386/boot2/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- boot2/Makefile	8 Oct 2002 12:09:16 -0000	1.38
+++ boot2/Makefile	8 Oct 2002 15:59:51 -0000
@@ -26,7 +26,7 @@
 
 REL1=	0x700
 ORG1=	0x7c00
-ORG2=	0x1000
+ORG2=	0x2000
 
 # Setting this to anything else gives UFS1+2 support and larger
 # boot2 binary.
Index: boot2/boot1.s
===================================================================
RCS file: /usr/cvs/src/sys/boot/i386/boot2/boot1.s,v
retrieving revision 1.20
diff -u -r1.20 boot1.s
--- boot2/boot1.s	7 Oct 2002 21:36:06 -0000	1.20
+++ boot2/boot1.s	8 Oct 2002 16:01:33 -0000
@@ -22,7 +22,7 @@
 		.set MEM_BUF,0x8c00		// Load area
 		.set MEM_BTX,0x9000		// BTX start
 		.set MEM_JMP,0x9010		// BTX entry point
-		.set MEM_USR,0xb000		// Client start
+		.set MEM_USR,0xa000		// Client start
 		.set BDA_BOOT,0x472		// Boot howto flag
 	
 // Partition Constants 
@@ -181,9 +181,9 @@
 // The second part is BTX, which is thus loaded into 0x9000, which is where
 // it also runs from.  The boot2.bin binary starts right after the end of
 // BTX, so we have to figure out where the start of it is and then move the
-// binary to 0xb000.  Normally, BTX clients start at MEM_USR, or 0xa000, but
-// when we use btxld to create boot2, we use an entry point of 0x1000.  That
-// entry point is relative to MEM_USR; thus boot2.bin starts at 0xb000.
+// binary to 0xc000.  Normally, BTX clients start at MEM_USR, or 0xa000, but
+// when we use btxld to create boot2, we use an entry point of 0x2000.  That
+// entry point is relative to MEM_USR; thus boot2.bin starts at 0xc000.
 // 
 main.5: 	mov %dx,MEM_ARG			// Save args
 		movb $NSECT,%dh			// Sector count
@@ -191,8 +191,8 @@
 		mov $MEM_BTX,%bx		// BTX
 		mov 0xa(%bx),%si		// Get BTX length and set
 		add %bx,%si			//  %si to start of boot2.bin
-		mov $MEM_USR+SIZ_PAG,%di	// Client page 1
-		mov $MEM_BTX+(NSECT-2)*SIZ_SEC,%cx	// Byte
+		mov $MEM_USR+SIZ_PAG*2,%di	// Client page 2
+		mov $MEM_BTX+(NSECT-2)*SIZ_SEC,%cx // Byte
 		sub %si,%cx			//  count
 		rep				// Relocate
 		movsb				//  client
Index: btx/btx/btx.s
===================================================================
RCS file: /usr/cvs/src/sys/boot/i386/btx/btx/btx.s,v
retrieving revision 1.31
diff -u -r1.31 btx.s
--- btx/btx/btx.s	7 Oct 2002 12:15:11 -0000	1.31
+++ btx/btx/btx.s	8 Oct 2002 15:06:01 -0000
@@ -28,7 +28,7 @@
 		.set MEM_DIR,0x4000		# Page directory
 		.set MEM_TBL,0x5000		# Page tables
 		.set MEM_ORG,0x9000		# BTX code
-		.set MEM_USR,0xb000		# Start of user memory
+		.set MEM_USR,0xa000		# Start of user memory
 #
 # Paging control.
 #
Index: btx/btxldr/btxldr.s
===================================================================
RCS file: /usr/cvs/src/sys/boot/i386/btx/btxldr/btxldr.s,v
retrieving revision 1.11
diff -u -r1.11 btxldr.s
--- btx/btxldr/btxldr.s	7 Oct 2002 19:12:36 -0000	1.11
+++ btx/btxldr/btxldr.s	8 Oct 2002 15:06:15 -0000
@@ -166,7 +166,7 @@
 		call hexout			#  relocation
 		call putstr			#  message
 ')
-		addl $PAG_SIZ * 2,%ebp		# Display
+		addl $PAG_SIZ,%ebp		# Display
 ifdef(`BTXLDR_VERBOSE',`
 		movl $m_base,%esi		#  the
 		movl %ebp,%eax			#  user