Module Name: src
Committed By: jmcneill
Date: Fri Sep 16 11:28:36 UTC 2011
Modified Files:
src/sys/arch/usermode/conf: Makefile.usermode files.usermode
Log Message:
push TEXTADDR option into kernel makefile
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/usermode/conf/Makefile.usermode
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/usermode/conf/files.usermode
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/usermode/conf/Makefile.usermode
diff -u src/sys/arch/usermode/conf/Makefile.usermode:1.23 src/sys/arch/usermode/conf/Makefile.usermode:1.24
--- src/sys/arch/usermode/conf/Makefile.usermode:1.23 Fri Sep 16 11:05:42 2011
+++ src/sys/arch/usermode/conf/Makefile.usermode Fri Sep 16 11:28:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.usermode,v 1.23 2011/09/16 11:05:42 reinoud Exp $
+# $NetBSD: Makefile.usermode,v 1.24 2011/09/16 11:28:36 jmcneill Exp $
OPT_CPU_HOST= %CPU_HOST%
.if !empty(OPT_CPU_HOST)
@@ -76,8 +76,7 @@
##
## (5) link settings
##
-# XXX fixme: TEXTADDR is not imported yet??
-TEXTADDR?= 0x10000000
+TEXTADDR?= %TEXTADDR%
LINKFLAGS_NORMAL= -X
KERN_LDSCRIPT?= kern.ldscript
Index: src/sys/arch/usermode/conf/files.usermode
diff -u src/sys/arch/usermode/conf/files.usermode:1.10 src/sys/arch/usermode/conf/files.usermode:1.11
--- src/sys/arch/usermode/conf/files.usermode:1.10 Sun Sep 4 21:08:18 2011
+++ src/sys/arch/usermode/conf/files.usermode Fri Sep 16 11:28:36 2011
@@ -1,4 +1,4 @@
-# $NetBSD: files.usermode,v 1.10 2011/09/04 21:08:18 jmcneill Exp $
+# $NetBSD: files.usermode,v 1.11 2011/09/16 11:28:36 jmcneill Exp $
maxpartitions 8
maxusers 8 16 64
@@ -7,6 +7,7 @@
defflag opt_sdl.h SDL
defflag opt_cpu.h CPU_DEBUG
defparam opt_cpu.h CPU_HOST
+defparam opt_misc.h TEXTADDR
defflag opt_urkelvisor.h URKELVISOR
define thunkbus { }
