Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/mvme68k/stand cleanup Makefiles, put common stuff t...
details: https://anonhg.NetBSD.org/src/rev/284f080e7392
branches: trunk
changeset: 495244:284f080e7392
user: jdolecek <jdolecek%NetBSD.org@localhost>
date: Mon Jul 24 18:39:01 2000 +0000
description:
cleanup Makefiles, put common stuff to Makefile.booters, ditch unnecessary
stuff
make this all compile with -Wall -Wno-main -Wmissing-prototypes
-Wstrict-prototypes -Werror , also compilable on 1.4.1
label itself as NetBSD/mvme68k instead of "BSD" in bootblock message
move bugcrt.c to libbug, remove bugcrt directory (bugcrt is still built
and used separately to rest of libbug)
convert sboot to use ordinary mvme68 libsa, instead of copying needed
stuff in libc_sa.c
convert to use version info generated by sys/conf/newvers_stand.sh
instead of previous version.c files, add necessary 'version' files
put chiptotime() to separate libsa file (used also by sboot/clock.c)
Thanks to Steve Woodford for help with this. Note that -current build
might be hosed by this change, will be addressed by Steve shortly.
diffstat:
sys/arch/mvme68k/stand/Makefile | 6 +-
sys/arch/mvme68k/stand/Makefile.booters | 93 +++++++
sys/arch/mvme68k/stand/Makefile.inc | 17 -
sys/arch/mvme68k/stand/bootsd/Makefile | 26 +-
sys/arch/mvme68k/stand/bootsd/boot.c | 13 +-
sys/arch/mvme68k/stand/bootsd/version | 4 +
sys/arch/mvme68k/stand/bootsd/version.c | 8 -
sys/arch/mvme68k/stand/bootst/Makefile | 44 +--
sys/arch/mvme68k/stand/bootst/boot.c | 13 +-
sys/arch/mvme68k/stand/bootst/dev_tape.c | 22 +-
sys/arch/mvme68k/stand/bootst/dev_tape.h | 4 +-
sys/arch/mvme68k/stand/bootst/version | 4 +
sys/arch/mvme68k/stand/bootst/version.c | 10 -
sys/arch/mvme68k/stand/bootxx/Makefile | 26 +-
sys/arch/mvme68k/stand/bootxx/bootxx.c | 20 +-
sys/arch/mvme68k/stand/bootxx/version | 4 +
sys/arch/mvme68k/stand/bootxx/version.c | 8 -
sys/arch/mvme68k/stand/bugcrt/Makefile | 26 --
sys/arch/mvme68k/stand/bugcrt/Makefile.inc | 14 -
sys/arch/mvme68k/stand/bugcrt/bugcrt.c | 87 -------
sys/arch/mvme68k/stand/installboot/Makefile | 3 +-
sys/arch/mvme68k/stand/libbug/Makefile | 19 +-
sys/arch/mvme68k/stand/libbug/Makefile.inc | 14 -
sys/arch/mvme68k/stand/libbug/bugcrt.c | 87 +++++++
sys/arch/mvme68k/stand/libbug/libbug.h | 4 +-
sys/arch/mvme68k/stand/libsa/Makefile | 34 +-
sys/arch/mvme68k/stand/libsa/Makefile.inc | 15 -
sys/arch/mvme68k/stand/libsa/chiptotime.c | 56 ++++
sys/arch/mvme68k/stand/libsa/clock.c | 5 +-
sys/arch/mvme68k/stand/libsa/exec_mvme.c | 3 +-
sys/arch/mvme68k/stand/libsa/libsa.h | 6 +-
sys/arch/mvme68k/stand/netboot/Makefile | 39 +--
sys/arch/mvme68k/stand/netboot/boot.c | 13 +-
sys/arch/mvme68k/stand/netboot/dev_net.c | 35 ++-
sys/arch/mvme68k/stand/netboot/dev_net.h | 8 +-
sys/arch/mvme68k/stand/netboot/devopen.c | 3 +-
sys/arch/mvme68k/stand/netboot/if_ie.c | 16 +-
sys/arch/mvme68k/stand/netboot/if_le.c | 10 +-
sys/arch/mvme68k/stand/netboot/version | 8 +
sys/arch/mvme68k/stand/netboot/version.c | 7 -
sys/arch/mvme68k/stand/sboot/Makefile | 40 +--
sys/arch/mvme68k/stand/sboot/clock.c | 47 +---
sys/arch/mvme68k/stand/sboot/console.c | 7 +-
sys/arch/mvme68k/stand/sboot/le_poll.c | 20 +-
sys/arch/mvme68k/stand/sboot/libc_sa.c | 348 ----------------------------
sys/arch/mvme68k/stand/sboot/sboot.c | 16 +-
sys/arch/mvme68k/stand/sboot/sboot.h | 35 +-
sys/arch/mvme68k/stand/sboot/srec.c | 13 +-
sys/arch/mvme68k/stand/sboot/version | 5 +
sys/arch/mvme68k/stand/wrtvid/Makefile.inc | 14 -
50 files changed, 508 insertions(+), 871 deletions(-)
diffs (truncated from 2134 to 300 lines):
diff -r 8f9e77fef17d -r 284f080e7392 sys/arch/mvme68k/stand/Makefile
--- a/sys/arch/mvme68k/stand/Makefile Mon Jul 24 16:21:02 2000 +0000
+++ b/sys/arch/mvme68k/stand/Makefile Mon Jul 24 18:39:01 2000 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 1996/05/17 20:45:48 chuck Exp $
+# $NetBSD: Makefile,v 1.3 2000/07/24 18:39:01 jdolecek Exp $
-SUBDIR= bugcrt libbug libsa sboot netboot bootxx bootsd bootst \
- installboot prtvid wrtvid
+SUBDIR= libbug libsa sboot netboot bootxx bootsd bootst \
+ installboot
.include <bsd.subdir.mk>
diff -r 8f9e77fef17d -r 284f080e7392 sys/arch/mvme68k/stand/Makefile.booters
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/mvme68k/stand/Makefile.booters Mon Jul 24 18:39:01 2000 +0000
@@ -0,0 +1,93 @@
+# $NetBSD: Makefile.booters,v 1.1 2000/07/24 18:39:03 jdolecek Exp $
+
+S?= ${.CURDIR}/../../../..
+MDEC_DIR?= /usr/mdec
+RELOC?= 0x3F0000
+COPTS?= -O2 -Wall -Wno-main -Wmissing-prototypes -Wstrict-prototypes
+DEFS?=
+STRIPFLAG?=
+
+NOMAN= 1
+MKMAN= no
+NOLINT= 1
+MKLINT= no
+MKPIC= no
+MKPROFILE=no
+MKLINT=no
+
+INCPATH=-I${.OBJDIR} -I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
+ -I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
+CFLAGS= -nostdinc -D_STANDALONE ${INCPATH} ${DEFS}
+BINDIR= ${MDEC_DIR}
+
+.if exists(${.CURDIR}/version)
+SRCS+= vers.c
+CLEANFILES+= vers.c
+
+vers.c: version
+ sh ${S}/conf/newvers_stand.sh -DM ${.CURDIR}/version "mvme68k"
+.endif
+
+CLEANFILES+= machine m68k
+
+machine :
+ -rm -f ${.TARGET}
+ ln -s $S/arch/mvme68k/include machine
+
+m68k :
+ -rm -f ${.TARGET}
+ ln -s $S/arch/m68k/include m68k
+
+.if defined(LIB)
+
+lib${LIB}.a:: machine m68k ${OBJS}
+
+.else
+
+${PROG}: machine m68k ${OBJS} ${LIBS} ${BUGCRT} ${SRTOBJ}
+ ${LD} -N -T ${RELOC} -o $@ ${BUGCRT} ${SRTOBJ} ${OBJS} ${LIBS}
+
+LIB_SA_DIR= ${.CURDIR}/../libsa
+LIBSA_DIR!=cd ${LIB_SA_DIR}; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+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
+
+LIB_BUG_DIR= ${.CURDIR}/../libbug
+LIBBUG_DIR!=cd ${LIB_BUG_DIR}; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+LIBBUG=${LIBBUG_DIR}/libbug.a
+
+.PHONY: ${LIBBUG}
+${LIBBUG}:
+ @echo making sure the libbug is up to date...
+ @(cd ${LIB_BUG_DIR}; ${MAKE})
+
+BUGCRT=${LIBBUG_DIR}/bugcrt.o
+
+.PHONY: ${BUGCRT}
+$(BUGCRT):
+ @echo making sure the bugcrt is up to date...
+ @(cd ${LIB_BUG_DIR}; ${MAKE} bugcrt.o)
+
+WRTVID_BOOT_DIR= ${.CURDIR}/../wrtvid
+WRTVID_DIR!=cd ${WRTVID_BOOT_DIR}; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
+WRTVID=${WRTVID_DIR}/wrtvid
+
+.PHONY: ${WRTVID}
+${WRTVID}:
+ @echo making sure the wrtvid is up to date...
+ @(cd ${WRTVID_BOOT_DIR}; ${MAKE})
+
+.endif
diff -r 8f9e77fef17d -r 284f080e7392 sys/arch/mvme68k/stand/Makefile.inc
--- a/sys/arch/mvme68k/stand/Makefile.inc Mon Jul 24 16:21:02 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-# $NetBSD: Makefile.inc,v 1.4 2000/07/09 13:47:33 jdolecek Exp $
-
-MDEC_DIR?=/usr/mdec
-
-CLEANFILES+= machine m68k
-
-.if defined(S)
-machine:
- -rm -f $@
- ln -s $S/arch/mvme68k/include machine
-
-m68k:
- -rm -f $@
- ln -s $S/arch/m68k/include m68k
-
-all: machine m68k
-.endif
diff -r 8f9e77fef17d -r 284f080e7392 sys/arch/mvme68k/stand/bootsd/Makefile
--- a/sys/arch/mvme68k/stand/bootsd/Makefile Mon Jul 24 16:21:02 2000 +0000
+++ b/sys/arch/mvme68k/stand/bootsd/Makefile Mon Jul 24 18:39:01 2000 +0000
@@ -1,30 +1,10 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/10/93
-# $NetBSD: Makefile,v 1.4 2000/06/25 16:39:05 scw Exp $
-
-RELOC=0x3F0000
+# $NetBSD: Makefile,v 1.5 2000/07/24 18:39:10 jdolecek Exp $
-S= ${.CURDIR}/../../../..
-DEFS=
-NOMAN= 1
-NOLINT= 1
-INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
- -I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
-CFLAGS= -O2 ${INCPATH} ${DEFS} ${COPTS}
-CLEANFILES+=bootsd
-
-.include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc"
-.include "${S}/arch/mvme68k/stand/libbug/Makefile.inc"
-.include "${S}/arch/mvme68k/stand/libsa/Makefile.inc"
-
-SRCS= boot.c conf.c version.c
+SRCS= boot.c conf.c
PROG= bootsd
LIBS= ${LIBSA} ${LIBBUG}
-bootsd: ${OBJS} ${LIBSA} ${BUGCRT} ${LIBBUG}
- ${LD} -N -T ${RELOC} -o $@ \
- ${SRTOBJ} ${BUGCRT} ${OBJS} ${LIBSA} ${LIBBUG}
-
-install:
- ${INSTALL} -c -m 555 -g bin -o bin ${PROG} ${DESTDIR}${MDEC_DIR}
+.include "../Makefile.booters"
.include <bsd.prog.mk>
diff -r 8f9e77fef17d -r 284f080e7392 sys/arch/mvme68k/stand/bootsd/boot.c
--- a/sys/arch/mvme68k/stand/bootsd/boot.c Mon Jul 24 16:21:02 2000 +0000
+++ b/sys/arch/mvme68k/stand/bootsd/boot.c Mon Jul 24 18:39:01 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.2 2000/07/24 09:25:53 scw Exp $ */
+/* $NetBSD: boot.c,v 1.3 2000/07/24 18:39:10 jdolecek Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993
@@ -45,15 +45,18 @@
int debug;
int errno;
-extern char *version;
+extern char bootprog_name[], bootprog_rev[];
+
+int main(void);
int
main()
{
- char *cp, *file;
- int io, flag, part;
+ char *file;
+ int flag, part;
- printf(">> BSD MVME%x bootsd [%s]\n", bugargs.cputyp, version);
+ printf(">> %s MVME%x bootsd [%s]\n",
+ bootprog_name, bugargs.cputyp, bootprog_rev);
parse_args(&file, &flag, &part);
diff -r 8f9e77fef17d -r 284f080e7392 sys/arch/mvme68k/stand/bootsd/version
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/mvme68k/stand/bootsd/version Mon Jul 24 18:39:01 2000 +0000
@@ -0,0 +1,4 @@
+$NetBSD: version,v 1.1 2000/07/24 18:39:11 jdolecek Exp $
+
+1.1: Initial bootsd import (from sun3 port, adjusted for mvme68k port
+ by Chuck Cranor)
diff -r 8f9e77fef17d -r 284f080e7392 sys/arch/mvme68k/stand/bootsd/version.c
--- a/sys/arch/mvme68k/stand/bootsd/version.c Mon Jul 24 16:21:02 2000 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-/* $NetBSD: version.c,v 1.1 1996/05/17 20:04:49 chuck Exp $ */
-
-/*
- * make a random change to this file when you want the bootblock
- * revision to increase. like change this x to a z, or something.
- */
-
-char *version = "$Revision: 1.1 $";
diff -r 8f9e77fef17d -r 284f080e7392 sys/arch/mvme68k/stand/bootst/Makefile
--- a/sys/arch/mvme68k/stand/bootst/Makefile Mon Jul 24 16:21:02 2000 +0000
+++ b/sys/arch/mvme68k/stand/bootst/Makefile Mon Jul 24 18:39:01 2000 +0000
@@ -1,39 +1,25 @@
# from: @(#)Makefile 8.1 (Berkeley) 6/10/93
-# $NetBSD: Makefile,v 1.8 2000/07/09 14:11:10 jdolecek Exp $
-
-RELOC=0x3F0000
+# $NetBSD: Makefile,v 1.9 2000/07/24 18:39:14 jdolecek Exp $
-S= ${.CURDIR}/../../../..
-DEFS=
-INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
- -I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
-CFLAGS= -O2 ${INCPATH} ${DEFS} ${COPTS}
CLEANFILES+=stboot bootst bootst.bug
-.include "${S}/arch/mvme68k/stand/libsa/Makefile.inc"
-.include "${S}/arch/mvme68k/stand/libbug/Makefile.inc"
-.include "${S}/arch/mvme68k/stand/bugcrt/Makefile.inc"
-.include "${S}/arch/mvme68k/stand/wrtvid/Makefile.inc"
+PROG=bootst.bug
+SRCS= boot.c conf.c dev_tape.c rawfs.c
+LIBS= ${LIBSA} ${LIBBUG}
+SRTOBJ=
+DPADD= ${WRTVID}
-PROG=dummy
-MKMAN=no
-SRCS= boot.c conf.c dev_tape.c rawfs.c version.c
-LIBS= ${LIBSA} ${LIBBUG}
-
-${PROG}: ${OBJS} ${BUGCRT} ${LIBS} ${WRTVID}
- ${LD} -s -N -T ${RELOC} ${BUGCRT} ${OBJS} ${LIBS} -o bootst.bug
+bootst stboot: ${PROG} ${WRTVID}
@size bootst.bug
@${WRTVID} bootst.bug # creates bootst and stboot
- touch ${PROG}
-
-install:
- ${INSTALL} -c -m 555 -g bin -o bin bootst ${DESTDIR}${MDEC_DIR}
- ${INSTALL} -c -m 555 -g bin -o bin stboot ${DESTDIR}${MDEC_DIR}
-afterdepend: .depend
- @(TMP=/tmp/_depend$$$$; \
- sed -e 's/^\([^\.]*\).o[ ]*:/\1.o g\1.o s\1.o:/' \
- < .depend > $$TMP; \
- mv $$TMP .depend)
+proginstall::
+ ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \
+ -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} bootst ${DESTDIR}${MDEC_DIR}
+ ${INSTALL} ${RENAME} ${PRESERVE} ${COPY} ${STRIPFLAG} ${INSTPRIV} \
+ -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} stboot ${DESTDIR}${MDEC_DIR}
+.include "../Makefile.booters"
+
+all: bootst
.include <bsd.prog.mk>
diff -r 8f9e77fef17d -r 284f080e7392 sys/arch/mvme68k/stand/bootst/boot.c
--- a/sys/arch/mvme68k/stand/bootst/boot.c Mon Jul 24 16:21:02 2000 +0000
+++ b/sys/arch/mvme68k/stand/bootst/boot.c Mon Jul 24 18:39:01 2000 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.2 2000/07/24 09:25:53 scw Exp $ */
+/* $NetBSD: boot.c,v 1.3 2000/07/24 18:39:14 jdolecek Exp $ */
/*-
* Copyright (c) 1982, 1986, 1990, 1993
@@ -46,17 +46,20 @@
int debug;
int errno;
-extern char *version;
+extern char bootprog_name[], bootprog_rev[];
char defname[32] = "2";
char line[80];
+int main(void);
+int
main()
Home |
Main Index |
Thread Index |
Old Index