[src/trunk]: src/sys/arch/mvme68k/stand Switch mvme68k standalone problams to...

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

details:   https://anonhg.NetBSD.org/src/rev/d376deacace4
branches:  trunk
changeset: 760285:d376deacace4
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Jan 02 05:30:11 2011 +0000

description:
Switch mvme68k standalone problams to using MI libsa and libkern
for maintainablility. Also bump version for note.

Compile test only, but no functional changes.

diffstat:

 sys/arch/mvme68k/stand/Makefile.booters   |  16 +-----
 sys/arch/mvme68k/stand/bootsd/Makefile    |   4 +-
 sys/arch/mvme68k/stand/bootsd/version     |   3 +-
 sys/arch/mvme68k/stand/bootst/Makefile    |   4 +-
 sys/arch/mvme68k/stand/bootst/version     |   3 +-
 sys/arch/mvme68k/stand/bootxx/Makefile    |   4 +-
 sys/arch/mvme68k/stand/bootxx/version     |   3 +-
 sys/arch/mvme68k/stand/libsa/Makefile     |  79 ++++++++----------------------
 sys/arch/mvme68k/stand/libsa/Makefile.inc |  17 ++++++
 sys/arch/mvme68k/stand/netboot/Makefile   |   4 +-
 sys/arch/mvme68k/stand/netboot/version    |   3 +-
 sys/arch/mvme68k/stand/sboot/version      |   3 +-
 12 files changed, 60 insertions(+), 83 deletions(-)

diffs (279 lines):

diff -r dc0917878312 -r d376deacace4 sys/arch/mvme68k/stand/Makefile.booters
--- a/sys/arch/mvme68k/stand/Makefile.booters   Sun Jan 02 05:21:11 2011 +0000
+++ b/sys/arch/mvme68k/stand/Makefile.booters   Sun Jan 02 05:30:11 2011 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.booters,v 1.20 2009/12/24 16:39:39 tsutsui Exp $
+#      $NetBSD: Makefile.booters,v 1.21 2011/01/02 05:30:11 tsutsui Exp $
 
 S?=            ${.CURDIR}/../../../..
 MDEC_DIR?=     /usr/mdec
@@ -56,18 +56,8 @@
 
 LIB_SA_DIR=    ${.CURDIR}/../libsa
 LIBSA_DIR!=    cd ${LIB_SA_DIR} && ${PRINTOBJDIR}
-LIBSA=${LIBSA_DIR}/libsa.a
-
-.PHONY: ${LIBSA}
-${LIBSA}:
-       @echo making sure the libsa is up to date...
-       @cd ${LIB_SA_DIR} && ${MAKE}
-
-SRTOBJ?= ${LIBSA_DIR}/SRT0.o
-.PHONY: ${SRTOBJ}
-${SRTOBJ}:
-       @echo making sure the libsa is up to date...
-       @cd ${LIB_SA_DIR} && ${MAKE} SRT0.o
+LIBSA=         ${LIBSA_DIR}/lib/sa/libsa.a
+LIBKERN=       ${LIBSA_DIR}/lib/kern/libkern.a
 
 LIB_BUG_DIR=   ${.CURDIR}/../libbug
 LIBBUG_DIR!=   cd ${LIB_BUG_DIR} && ${PRINTOBJDIR}
diff -r dc0917878312 -r d376deacace4 sys/arch/mvme68k/stand/bootsd/Makefile
--- a/sys/arch/mvme68k/stand/bootsd/Makefile    Sun Jan 02 05:21:11 2011 +0000
+++ b/sys/arch/mvme68k/stand/bootsd/Makefile    Sun Jan 02 05:30:11 2011 +0000
@@ -1,9 +1,9 @@
 #      from: @(#)Makefile      8.1 (Berkeley) 6/10/93
-#      $NetBSD: Makefile,v 1.6 2000/12/04 21:25:58 scw Exp $
+#      $NetBSD: Makefile,v 1.7 2011/01/02 05:30:11 tsutsui Exp $
 
 SRCS=   boot.c conf.c
 PROG=  bootsd 
-LIBS=  ${LIBSA} ${LIBBUG}
+LIBS=  ${LIBSA} ${LIBKERN} ${LIBBUG}
 DPADD= ${LIBS}
 
 .include "../Makefile.booters"
diff -r dc0917878312 -r d376deacace4 sys/arch/mvme68k/stand/bootsd/version
--- a/sys/arch/mvme68k/stand/bootsd/version     Sun Jan 02 05:21:11 2011 +0000
+++ b/sys/arch/mvme68k/stand/bootsd/version     Sun Jan 02 05:30:11 2011 +0000
@@ -1,7 +1,8 @@
-$NetBSD: version,v 1.4 2001/11/09 19:53:14 scw Exp $
+$NetBSD: version,v 1.5 2011/01/02 05:30:11 tsutsui Exp $
 
 1.1:   Initial bootsd import (from sun3 port, adjusted for mvme68k port
        by Chuck Cranor)
 1.2:   Support verbose/quiet boot.
 1.3:   loadfile() update:  ELF symbols no longer need backward seeks.
 1.4:   loadfile() update to avoid backwards seeks for ELF Program Headers.
+1.5:   switched to using MI libsa and libkern
diff -r dc0917878312 -r d376deacace4 sys/arch/mvme68k/stand/bootst/Makefile
--- a/sys/arch/mvme68k/stand/bootst/Makefile    Sun Jan 02 05:21:11 2011 +0000
+++ b/sys/arch/mvme68k/stand/bootst/Makefile    Sun Jan 02 05:30:11 2011 +0000
@@ -1,11 +1,11 @@
 #      from: @(#)Makefile      8.1 (Berkeley) 6/10/93
-#      $NetBSD: Makefile,v 1.14 2002/02/09 09:36:00 lukem Exp $
+#      $NetBSD: Makefile,v 1.15 2011/01/02 05:30:11 tsutsui Exp $
 
 CLEANFILES+=stboot bootst bootst.bug
 
 PROG=bootst.bug
 SRCS=   boot.c conf.c dev_tape.c rawfs.c
-LIBS=  ${LIBSA} ${LIBBUG}
+LIBS=  ${LIBSA} ${LIBKERN} ${LIBBUG}
 SRTOBJ=
 DPADD= ${LIBS} ${WRTVID}
 
diff -r dc0917878312 -r d376deacace4 sys/arch/mvme68k/stand/bootst/version
--- a/sys/arch/mvme68k/stand/bootst/version     Sun Jan 02 05:21:11 2011 +0000
+++ b/sys/arch/mvme68k/stand/bootst/version     Sun Jan 02 05:30:11 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.5 2009/04/11 10:56:13 scw Exp $
+$NetBSD: version,v 1.6 2011/01/02 05:30:11 tsutsui Exp $
 
 1.1:   Initial bootst (from Dale Rahn)
 1.2:   Update based on sun3 tapeboot (by Chuck Cranor)
@@ -6,3 +6,4 @@
 1.4:   loadfile() update:  ELF symbols no longer need backward seeks.
 1.5:   loadfile() update to avoid backwards seeks for ELF Program Headers.
 1.6:   hackprom_diskrd() needs loads up to 3MB from tape for current kernels.
+1.7:   switched to using MI libsa and libkern
diff -r dc0917878312 -r d376deacace4 sys/arch/mvme68k/stand/bootxx/Makefile
--- a/sys/arch/mvme68k/stand/bootxx/Makefile    Sun Jan 02 05:21:11 2011 +0000
+++ b/sys/arch/mvme68k/stand/bootxx/Makefile    Sun Jan 02 05:30:11 2011 +0000
@@ -1,12 +1,12 @@
 #      from: @(#)Makefile      8.1 (Berkeley) 6/10/93
-#      $NetBSD: Makefile,v 1.8 2000/12/05 21:51:38 scw Exp $
+#      $NetBSD: Makefile,v 1.9 2011/01/02 05:30:12 tsutsui Exp $
 
 COMPILE.S= $(CC) -x assembler-with-cpp -traditional-cpp \
                $(ASFLAGS) $(CPPFLAGS) $(INCPATH) -c -o $*.o
 
 SRCS=   bootxx.c conf.c block_x.S
 PROG=  bootxx
-LIBS=  ${LIBSA} ${LIBBUG}
+LIBS=  ${LIBSA} ${LIBKERN} ${LIBBUG}
 DPADD= ${LIBS}
 SRTOBJ=
 
diff -r dc0917878312 -r d376deacace4 sys/arch/mvme68k/stand/bootxx/version
--- a/sys/arch/mvme68k/stand/bootxx/version     Sun Jan 02 05:21:11 2011 +0000
+++ b/sys/arch/mvme68k/stand/bootxx/version     Sun Jan 02 05:30:11 2011 +0000
@@ -1,5 +1,6 @@
-$NetBSD: version,v 1.2 2000/09/24 12:32:37 jdolecek Exp $
+$NetBSD: version,v 1.3 2011/01/02 05:30:12 tsutsui Exp $
 
 1.1:   Boot program for mvme68k, initial revision
        (import from sun3 port, adapt to mvme68k by Chuck Cranor)
 1.2:   Support verbose/quiet boot.
+1.3:   switched to using MI libsa and libkern
diff -r dc0917878312 -r d376deacace4 sys/arch/mvme68k/stand/libsa/Makefile
--- a/sys/arch/mvme68k/stand/libsa/Makefile     Sun Jan 02 05:21:11 2011 +0000
+++ b/sys/arch/mvme68k/stand/libsa/Makefile     Sun Jan 02 05:30:11 2011 +0000
@@ -1,50 +1,6 @@
-#      $NetBSD: Makefile,v 1.32 2010/03/15 16:13:13 he Exp $
-
-LIB=sa
-
-# Logically src/sys
-DIR_SA=$S/lib/libsa
-DIR_KERN=$S/lib/libkern
-DIR_LIBC=$S/../common/lib/libc
-
-SRC_net= arp.c \
-        bootp.c bootparam.c \
-        dev_net.c \
-        ether.c \
-        ip_cksum.c \
-        net.c netif.c nfs.c \
-        rarp.c rpc.c
+#      $NetBSD: Makefile,v 1.33 2011/01/02 05:30:12 tsutsui Exp $
 
-SRC_sa= alloc.c \
-       close.c closeall.c \
-       dev.c dev_net.c dkcksum.c \
-       ether_sprintf.c exit.c \
-       files.c fstat.c \
-       getfile.c gets.c globals.c \
-       intoa.c \
-       loadfile.c loadfile_aout.c loadfile_elf32.c lseek.c \
-       memmove.c memcmp.c memcpy.c memset.c \
-       nullfs.c \
-       open.c \
-       panic.c printf.c \
-       read.c \
-       snprintf.c sprintf.c strerror.c strncmp.c subr_prf.c \
-       twiddle.c \
-       udp.c ufs.c
-
-SRC_common+= ashrdi3.c inet_addr.c strncpy.c strlen.c
-
-SRC_libc_inet= inet_addr.c
-SRC_libc_quad= ashldi3.c ashrdi3.c
-SRC_libc_string= strcmp.c strlen.c strncpy.c
-
-SRC_mvme= exec_mvme.c
-
-SRC_here= bugdev.c \
-         chiptotime.c clock.c \
-         parse_args.c
-
-SRCS= ${SRC_net} ${SRC_sa} ${SRC_kern} ${SRC_common} ${SRC_mvme} ${SRC_here}
+S!= cd ${.CURDIR}/../../../..; pwd
 
 # DBG= -DDEBUG -DNETIF_DEBUG -DNFS_DEBUG -DRPC_DEBUG \
 #      -DNET_DEBUG -DRARP_DEBUG -DETHER_DEBUG
@@ -55,20 +11,29 @@
 CPPFLAGS+= -DSUPPORT_RARP -DSUPPORT_BOOTPARAM
 CPPFLAGS+= -DSUPPORT_NFS -DNFS_NOSYMLINK
 
-OBJS+= SRT0.o
-CLEANFILES+= SRT0.o
-
 .include "../Makefile.booters"
-.include "${S}/../common/lib/libc/Makefile.inc"
-
-.PATH: ${DIR_SA} ${DIR_KERN} \
-       ${DIR_LIBC}/inet ${DIR_LIBC}/quad ${DIR_LIBC}/string
 
 # only needed during build
 libinstall::
 
-all realall: lib${LIB}.a
+.include <bsd.prog.mk>
+
+### find out what to use for libsa
+SA_AS= library
+SAMISCMAKEFLAGS= SA_USE_LOADFILE=yes SA_EXTRADIR=${.CURDIR}
+.include "${S}/lib/libsa/Makefile.inc"
+LIBSA= ${SALIB}
 
-.include <bsd.own.mk>
-.undef DESTDIR
-.include <bsd.lib.mk>
+### find out what to use for libkern
+KERN_AS= library
+.include "${S}/lib/libkern/Makefile.inc"
+LIBKERN= ${KERNLIB}
+
+LIBS= ${LIBSA} ${LIBKERN}
+
+all realall: ${LIBS}
+
+cleandir distclean: .WAIT cleanlibdir
+
+cleanlibdir:
+       -rm -rf lib
diff -r dc0917878312 -r d376deacace4 sys/arch/mvme68k/stand/libsa/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/mvme68k/stand/libsa/Makefile.inc Sun Jan 02 05:30:11 2011 +0000
@@ -0,0 +1,17 @@
+#      $NetBSD: Makefile.inc,v 1.5 2011/01/02 05:30:12 tsutsui Exp $
+
+S!= cd ${SA_EXTRADIR}/../../../..; pwd
+
+.PATH.c: ${SA_EXTRADIR}
+.PATH.S: ${SA_EXTRADIR}
+
+SRC_sa=   dev_net.c
+
+SRC_mvme= exec_mvme.c
+
+SRC_here= SRT0.S \
+         bugdev.c \
+         chiptotime.c clock.c \
+         parse_args.c
+
+SRCS+= ${SRC_sa} ${SRC_mvme} ${SRC_here}
diff -r dc0917878312 -r d376deacace4 sys/arch/mvme68k/stand/netboot/Makefile
--- a/sys/arch/mvme68k/stand/netboot/Makefile   Sun Jan 02 05:21:11 2011 +0000
+++ b/sys/arch/mvme68k/stand/netboot/Makefile   Sun Jan 02 05:30:11 2011 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.15 2002/04/10 18:43:21 scw Exp $
+#      $NetBSD: Makefile,v 1.16 2011/01/02 05:30:12 tsutsui Exp $
 
 DEFS= -DSUN_BOOTPARAMS
 
 SRCS=   boot.c conf.c devopen.c
 SRCS+= if_ie.c if_le.c
 PROG=  netboot
-LIBS=  ${LIBSA} ${LIBBUG}
+LIBS=  ${LIBSA} ${LIBKERN} ${LIBBUG}
 DPADD= ${LIBS}
 CLEANFILES+= netboot.bin
 
diff -r dc0917878312 -r d376deacace4 sys/arch/mvme68k/stand/netboot/version
--- a/sys/arch/mvme68k/stand/netboot/version    Sun Jan 02 05:21:11 2011 +0000
+++ b/sys/arch/mvme68k/stand/netboot/version    Sun Jan 02 05:30:11 2011 +0000
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.4 2001/11/09 19:53:14 scw Exp $
+$NetBSD: version,v 1.5 2011/01/02 05:30:12 tsutsui Exp $
 
 1.1:   Initial bootst import.
 1.2:   Makefile: update from OpenBSD
@@ -9,3 +9,4 @@
 1.3:   Support verbose/quiet boot.
 1.4:   loadfile() update:  ELF symbols no longer need backward seeks.
 1.5:   loadfile() update to avoid backwards seeks for ELF Program Headers.
+1.6:   switched to using MI libsa and libkern
diff -r dc0917878312 -r d376deacace4 sys/arch/mvme68k/stand/sboot/version
--- a/sys/arch/mvme68k/stand/sboot/version      Sun Jan 02 05:21:11 2011 +0000
+++ b/sys/arch/mvme68k/stand/sboot/version      Sun Jan 02 05:30:11 2011 +0000
@@ -1,6 +1,7 @@
-$NetBSD: version,v 1.2 2000/09/24 12:32:37 jdolecek Exp $
+$NetBSD: version,v 1.3 2011/01/02 05:30:12 tsutsui Exp $
 
 1.1:   Initial import of mvme68k port.
 1.2:   update for new (SRT0/bugcrt) calling convention
 1.3:   use real libsa instead of own libc_sa.c
 1.4:   Support verbose/quiet boot.
+1.5:   switched to using MI libsa and libkern