Check in some changes hiding in my tree.

Now that ramdisk is used, booting from floppy does not wait for floppy change.
Do not force real mode for booting, this disables caches on certain machines.
use the freshly build hack-obj, do not require "." in the current path.

diff --git a/sys/arch/powerpc/stand/boot.c b/sys/arch/powerpc/stand/boot.c
index c4d2e08..6dd32cc 100644 (file)
--- a/sys/arch/powerpc/stand/boot.c
+++ b/sys/arch/powerpc/stand/boot.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: boot.c,v 1.4 1997/02/06 23:44:56 rahnds Exp $ */
+/*     $OpenBSD: boot.c,v 1.5 1997/04/01 21:01:42 rahnds Exp $ */
 /*     $NetBSD: boot.c,v 1.2 1996/10/07 21:43:02 cgd Exp $     */
 
 /*
@@ -210,11 +210,13 @@ loadfile(fd, addr, args)
        }
 #endif
        close(fd);
+#if 0
        if (floppyboot) {
                printf("Please insert root disk and press ENTER ");
                getchar();
                printf("\n");
        }
+#endif
        chain((void *)exec_addr, args);
 }
 

diff --git a/sys/arch/powerpc/stand/boot.mac/Makefile b/sys/arch/powerpc/stand/boot.mac/Makefile
index 5c6a6e5..d491302 100644 (file)
--- a/sys/arch/powerpc/stand/boot.mac/Makefile
+++ b/sys/arch/powerpc/stand/boot.mac/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.1 1997/02/18 22:36:41 rahnds Exp $
+#      $OpenBSD: Makefile,v 1.2 1997/04/01 21:01:48 rahnds Exp $
 #       $NetBSD: Makefile,v 1.1 1996/09/30 16:35:05 ws Exp $
 
 R=              ..
@@ -23,7 +23,7 @@ LIBS!=          cd $(.CURDIR)/$(R); $(MAKE) libdep
 $(PROG):        $(OBJS) $(LIBS) hack-coff
        $(LD) $(LDFLAGS) $(OBJS) $(LIBS) -o ${.TARGET}
        ${OBJCOPY} ${OBJCOPY_ARGS} ${.TARGET}
-       hack-coff ${.TARGET}
+       ${.OBJDIR}/hack-coff ${.TARGET}
 #      ${MAKEELF} $(REAL_VIRT) a.out $(.TARGET)
 
 hack-coff:     hack-coff.c

diff --git a/sys/arch/powerpc/stand/boot/Makefile b/sys/arch/powerpc/stand/boot/Makefile
index ede0d8d..0200cdf 100644 (file)
--- a/sys/arch/powerpc/stand/boot/Makefile
+++ b/sys/arch/powerpc/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.3 1997/02/18 22:35:31 rahnds Exp $
+#      $OpenBSD: Makefile,v 1.4 1997/04/01 21:01:45 rahnds Exp $
 #       $NetBSD: Makefile,v 1.1 1996/09/30 16:35:05 ws Exp $
 
 R=              ..
@@ -11,7 +11,7 @@ NOMAN=
 STRIP=
 MAKEELF=        makeelf
 BINDIR=         /usr/mdec
-OBJS+=         note.o
+#OBJS+=                note.o
 
 LIBS!=          cd $(.CURDIR)/$(R); $(MAKE) libdep