[src/trunk]: src/sys/arch/i386/stand Change relay address for mbr and bootxx ...

[dsl <dsl%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a696c713bb9d
branches:  trunk
changeset: 749179:a696c713bb9d
user:      dsl <dsl%NetBSD.org@localhost>
date:      Fri Nov 20 17:28:19 2009 +0000

description:
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.

diffstat:

 sys/arch/i386/stand/boot/Makefile.boot     |  4 ++--
 sys/arch/i386/stand/bootxx/Makefile.bootxx |  5 +++--
 sys/arch/i386/stand/mbr/Makefile.mbr       |  6 ++++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diffs (66 lines):

diff -r 6e57e8474267 -r a696c713bb9d sys/arch/i386/stand/boot/Makefile.boot
--- a/sys/arch/i386/stand/boot/Makefile.boot    Fri Nov 20 15:37:44 2009 +0000
+++ b/sys/arch/i386/stand/boot/Makefile.boot    Fri Nov 20 17:28:19 2009 +0000
@@ -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
 
diff -r 6e57e8474267 -r a696c713bb9d sys/arch/i386/stand/bootxx/Makefile.bootxx
--- a/sys/arch/i386/stand/bootxx/Makefile.bootxx        Fri Nov 20 15:37:44 2009 +0000
+++ b/sys/arch/i386/stand/bootxx/Makefile.bootxx        Fri Nov 20 17:28:19 2009 +0000
@@ -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
diff -r 6e57e8474267 -r a696c713bb9d sys/arch/i386/stand/mbr/Makefile.mbr
--- a/sys/arch/i386/stand/mbr/Makefile.mbr      Fri Nov 20 15:37:44 2009 +0000
+++ b/sys/arch/i386/stand/mbr/Makefile.mbr      Fri Nov 20 17:28:19 2009 +0000
@@ -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}"