Module Name: src
Committed By: matt
Date: Fri Aug 9 04:24:19 UTC 2013
Modified Files:
src/sys/arch/evbarm/conf: Makefile.evbarm.inc
Log Message:
ldscript doesn't need -Ttext
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/conf/Makefile.evbarm.inc
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/evbarm/conf/Makefile.evbarm.inc
diff -u src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.26 src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.27
--- src/sys/arch/evbarm/conf/Makefile.evbarm.inc:1.26 Sun Aug 4 00:59:46 2013
+++ src/sys/arch/evbarm/conf/Makefile.evbarm.inc Fri Aug 9 04:24:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.evbarm.inc,v 1.26 2013/08/04 00:59:46 matt Exp $
+# $NetBSD: Makefile.evbarm.inc,v 1.27 2013/08/09 04:24:19 matt Exp $
#
# If this is a install kernel and the ramdisk image exists in the object
@@ -23,6 +23,7 @@ SYSTEM_LD_TAIL_EXTRA+=; \
EXTRA_CLEAN+= ldscript tmp ${KERNELS:=.map}
.if defined(KERNEL_BASE_PHYS)
+LINKTEXT=
KERNLDSCRIPT= ldscript
EXTRA_LINKFLAGS+= -T ldscript
@@ -33,4 +34,6 @@ ldscript: ${THISARM}/conf/ldscript.evbar
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
${THISARM}/conf/ldscript.evbarm > tmp && mv tmp $@
+.else
+LINKTEXT= -Ttext ${LOADADDRESS}
.endif # KERNEL_BASE_PHYS
