[src/trunk]: src/sys/arch/evbarm/conf Change to use TOOL_MKUBOOTIMAGE

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch/evbarm/conf Change to use TOOL_MKUBOOTIMAGE
From: matt <matt%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 19:56:07 +0000
details:   https://anonhg.NetBSD.org/src/rev/18c72f1daac7
branches:  trunk
changeset: 761524:18c72f1daac7
user:      matt <matt%NetBSD.org@localhost>
date:      Mon Jan 31 06:09:32 2011 +0000

description:
Change to use TOOL_MKUBOOTIMAGE
Make sure we cleanup everything.
gemini now has its own genassym.cf

diffstat:

 sys/arch/evbarm/conf/Makefile.evbarm.inc |   5 +++--
 sys/arch/evbarm/conf/mk.beagle           |  11 +++--------
 sys/arch/evbarm/conf/mk.gemini           |   4 +++-
 sys/arch/evbarm/conf/mk.gumstix          |  24 ++++++++++++------------
 sys/arch/evbarm/conf/mk.marvell          |  24 ++++++++++++------------
 5 files changed, 33 insertions(+), 35 deletions(-)

diffs (170 lines):

diff -r c9418b9ee4fa -r 18c72f1daac7 sys/arch/evbarm/conf/Makefile.evbarm.inc
--- a/sys/arch/evbarm/conf/Makefile.evbarm.inc  Mon Jan 31 06:05:54 2011 +0000
+++ b/sys/arch/evbarm/conf/Makefile.evbarm.inc  Mon Jan 31 06:09:32 2011 +0000
@@ -1,15 +1,16 @@
-#      $NetBSD: Makefile.evbarm.inc,v 1.19 2008/10/25 22:27:37 apb Exp $
+#      $NetBSD: Makefile.evbarm.inc,v 1.20 2011/01/31 06:09:32 matt Exp $
 
 .if defined(BOARDMKFRAG)       # Must be a full pathname.
 .include "${BOARDMKFRAG}"
 .endif
 
+EXTRA_CLEAN+= ldscript tmp ${KERNELS:=.map}
+
 .if defined(KERNEL_BASE_PHYS)
 
 LINKFLAGS=     -T ldscript
 
 netbsd: ldscript             # XXX
-EXTRA_CLEAN+= ldscript tmp
 
 # generate ldscript from common template 
 ldscript: ${THISARM}/conf/ldscript.evbarm ${THISARM}/conf/Makefile.evbarm.inc Makefile ${BOARDMKFRAG}
diff -r c9418b9ee4fa -r 18c72f1daac7 sys/arch/evbarm/conf/mk.beagle
--- a/sys/arch/evbarm/conf/mk.beagle    Mon Jan 31 06:05:54 2011 +0000
+++ b/sys/arch/evbarm/conf/mk.beagle    Mon Jan 31 06:09:32 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mk.beagle,v 1.3 2010/06/18 19:19:05 jmcneill Exp $
+#      $NetBSD: mk.beagle,v 1.4 2011/01/31 06:09:32 matt Exp $
 # gcc doesn't know about cortex-a8
 CPPFLAGS+= -mcpu=arm1136jf-s
 
@@ -7,11 +7,6 @@
 
 _OSRELEASE!=           ${HOST_SH} $S/conf/osrelease.sh
 
-.if ${USETOOLS} == "yes"
-MKUBOOTIMAGE=          ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
-.else
-MKUBOOTIMAGE=          mkubootimage
-.endif
 MKUBOOTIMAGEARGS=      -A arm -T kernel -C none
 MKUBOOTIMAGEARGS+=     -a $(LOADADDRESS) -e $(LOADADDRESS)
 MKUBOOTIMAGEARGS+=     -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
@@ -22,8 +17,8 @@
 SYSTEM_LD_TAIL_EXTRA+=; \
        echo ${OBJCOPY} -S -O binary $@ $@.bin; \
        ${OBJCOPY} -S -O binary $@ $@.bin; \
-       echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
-       ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS} $@.bin $@.ub; \
        echo 
 
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
diff -r c9418b9ee4fa -r 18c72f1daac7 sys/arch/evbarm/conf/mk.gemini
--- a/sys/arch/evbarm/conf/mk.gemini    Mon Jan 31 06:05:54 2011 +0000
+++ b/sys/arch/evbarm/conf/mk.gemini    Mon Jan 31 06:09:32 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mk.gemini,v 1.2 2008/10/28 17:12:05 matt Exp $
+#      $NetBSD: mk.gemini,v 1.3 2011/01/31 06:09:32 matt Exp $
 
 
 CPUFLAGS+=-march=armv4
@@ -7,6 +7,8 @@
 SYSTEM_FIRST_OBJ=      gemini_start.o
 SYSTEM_FIRST_SFILE=    ${THISARM}/gemini/gemini_start.S
 
+GENASSYM_EXTRAS+=      ${THISARM}/gemini/genassym.cf
+
 SYSTEM_LD_TAIL_EXTRA+=; \
        echo ${OBJCOPY} -S -O binary $@ $@.bin; \
        ${OBJCOPY} -S -O binary $@ $@.bin; \
diff -r c9418b9ee4fa -r 18c72f1daac7 sys/arch/evbarm/conf/mk.gumstix
--- a/sys/arch/evbarm/conf/mk.gumstix   Mon Jan 31 06:05:54 2011 +0000
+++ b/sys/arch/evbarm/conf/mk.gumstix   Mon Jan 31 06:09:32 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mk.gumstix,v 1.2 2010/07/10 08:17:48 kiyohara Exp $
+#      $NetBSD: mk.gumstix,v 1.3 2011/01/31 06:09:32 matt Exp $
 
 SYSTEM_FIRST_OBJ=      gumstix_start.o
 SYSTEM_FIRST_SFILE=    ${THISARM}/gumstix/gumstix_start.S
@@ -12,11 +12,6 @@
 .endif
 KERNEL_BASE_VIRT=$(LOADADDRESS)
 
-.if ${USETOOLS} == "yes"
-MKUBOOTIMAGE=          ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
-.else
-MKUBOOTIMAGE=          mkubootimage
-.endif
 MKUBOOTIMAGEARGS=      -A arm -T kernel
 MKUBOOTIMAGEARGS+=     -a $(KERNEL_BASE_PHYS)
 MKUBOOTIMAGEARGS+=     -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
@@ -31,20 +26,25 @@
        ${OBJCOPY} -S -O binary $@ $@.bin; \
        echo gzip -c $@.bin > $@.bin.gz; \
        gzip -c $@.bin > $@.bin.gz; \
-       echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
-       ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub
+
 .if ${BOARDTYPE} == "gumstix"
        #
        # These not have expanding buffer over 4Mbyte. (before version 1.1.5)
        # And these cannot handle the endian of entry point. (1.1.4 and older)
        #
 SYSTEM_LD_TAIL_EXTRA+=; \
-       echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
-       ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
-       echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE:C/((-a (0x)*)([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2}))/\1 -e \3\7\6\5\4/W} $@.bin $@-old.ub; \
-       ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE:C/((-a (0x)*)([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2}))/\1 -e \3\7\6\5\4/W} $@.bin $@-old.ub
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE:C/((-a (0x)*)([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2}))/\1 -e \3\7\6\5\4/W} $@.bin $@-old.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE:C/((-a (0x)*)([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2}))/\1 -e \3\7\6\5\4/W} $@.bin $@-old.ub
 .endif
 SYSTEM_LD_TAIL_EXTRA+=; \
        echo
 
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}-old.ub@}
diff -r c9418b9ee4fa -r 18c72f1daac7 sys/arch/evbarm/conf/mk.marvell
--- a/sys/arch/evbarm/conf/mk.marvell   Mon Jan 31 06:05:54 2011 +0000
+++ b/sys/arch/evbarm/conf/mk.marvell   Mon Jan 31 06:09:32 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mk.marvell,v 1.1 2010/10/02 06:15:52 kiyohara Exp $
+#      $NetBSD: mk.marvell,v 1.2 2011/01/31 06:09:32 matt Exp $
 
 SYSTEM_FIRST_OBJ=      marvell_start.o
 SYSTEM_FIRST_SFILE=    ${THISARM}/marvell/marvell_start.S
@@ -8,11 +8,6 @@
 KERNEL_BASE_PHYS=0x00008000
 KERNEL_BASE_VIRT=0xc0008000
 
-.if ${USETOOLS} == "yes"
-MKUBOOTIMAGE=          ${TOOLDIR}/bin/${_TOOL_PREFIX}mkubootimage
-.else
-MKUBOOTIMAGE=          mkubootimage
-.endif
 MKUBOOTIMAGEARGS=      -A arm -T kernel
 MKUBOOTIMAGEARGS+=     -a $(KERNEL_BASE_PHYS)
 MKUBOOTIMAGEARGS+=     -n "NetBSD/$(BOARDTYPE) ${_OSRELEASE}"
@@ -28,12 +23,17 @@
        ${OBJCOPY} -S -O binary $@ $@.bin; \
        echo gzip -c $@.bin > $@.bin.gz; \
        gzip -c $@.bin > $@.bin.gz; \
-       echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
-       ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
-       echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
-       ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
-       echo ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE:C/((-a (0x)*)([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2}))/\1 -e \3\7\6\5\4/W} $@.bin $@-old.ub; \
-       ${MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE:C/((-a (0x)*)([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2}))/\1 -e \3\7\6\5\4/W} $@.bin $@-old.ub; \
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_GZ} $@.bin.gz $@.gz.ub; \
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE} $@.bin $@.ub; \
+       echo ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE:C/((-a (0x)*)([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2}))/\1 -e \3\7\6\5\4/W} $@.bin $@-old.ub; \
+       ${TOOL_MKUBOOTIMAGE} ${MKUBOOTIMAGEARGS_NONE:C/((-a (0x)*)([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2})([0-9a-f]{2}))/\1 -e \3\7\6\5\4/W} $@.bin $@-old.ub; \
        echo
 
 EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.bin.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}.gz.ub@}
+EXTRA_KERNELS+= ${KERNELS:@.KERNEL.@${.KERNEL.}-old.ub@}
Prev by Date: [src/trunk]: src/crypto/dist/heimdal/kuser typo fix, from Ryo HAYASAKA in PR ...
Next by Date: [src/trunk]: src/sys/arch/arm/arm32 Define the L1* pte values. Now pmap.h an...
Previous by Thread: [src/trunk]: src/crypto/dist/heimdal/kuser typo fix, from Ryo HAYASAKA in PR ...
Next by Thread: [src/trunk]: src/sys/arch/arm/arm32 Define the L1* pte values. Now pmap.h an...
Indexes:
Home | Main Index | Thread Index | Old Index