bootloader cleanup

[Izumi Tsutsui <tsutsui%ceres.dti.ne.jp@localhost>]

Could anyone try the following boot binaries on atari machines?

http://www.ceres.dti.ne.jp/~tsutsui/netbsd/atari-stand/bootxx
http://www.ceres.dti.ne.jp/~tsutsui/netbsd/atari-stand/boot.atari

- put boot.atari into /
- put bootxx into /usr/mdec
- use installboot(8):
  /usr/mdec/installboot -v /dev/rsd0c

I'd like to cleanup sys/arch/atari/stand sources to use
MI sys/lib/libsa Makefiles rather than local one for
maintainability and no functional changes are intended on it,
but it's better to confirm that nothing is broken by this change.

---
Index: bootxx/Makefile.bootxx
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/stand/bootxx/Makefile.bootxx,v
retrieving revision 1.8
diff -u -r1.8 Makefile.bootxx
--- bootxx/Makefile.bootxx      6 Jan 2009 13:35:30 -0000       1.8
+++ bootxx/Makefile.bootxx      29 Mar 2009 02:47:32 -0000
@@ -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: bootxxx/Makefile.bootxxx
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/stand/bootxxx/Makefile.bootxxx,v
retrieving revision 1.5
diff -u -r1.5 Makefile.bootxxx
--- bootxxx/Makefile.bootxxx    13 Jan 2009 13:44:01 -0000      1.5
+++ bootxxx/Makefile.bootxxx    29 Mar 2009 02:47:32 -0000
@@ -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: libsa/Makefile
===================================================================
RCS file: /cvsroot/src/sys/arch/atari/stand/libsa/Makefile,v
retrieving revision 1.29
diff -u -r1.29 Makefile
--- libsa/Makefile      19 Mar 2009 10:19:33 -0000      1.29
+++ libsa/Makefile      29 Mar 2009 02:47:32 -0000
@@ -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=
-
 # 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
--- /dev/null   2009-03-29 11:44:07.000000000 +0900
+++ libsa/Makefile.inc  2009-03-20 21:23:22.000000000 +0900
@@ -0,0 +1,9 @@
+# $NetBSD$
+
+.PATH.c: ${SA_EXTRADIR}
+.PATH.S: ${SA_EXTRADIR}
+
+# NetBSD/atari specific replacements: dev.c
+
+# machine dependant routines
+SRCS+=   consio.S dev.c diskio.c

---
Izumi Tsutsui