[src/trunk]: src/sys/arch/luna68k/stand/boot Specify text address via Makefil...

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

details:   https://anonhg.NetBSD.org/src/rev/190667fd80ca
branches:  trunk
changeset: 784152:190667fd80ca
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Jan 20 02:35:13 2013 +0000

description:
Specify text address via Makefile rather than hardcoding in boot.ldscript.

diffstat:

 sys/arch/luna68k/stand/boot/Makefile      |  5 +++--
 sys/arch/luna68k/stand/boot/boot.ldscript |  4 +---
 sys/arch/luna68k/stand/boot/locore.S      |  1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diffs (48 lines):

diff -r 78d84647e9a7 -r 190667fd80ca sys/arch/luna68k/stand/boot/Makefile
--- a/sys/arch/luna68k/stand/boot/Makefile      Sat Jan 19 21:57:55 2013 +0000
+++ b/sys/arch/luna68k/stand/boot/Makefile      Sun Jan 20 02:35:13 2013 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2013/01/16 15:15:01 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.7 2013/01/20 02:35:13 tsutsui Exp $
 #      @(#)Makefile    8.2 (Berkeley) 8/15/93
 
 NOMAN= # defined
@@ -27,8 +27,9 @@
 CFLAGS+=       -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith
 CFLAGS+=       -Wno-pointer-sign
 
+TEXTADDR=      700000
 LDSCRIPT=      ${.CURDIR}/boot.ldscript
-LINKFORMAT=    -static -N -T ${LDSCRIPT}
+LINKFORMAT=    -static -N -Ttext ${TEXTADDR} -T ${LDSCRIPT}
 
 SRCS=  locore.S
 SRCS+= init_main.c autoconf.c ioconf.c
diff -r 78d84647e9a7 -r 190667fd80ca sys/arch/luna68k/stand/boot/boot.ldscript
--- a/sys/arch/luna68k/stand/boot/boot.ldscript Sat Jan 19 21:57:55 2013 +0000
+++ b/sys/arch/luna68k/stand/boot/boot.ldscript Sun Jan 20 02:35:13 2013 +0000
@@ -1,12 +1,10 @@
-/*     $NetBSD: boot.ldscript,v 1.3 2013/01/10 15:51:32 tsutsui Exp $  */
+/*     $NetBSD: boot.ldscript,v 1.4 2013/01/20 02:35:13 tsutsui Exp $  */
 
 OUTPUT_FORMAT("elf32-m68k")
 OUTPUT_ARCH(m68k)
 ENTRY(start)
 SECTIONS
 {
-  . = 0x00700000;
-
   /* Read-only sections, merged into text segment: */
   .text :
   {
diff -r 78d84647e9a7 -r 190667fd80ca sys/arch/luna68k/stand/boot/locore.S
--- a/sys/arch/luna68k/stand/boot/locore.S      Sat Jan 19 21:57:55 2013 +0000
+++ b/sys/arch/luna68k/stand/boot/locore.S      Sun Jan 20 02:35:13 2013 +0000
@@ -193,7 +193,6 @@
        BADTRAP16               /* 64-255: user interrupt vectors */
 
 
-       START = 0x700000
        STACK = 0x800000
        DIPSW = 0x49000000