[src/trunk]: src/distrib/evbarm/gzboot Don't build gzboot's separately. Inst...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2d53f586443e
branches:  trunk
changeset: 546475:2d53f586443e
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Apr 29 18:18:53 2003 +0000

description:
Don't build gzboot's separately.  Instead, use the concatenate'able
gzboot images that are installed in ${DESTDIR}/usr/mdec.  Simplifies
building of these images considerably.

Fixes PR port-arm32/21352.

diffstat:

 distrib/evbarm/gzboot/Makefile                                      |  14 +----
 distrib/evbarm/gzboot/gzboot_ADI_BRH_flash_0x00140000/Makefile      |  26 ----------
 distrib/evbarm/gzboot/gzboot_IQ80310_flash_0x00080000/Makefile      |  24 ---------
 distrib/evbarm/gzboot/gzboot_IQ80321_flash_0xf0080000/Makefile      |  24 ---------
 distrib/evbarm/gzboot/gzboot_TEAMASA_NPWR_flash_0x00080000/Makefile |  24 ---------
 distrib/evbarm/gzboot/gzimg/Makefile                                |  11 +--
 6 files changed, 6 insertions(+), 117 deletions(-)

diffs (172 lines):

diff -r 282b7d42326c -r 2d53f586443e distrib/evbarm/gzboot/Makefile
--- a/distrib/evbarm/gzboot/Makefile    Tue Apr 29 17:55:00 2003 +0000
+++ b/distrib/evbarm/gzboot/Makefile    Tue Apr 29 18:18:53 2003 +0000
@@ -1,16 +1,6 @@
-#      $NetBSD: Makefile,v 1.5 2003/04/10 01:50:28 thorpej Exp $
+#      $NetBSD: Makefile,v 1.6 2003/04/29 18:18:53 thorpej Exp $
 
-SUBDIR=
+SUBDIR= gzimg
 TARGETS+= release
 
-.ifmake !release
-# List the Gzip Boot ELF images you want to create here.
-SUBDIR+= gzboot_ADI_BRH_flash_0x00140000
-SUBDIR+= gzboot_IQ80310_flash_0x00080000
-SUBDIR+= gzboot_IQ80321_flash_0xf0080000
-SUBDIR+= gzboot_TEAMASA_NPWR_flash_0x00080000
-.endif
-
-SUBDIR+= .WAIT gzimg
-
 .include <bsd.subdir.mk>
diff -r 282b7d42326c -r 2d53f586443e distrib/evbarm/gzboot/gzboot_ADI_BRH_flash_0x00140000/Makefile
--- a/distrib/evbarm/gzboot/gzboot_ADI_BRH_flash_0x00140000/Makefile    Tue Apr 29 17:55:00 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-#      $NetBSD: Makefile,v 1.2 2003/04/08 21:41:18 thorpej Exp $
-
-NOMAN= # defined
-
-.include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-
-.include <bsd.kernobj.mk>
-
-S=     ${KERNSRCDIR}
-
-PLATFORM= ADI_BRH
-RELOC= 0x00140000
-MAXIMAGESIZE= 1572864  # 1.5M
-LOADADDR= 0xc0200000
-
-CPPFLAGS+= -DBECC_SUPPORT_V7
-CPPFLAGS+= -DCONSPEED=57600
-CPPFLAGS+= -DCONADDR=0x03000000UL
-CPPFLAGS+= -DNS16550_FREQ=33300000
-
-LDSCRIPT= ${S}/arch/evbarm/stand/gzboot/ADI_BRH_flash_0x00140000/ldscript
-
-SRCS+= adi_brh.c ns16550.c becc_mem.c
-
-.include "${S}/arch/evbarm/stand/gzboot/Makefile.gzboot"
diff -r 282b7d42326c -r 2d53f586443e distrib/evbarm/gzboot/gzboot_IQ80310_flash_0x00080000/Makefile
--- a/distrib/evbarm/gzboot/gzboot_IQ80310_flash_0x00080000/Makefile    Tue Apr 29 17:55:00 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#      $NetBSD: Makefile,v 1.7 2003/04/08 21:41:19 thorpej Exp $
-
-NOMAN= # defined
-
-.include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-
-.include <bsd.kernobj.mk>
-
-S=     ${KERNSRCDIR}
-
-PLATFORM= IQ80310
-RELOC= 0x00080000
-MAXIMAGESIZE= 1572864  # 1.5M
-LOADADDR= 0xa0200000
-
-CPPFLAGS+= -DCONSPEED=115200
-CPPFLAGS+= -DCONADDR=0xfe810000UL
-
-LDSCRIPT= ${S}/arch/evbarm/stand/gzboot/IQ80310_flash_0x80000/ldscript
-
-SRCS+= iq80310.c ns16550.c i80312_mem.c
-
-.include "${S}/arch/evbarm/stand/gzboot/Makefile.gzboot"
diff -r 282b7d42326c -r 2d53f586443e distrib/evbarm/gzboot/gzboot_IQ80321_flash_0xf0080000/Makefile
--- a/distrib/evbarm/gzboot/gzboot_IQ80321_flash_0xf0080000/Makefile    Tue Apr 29 17:55:00 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#      $NetBSD: Makefile,v 1.7 2003/04/08 21:41:19 thorpej Exp $
-
-NOMAN= # defined
-
-.include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-
-.include <bsd.kernobj.mk>
-
-S=     ${KERNSRCDIR}
-
-PLATFORM= IQ80321
-RELOC= 0xf0080000
-MAXIMAGESIZE= 1572864  # 1.5M
-LOADADDR= 0xa0200000
-
-CPPFLAGS+= -DCONSPEED=115200
-CPPFLAGS+= -DCONADDR=0xfe800000UL
-
-LDSCRIPT= ${S}/arch/evbarm/stand/gzboot/IQ80321_flash_0xf0080000/ldscript
-
-SRCS+= iq80321.c ns16550.c i80321_mem.c
-
-.include "${S}/arch/evbarm/stand/gzboot/Makefile.gzboot"
diff -r 282b7d42326c -r 2d53f586443e distrib/evbarm/gzboot/gzboot_TEAMASA_NPWR_flash_0x00080000/Makefile
--- a/distrib/evbarm/gzboot/gzboot_TEAMASA_NPWR_flash_0x00080000/Makefile       Tue Apr 29 17:55:00 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-#      $NetBSD: Makefile,v 1.3 2002/05/02 18:02:32 lukem Exp $
-
-NOMAN= # defined
-
-.include <bsd.own.mk>
-.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-
-.include <bsd.kernobj.mk>
-
-S=     ${KERNSRCDIR}
-
-PLATFORM= TEAMASA_NPWR
-RELOC= 0x00080000
-MAXIMAGESIZE= 1048576  # 1M
-LOADADDR= 0xa0200000
-
-CPPFLAGS+= -DCONSPEED=115200
-CPPFLAGS+= -DCONADDR=0xfe810000UL
-
-LDSCRIPT= ${S}/arch/evbarm/stand/gzboot/IQ80310_flash_0x80000/ldscript
-
-SRCS+= iq80310.c ns16550.c i80312_mem.c
-
-.include "${S}/arch/evbarm/stand/gzboot/Makefile.gzboot"
diff -r 282b7d42326c -r 2d53f586443e distrib/evbarm/gzboot/gzimg/Makefile
--- a/distrib/evbarm/gzboot/gzimg/Makefile      Tue Apr 29 17:55:00 2003 +0000
+++ b/distrib/evbarm/gzboot/gzimg/Makefile      Tue Apr 29 18:18:53 2003 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2003/04/10 04:35:23 thorpej Exp $
+#      $NetBSD: Makefile,v 1.13 2003/04/29 18:18:55 thorpej Exp $
 
 .include <bsd.own.mk>
 .include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -28,13 +28,12 @@
                IQ80321         IQ80321         IQ80321_wd0     \
                0xf0080000      netbsd-wd0                      \
                                                                \
-               TEAMASA_NPWR    TEAMASA_NPWR    TEAMASA_NPWR_sd0 \
+               TEAMASA_NPWR    IQ80310         TEAMASA_NPWR_sd0 \
                0x00080000      netbsd-sd0
 
 .for K G I R W in ${TARGETS}                           # {
 
-GZB${G}DIR!=   cd ${.CURDIR}/../gzboot_${G}_flash_${R} && ${PRINTOBJDIR}
-GZB${G}=       ${GZB${G}DIR}/gzboot_${G}_${R}.sym
+GZB${G}=       ${DESTDIR}/usr/mdec/gzboot_${G}_${R}.bin
 
 GZIMGS+=       gzimg_${I}_flash_${R}.gz
 
@@ -42,9 +41,7 @@
        @echo "Populating ${.TARGET}"
        -rm -f ${.TARGET}.kern.gz
        gzip -9c ${KERNOBJDIR}/${K}/${W}.bin > ${.TARGET}.kern.gz
-       cp ${GZB${G}} ${.TARGET}
-       ${MDSETIMAGE} -v -s ${.TARGET} ${.TARGET}.kern.gz
-       ${OBJCOPY} -O binary ${.TARGET} ${.TARGET}
+       ${CAT} ${GZB${G}} ${.TARGET}.kern.gz > ${.TARGET}
 
 gzimg_${I}_flash_${R}.gz: .NOTMAIN gzimg_${I}_flash_${R}
        -rm -f ${.TARGET}