diff options
author | sobomax <sobomax@FreeBSD.org> | 2008-09-19 19:49:58 +0000 |
---|---|---|
committer | sobomax <sobomax@FreeBSD.org> | 2008-09-19 19:49:58 +0000 |
commit | 40389ddc0408f61035afc11ebe0aa6b46dda5a54 (patch) | |
tree | a73de336eb83cfdd94a00e5b1716b9c40532d1cd /sys/boot | |
parent | 909d5d083f4f775e870dfce1661a4dcd84855ffb (diff) | |
download | FreeBSD-src-40389ddc0408f61035afc11ebe0aa6b46dda5a54.zip FreeBSD-src-40389ddc0408f61035afc11ebe0aa6b46dda5a54.tar.gz |
Backout rev 183181. It appears that I should have been using boot-device
of "cd:,\\:tbxi" with properly configured boot.tbxi, instead of booting
\boot\loader directly. Rev 183168 could probably stay, since it can be
viewed as an anti-foot-shooting measure and has no impact on normal
operation. I can revert it as well, if anybody objects.
Diffstat (limited to 'sys/boot')
-rw-r--r-- | sys/boot/ofw/libofw/Makefile | 2 | ||||
-rw-r--r-- | sys/boot/ofw/libofw/ofw_console.c | 29 |
2 files changed, 1 insertions, 30 deletions
diff --git a/sys/boot/ofw/libofw/Makefile b/sys/boot/ofw/libofw/Makefile index 0e45708..8a56a77 100644 --- a/sys/boot/ofw/libofw/Makefile +++ b/sys/boot/ofw/libofw/Makefile @@ -14,7 +14,7 @@ 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) diff --git a/sys/boot/ofw/libofw/ofw_console.c b/sys/boot/ofw/libofw/ofw_console.c index 560dd9f..59ce9a5 100644 --- a/sys/boot/ofw/libofw/ofw_console.c +++ b/sys/boot/ofw/libofw/ofw_console.c @@ -42,10 +42,6 @@ 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", @@ -61,26 +57,9 @@ struct console ofwconsole = { 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; } @@ -98,18 +77,10 @@ ofw_cons_putchar(int c) 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; |