Index: head/sys/boot/ofw/libofw/Makefile
===================================================================
--- head/sys/boot/ofw/libofw/Makefile	(revision 183197)
+++ head/sys/boot/ofw/libofw/Makefile	(revision 183198)
@@ -1,32 +1,32 @@
 # $FreeBSD$
 
 LIB=		ofw
 INTERNALLIB=
 
 SRCS=	devicename.c elf_freebsd.c ofw_console.c ofw_copy.c ofw_disk.c \
 	ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \
 	ofw_time.c openfirm.c
 
 CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
 
 # Pick up the bootstrap header for some interface items
 CFLAGS+=	-I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
 
 CFLAGS+=	-ffreestanding
 .if ${MACHINE_ARCH} == "powerpc"
-CFLAGS+=	-msoft-float -DPOWERMAC_SCREEN_HACK
+CFLAGS+=	-msoft-float
 .endif
 
 .ifdef(BOOT_DISK_DEBUG)
 # Make the disk code more talkative
 CFLAGS+= -DDISK_DEBUG
 .endif
 
 machine:
 	ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine
 
 CLEANFILES+=	machine
 
 .include <bsd.lib.mk>
 
 beforedepend ${OBJS}: machine
Index: head/sys/boot/ofw/libofw/ofw_console.c
===================================================================
--- head/sys/boot/ofw/libofw/ofw_console.c	(revision 183197)
+++ head/sys/boot/ofw/libofw/ofw_console.c	(revision 183198)
@@ -1,149 +1,120 @@
 /* $NetBSD: prom.c,v 1.3 1997/09/06 14:03:58 drochner Exp $ */
 
 /*-
  * Mach Operating System
  * Copyright (c) 1992 Carnegie Mellon University
  * All Rights Reserved.
  * 
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
  * 
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
  * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
  * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
  * 
  * Carnegie Mellon requests users of this software to return to
  * 
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
  * 
  * any improvements or extensions that they make and grant Carnegie Mellon
  * the rights to redistribute these changes.
  */
 
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 
 #include "bootstrap.h"
 #include "openfirm.h"
 
 static void ofw_cons_probe(struct console *cp);
 static int ofw_cons_init(int);
 void ofw_cons_putchar(int);
 int ofw_cons_getchar(void);
 int ofw_cons_poll(void);
 
 static ihandle_t stdin;
 static ihandle_t stdout;
-#ifdef POWERMAC_SCREEN_HACK
-static ihandle_t stdout1;
-static int do_stdout1 = 0;
-#endif
 
 struct console ofwconsole = {
 	"ofw",
 	"Open Firmware console",
 	0,
 	ofw_cons_probe,
 	ofw_cons_init,
 	ofw_cons_putchar,
 	ofw_cons_getchar,
 	ofw_cons_poll,
 };
 
 static void
 ofw_cons_probe(struct console *cp)
 {
-#ifdef POWERMAC_SCREEN_HACK
-	char path1[128], path2[128];
-#endif
 
 	OF_getprop(chosen, "stdin", &stdin, sizeof(stdin));
 	OF_getprop(chosen, "stdout", &stdout, sizeof(stdout));
-#ifdef POWERMAC_SCREEN_HACK
-	stdout1 = OF_open("screen");
-	if (stdout1 != -1) {
-		if (OF_instance_to_path(stdout, path1, sizeof(path1)) == -1)
-			path1[0] = '\0';
-		if (OF_instance_to_path(stdout1, path2, sizeof(path2)) == -1)
-			path2[0] = '\0';
-		if (strcmp(path1, path2) == 0) {
-			OF_close(stdout1);
-		} else {
-			do_stdout1 = 1;
-		}
-	}
-#endif
 	cp->c_flags |= C_PRESENTIN|C_PRESENTOUT;
 }
 
 static int
 ofw_cons_init(int arg)
 {
 	return 0;
 }
 
 void
 ofw_cons_putchar(int c)
 {
 	char cbuf;
 
 	if (c == '\n') {
 		cbuf = '\r';
 		OF_write(stdout, &cbuf, 1);
-#ifdef POWERMAC_SCREEN_HACK
-		if (do_stdout1 != 0)
-			OF_write(stdout1, &cbuf, 1);
-#endif
 	}
 
 	cbuf = c;
 	OF_write(stdout, &cbuf, 1);
-#ifdef POWERMAC_SCREEN_HACK
-	if (do_stdout1 != 0)
-		OF_write(stdout1, &cbuf, 1);
-#endif
 }
 
 static int saved_char = -1;
 
 int
 ofw_cons_getchar()
 {
 	unsigned char ch = '\0';
 	int l;
 
 	if (saved_char != -1) {
 		l = saved_char;
 		saved_char = -1;
 		return l;
 	}
 
 	if (OF_read(stdin, &ch, 1) > 0)
 		return (ch);
 
 	return (-1);
 }
 
 int
 ofw_cons_poll()
 {
 	unsigned char ch;
 
 	if (saved_char != -1)
 		return 1;
 
 	if (OF_read(stdin, &ch, 1) > 0) {
 		saved_char = ch;
 		return 1;
 	}
 
 	return 0;
 }
Index: head/sys/boot/uboot/common/metadata.c
===================================================================
--- head/sys/boot/uboot/common/metadata.c	(revision 183197)
+++ head/sys/boot/uboot/common/metadata.c	(revision 183198)

Property changes on: head/sys/boot/uboot/common/metadata.c
___________________________________________________________________
Deleted: svn:mergeinfo
## -0,0 +0,0 ##