Module Name: src
Committed By: dsl
Date: Fri Nov 20 17:28:19 UTC 2009
Modified Files:
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
src/sys/arch/i386/stand/mbr: Makefile.mbr
Log Message:
Change relay address for mbr and bootxx code to be 0x8800.
I'm not sure why I used 0x600, but I have a feeling that might
sometimes corrupt bios data.
0x8800 is far enough above 0x7e00 for a sector read to the latter address.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/stand/mbr/Makefile.mbr
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/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.41 src/sys/arch/i386/stand/boot/Makefile.boot:1.42
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.41 Wed Nov 18 20:33:39 2009
+++ src/sys/arch/i386/stand/boot/Makefile.boot Fri Nov 20 17:28:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.41 2009/11/18 20:33:39 dsl Exp $
+# $NetBSD: Makefile.boot,v 1.42 2009/11/20 17:28:19 dsl Exp $
S= ${.CURDIR}/../../../../..
@@ -36,7 +36,7 @@
CPPFLAGS+= -I ${.CURDIR}/.. -I ${.CURDIR}/../../lib -I ${S}/lib/libsa
CPPFLAGS+= -I ${.OBJDIR}
#CPPFLAGS+= -DDEBUG_MEMSIZE
-
+#CPPFLAGS+= -DBOOT_MSG_COM0
# Make sure we override any optimization options specified by the user
COPTS= -Os
Index: src/sys/arch/i386/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.36 src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.37
--- src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.36 Fri Apr 3 10:38:12 2009
+++ src/sys/arch/i386/stand/bootxx/Makefile.bootxx Fri Nov 20 17:28:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.36 2009/04/03 10:38:12 tsutsui Exp $
+# $NetBSD: Makefile.bootxx,v 1.37 2009/11/20 17:28:19 dsl Exp $
S= ${.CURDIR}/../../../../..
@@ -10,7 +10,7 @@
BINDIR= /usr/mdec
BINMODE= 0444
-PRIMARY_LOAD_ADDRESS=0x600
+PRIMARY_LOAD_ADDRESS=0x8800
SECONDARY_LOAD_ADDRESS=0x10000
# We ought (need?) to fit into track 0 of a 1.2M floppy.
@@ -46,6 +46,7 @@
CPPFLAGS+= -DXXfs_read=${FS}_read
CPPFLAGS+= -DXXfs_stat=${FS}_stat
CPPFLAGS+= -DFS=${FS}
+# CPPFLAGS+= -DBOOT_MSG_COM0
# Make sure we override any optimization options specified by the user
COPTS= -Os -momit-leaf-frame-pointer
Index: src/sys/arch/i386/stand/mbr/Makefile.mbr
diff -u src/sys/arch/i386/stand/mbr/Makefile.mbr:1.16 src/sys/arch/i386/stand/mbr/Makefile.mbr:1.17
--- src/sys/arch/i386/stand/mbr/Makefile.mbr:1.16 Mon Mar 30 09:22:52 2009
+++ src/sys/arch/i386/stand/mbr/Makefile.mbr Fri Nov 20 17:28:19 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mbr,v 1.16 2009/03/30 09:22:52 tsutsui Exp $
+# $NetBSD: Makefile.mbr,v 1.17 2009/11/20 17:28:19 dsl Exp $
S= ${.CURDIR}/../../../../..
@@ -39,9 +39,11 @@
CLEANFILES+= ${PROG}.tmp
+LOADADDR= 0x8800
+
${PROG}: ${OBJS}
${_MKTARGET_LINK}
- ${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,0x600 ${OBJS}
+ ${CC} -o ${PROG}.tmp ${LDFLAGS} -Wl,-Ttext,${LOADADDR} ${OBJS}
@ set -- $$( ${NM} -t d ${PROG}.tmp | grep '\<mbr_space\>' \
| ${TOOL_SED} 's/^0*//' ); \
echo "#### There are $$1 free bytes in ${PROG}"
