Module Name: src Committed By: macallan Date: Wed Dec 14 13:19:05 UTC 2022
Modified Files: src/sys/arch/powerpc/oea: ofw_autoconf.c Log Message: if we have the ROM font, make it available to wsdisplay needs testing on non-macppc To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/oea/ofw_autoconf.c 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/powerpc/oea/ofw_autoconf.c diff -u src/sys/arch/powerpc/oea/ofw_autoconf.c:1.24 src/sys/arch/powerpc/oea/ofw_autoconf.c:1.25 --- src/sys/arch/powerpc/oea/ofw_autoconf.c:1.24 Wed Nov 27 21:07:32 2019 +++ src/sys/arch/powerpc/oea/ofw_autoconf.c Wed Dec 14 13:19:04 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: ofw_autoconf.c,v 1.24 2019/11/27 21:07:32 joerg Exp $ */ +/* $NetBSD: ofw_autoconf.c,v 1.25 2022/12/14 13:19:04 macallan Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. * Copyright (C) 1995, 1996 TooLs GmbH. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.24 2019/11/27 21:07:32 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofw_autoconf.c,v 1.25 2022/12/14 13:19:04 macallan Exp $"); #ifdef ofppc #include "gtpci.h" @@ -61,6 +61,11 @@ __KERNEL_RCSID(0, "$NetBSD: ofw_autoconf #include <dev/ata/atavar.h> #include <dev/ic/wdcvar.h> +#include <dev/wscons/wsconsio.h> +#include <dev/wscons/wsdisplayvar.h> +#include <dev/rasops/rasops.h> +#include <powerpc/oea/ofw_rasconsvar.h> + #include <machine/pci_machdep.h> #include <prop/proplib.h> @@ -77,6 +82,7 @@ static void canonicalize_bootpath(void); void cpu_configure(void) { + rascons_add_rom_font(); init_interrupt(); canonicalize_bootpath();