Module Name: src
Committed By: tsutsui
Date: Sun Jan 20 02:35:14 UTC 2013
Modified Files:
src/sys/arch/luna68k/stand/boot: Makefile boot.ldscript locore.S
Log Message:
Specify text address via Makefile rather than hardcoding in boot.ldscript.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/luna68k/stand/boot/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/boot.ldscript
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/locore.S
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/luna68k/stand/boot/Makefile
diff -u src/sys/arch/luna68k/stand/boot/Makefile:1.6 src/sys/arch/luna68k/stand/boot/Makefile:1.7
--- src/sys/arch/luna68k/stand/boot/Makefile:1.6 Wed Jan 16 15:15:01 2013
+++ src/sys/arch/luna68k/stand/boot/Makefile Sun Jan 20 02:35:13 2013
@@ -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+= -Wall -Werror
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
Index: src/sys/arch/luna68k/stand/boot/boot.ldscript
diff -u src/sys/arch/luna68k/stand/boot/boot.ldscript:1.3 src/sys/arch/luna68k/stand/boot/boot.ldscript:1.4
--- src/sys/arch/luna68k/stand/boot/boot.ldscript:1.3 Thu Jan 10 15:51:32 2013
+++ src/sys/arch/luna68k/stand/boot/boot.ldscript Sun Jan 20 02:35:13 2013
@@ -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 :
{
Index: src/sys/arch/luna68k/stand/boot/locore.S
diff -u src/sys/arch/luna68k/stand/boot/locore.S:1.4 src/sys/arch/luna68k/stand/boot/locore.S:1.5
--- src/sys/arch/luna68k/stand/boot/locore.S:1.4 Sun Jan 13 14:10:55 2013
+++ src/sys/arch/luna68k/stand/boot/locore.S Sun Jan 20 02:35:13 2013
@@ -193,7 +193,6 @@ ASGLOBAL(Reset)
BADTRAP16 /* 64-255: user interrupt vectors */
- START = 0x700000
STACK = 0x800000
DIPSW = 0x49000000
