Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up ${LINKSCRIPT} and ${KERNLDSCRIPT}.

Browse Source
This commit is contained in:
uebayasi 2015-08-20 06:21:02 +00:00
parent 68fe3f8564
commit 524c1ab042
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/arch/epoc32/conf/Makefile.epoc32.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.epoc32.inc,v 1.2 2014/11/15 14:25:22 uebayasi Exp $
# $NetBSD: Makefile.epoc32.inc,v 1.3 2015/08/20 06:21:02 uebayasi Exp $
MACHINE_ARCH= arm
CPPFLAGS+= -D${MACHINE}
@ -8,14 +8,16 @@ SYSTEM_FIRST_SFILE= ${THISARM}/epoc32/epoc32_start.S
KERNEL_BASE_VIRT= $(LOADADDRESS)
LINKSCRIPT= -T ldscript
KERNLDSCRIPT= ldscript
LINKSCRIPT= -T ${KERNLDSCRIPT}
EXTRA_CLEAN+= netbsd.map assym.d ldscript tmp
netbsd: ldscript # XXX
EXTRA_CLEAN+= netbsd.map assym.d ${KERNLDSCRIPT} tmp
# generate ldscript from common template
ldscript: ${THISARM}/conf/ldscript.epoc32 ${THISARM}/conf/Makefile.epoc32.inc Makefile
${KERNLDSCRIPT}: \
${THISARM}/conf/ldscript.epoc32 \
${THISARM}/conf/Makefile.epoc32.inc \
Makefile
${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \
${THISARM}/conf/ldscript.epoc32 > tmp && mv tmp $@

14
sys/arch/evbarm/conf/Makefile.evbarm.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.evbarm.inc,v 1.31 2014/11/15 14:55:02 uebayasi Exp $
# $NetBSD: Makefile.evbarm.inc,v 1.32 2015/08/20 06:21:26 uebayasi Exp $
#
# If this is a install kernel and the ramdisk image exists in the object
@ -28,15 +28,21 @@ CPPFLAGS+=-DKERNEL_BASE_VOFFSET="(${KERNEL_BASE_VIRT}-${KERNEL_BASE_PHYS})"
. endif
.endif
EXTRA_CLEAN+= ldscript tmp ${KERNELS:=.map}
EXTRA_CLEAN+= ${KERNELS:=.map}
.if defined(KERNEL_BASE_PHYS)
LINKTEXT=
KERNLDSCRIPT= ldscript
LINKSCRIPT= -T ldscript
LINKSCRIPT= -T ${KERNLDSCRIPT}
EXTRA_CLEAN+= ${KERNLDSCRIPT} tmp
# generate ldscript from common template
ldscript: ${THISARM}/conf/ldscript.evbarm ${THISARM}/conf/Makefile.evbarm.inc Makefile ${BOARDMKFRAG}
${KERNLDSCRIPT}: \
${THISARM}/conf/ldscript.evbarm \
${THISARM}/conf/Makefile.evbarm.inc \
Makefile \
${BOARDMKFRAG}
echo ${KERNELS}
${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \