Module Name: src
Committed By: tsutsui
Date: Tue Mar 31 11:42:08 UTC 2009
Modified Files:
src/sys/arch/atari/stand/bootxx: Makefile.bootxx
src/sys/arch/atari/stand/bootxxx: Makefile.bootxxx
src/sys/arch/atari/stand/libsa: Makefile
Added Files:
src/sys/arch/atari/stand/libsa: Makefile.inc
Log Message:
Switch atari standalone bootloaders to using MI libsa and libkern.
Tested by David Ross on port-at...@. Thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/atari/stand/bootxx/Makefile.bootxx
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/atari/stand/bootxxx/Makefile.bootxxx
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/atari/stand/libsa/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/atari/stand/libsa/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/atari/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/atari/stand/bootxx/Makefile.bootxx:1.8 src/sys/arch/atari/stand/bootxx/Makefile.bootxx:1.9
--- src/sys/arch/atari/stand/bootxx/Makefile.bootxx:1.8 Tue Jan 6 13:35:30 2009
+++ src/sys/arch/atari/stand/bootxx/Makefile.bootxx Tue Mar 31 11:42:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.8 2009/01/06 13:35:30 tsutsui Exp $
+# $NetBSD: Makefile.bootxx,v 1.9 2009/03/31 11:42:07 tsutsui Exp $
NOMAN= # defined
@@ -25,7 +25,8 @@
S_MACHSAOBJ!= cd ${S_MACHSA} && ${PRINTOBJDIR}
-LIBSA=${S_MACHSAOBJ}/libsa.a
+LIBSA=${S_MACHSAOBJ}/lib/sa/libsa.a
+LIBKERN=${S_MACHSAOBJ}/lib/kern/libkern.a
.include "../../Makefile.booters"
.include "../../xxboot/${BTYPE}_LOADADDR"
@@ -47,7 +48,7 @@
#
SRCS= start.S bootxx.c filesystem.c
-LIBS= ${LIBSA}
+LIBS= ${LIBSA} ${LIBKERN}
beforeinstall:
${INSTALL_DIR} ${DESTDIR}${BINDIR}
Index: src/sys/arch/atari/stand/bootxxx/Makefile.bootxxx
diff -u src/sys/arch/atari/stand/bootxxx/Makefile.bootxxx:1.5 src/sys/arch/atari/stand/bootxxx/Makefile.bootxxx:1.6
--- src/sys/arch/atari/stand/bootxxx/Makefile.bootxxx:1.5 Tue Jan 13 13:44:01 2009
+++ src/sys/arch/atari/stand/bootxxx/Makefile.bootxxx Tue Mar 31 11:42:07 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxxx,v 1.5 2009/01/13 13:44:01 tsutsui Exp $
+# $NetBSD: Makefile.bootxxx,v 1.6 2009/03/31 11:42:07 tsutsui Exp $
NOMAN= # defined
@@ -25,7 +25,8 @@
S_MACHSAOBJ!= cd ${S_MACHSA} && ${PRINTOBJDIR}
-LIBSA=${S_MACHSAOBJ}/libsa.a
+LIBSA=${S_MACHSAOBJ}/lib/sa/libsa.a
+LIBKERN=${S_MACHSAOBJ}/lib/kern/libkern.a
.include "../../Makefile.booters"
.include "../../xxboot/${BTYPE}_LOADADDR"
@@ -44,7 +45,7 @@
#
SRCS= start.S bootxxx.c aout.c bsdstart.s elf.c filesystem.c sysinfo.c
-LIBS= ${LIBSA}
+LIBS= ${LIBSA} ${LIBKERN}
beforeinstall:
${INSTALL_DIR} ${DESTDIR}${BINDIR}
Index: src/sys/arch/atari/stand/libsa/Makefile
diff -u src/sys/arch/atari/stand/libsa/Makefile:1.29 src/sys/arch/atari/stand/libsa/Makefile:1.30
--- src/sys/arch/atari/stand/libsa/Makefile:1.29 Thu Mar 19 10:19:33 2009
+++ src/sys/arch/atari/stand/libsa/Makefile Tue Mar 31 11:42:07 2009
@@ -1,60 +1,30 @@
-# $NetBSD: Makefile,v 1.29 2009/03/19 10:19:33 tsutsui Exp $
-
-LIB= sa
-
-NOPIC= # defined
-NOPROFILE= # defined
-NOLINT= # defnied
-
-NO_NET=
+# $NetBSD: Makefile,v 1.30 2009/03/31 11:42:07 tsutsui Exp $
# Logically src/sys
-S=${.CURDIR}/../../../..
-S_SA=${S}/lib/libsa
-S_KERN=${S}/lib/libkern
-S_MACHSA=${S}/arch/atari/stand/libsa
-
-.include "${S}/../common/lib/libc/Makefile.inc"
+S!= cd ${.CURDIR}/../../../..; pwd
.include "../Makefile.booters"
-CPPFLAGS+= -I. -I${S_MACHSA} -I${S_KERN} -I${S_SA} -I${S}
-
-.PATH: ${S_SA} ${S_KERN}
-
-#
-# NetBSD/atari specific replacements: dev.c
-#
-
-# machine dependant routines
-SRCS= consio.S diskio.c
-
-# from common/lib/libc
-SRCS+= ashldi3.c ashrdi3.c bzero.c strcmp.c strlen.c
+CPPFLAGS+= -I${S} -I.
-# stand routines
-SRCS+= alloc.c bcopy.c exec.c files.c getfile.c gets.c globals.c \
- panic.c memcmp.c memcpy.c memmove.c memset.c printf.c strerror.c \
- subr_prf.c twiddle.c
+.include <bsd.prog.mk>
-# io routines
-SRCS+= close.c closeall.c dev.c disklabel.c dkcksum.c ioctl.c \
- lseek.c open.c nullfs.c read.c stat.c fstat.c write.c
+### find out what to use for libsa
+SA_AS= library
+SAMISCMAKEFLAGS= SA_INCLUDE_NET=no SA_EXTRADIR=${.CURDIR}
+.include "${S}/lib/libsa/Makefile.inc"
+LIBSA= ${SALIB}
-.if !defined(NO_NET)
-# network routines
-SRCS+= arp.c ether.c in_cksum.c net.c netif.c rpc.c
-.endif
+### find out what to use for libkern
+KERN_AS= library
+.include "${S}/lib/libkern/Makefile.inc"
+LIBKERN= ${KERNLIB}
-# network info services:
-SRCS+= bootp.c rarp.c bootparam.c
+LIBS= ${LIBSA} ${LIBKERN}
-# boot filesystems
-SRCS+= ufs.c nfs.c
+realall: ${LIBS}
-# only needed during build
-libinstall::
+cleandir distclean: cleanlibdir
-.include <bsd.own.mk>
-.undef DESTDIR
-.include <bsd.lib.mk>
+cleanlibdir:
+ -rm -rf lib
Added files:
Index: src/sys/arch/atari/stand/libsa/Makefile.inc
diff -u /dev/null src/sys/arch/atari/stand/libsa/Makefile.inc:1.1
--- /dev/null Tue Mar 31 11:42:08 2009
+++ src/sys/arch/atari/stand/libsa/Makefile.inc Tue Mar 31 11:42:07 2009
@@ -0,0 +1,9 @@
+# $NetBSD: Makefile.inc,v 1.1 2009/03/31 11:42:07 tsutsui Exp $
+
+.PATH.c: ${SA_EXTRADIR}
+.PATH.S: ${SA_EXTRADIR}
+
+# NetBSD/atari specific replacements: dev.c
+
+# machine dependant routines
+SRCS+= consio.S dev.c diskio.c
