Module Name: src
Committed By: rin
Date: Fri Mar 5 06:40:16 UTC 2021
Modified Files:
src/sys/arch/evbppc/conf: files.explora
src/sys/arch/evbppc/explora: machdep.c
Log Message:
Map framebuffer to virtual space when fb(4) is present,
even if it is not console.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbppc/conf/files.explora
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbppc/explora/machdep.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/evbppc/conf/files.explora
diff -u src/sys/arch/evbppc/conf/files.explora:1.11 src/sys/arch/evbppc/conf/files.explora:1.12
--- src/sys/arch/evbppc/conf/files.explora:1.11 Fri Mar 5 06:26:56 2021
+++ src/sys/arch/evbppc/conf/files.explora Fri Mar 5 06:40:15 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.explora,v 1.11 2021/03/05 06:26:56 rin Exp $
+# $NetBSD: files.explora,v 1.12 2021/03/05 06:40:15 rin Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -50,4 +50,4 @@ file arch/evbppc/explora/dev/pckbc_elb.c
device fb: wsemuldisplaydev, rasops8
attach fb at elb with fb_elb
-file arch/evbppc/explora/dev/fb_elb.c fb_elb
+file arch/evbppc/explora/dev/fb_elb.c fb_elb needs-flag
Index: src/sys/arch/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.43 src/sys/arch/evbppc/explora/machdep.c:1.44
--- src/sys/arch/evbppc/explora/machdep.c:1.43 Fri Mar 5 06:30:45 2021
+++ src/sys/arch/evbppc/explora/machdep.c Fri Mar 5 06:40:15 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.43 2021/03/05 06:30:45 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.44 2021/03/05 06:40:15 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,10 +30,12 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.43 2021/03/05 06:30:45 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.44 2021/03/05 06:40:15 rin Exp $");
#include "opt_explora.h"
#include "opt_modular.h"
+
+#include "fb_elb.h"
#include "ksyms.h"
#include <sys/param.h>
@@ -119,7 +121,7 @@ initppc(vaddr_t startkernel, vaddr_t end
/* Map PCKBC, PCKBC2, COM, LPT. This is far beyond physmem. */
ppc4xx_tlb_reserve(BASE_ISA, BASE_ISA, TLB_PG_SIZE, TLB_I | TLB_G);
-#ifndef COM_IS_CONSOLE
+#if NFB_ELB > 0
ppc4xx_tlb_reserve(BASE_FB, BASE_FB, TLB_PG_SIZE, TLB_I | TLB_G);
ppc4xx_tlb_reserve(BASE_FB2, BASE_FB2, TLB_PG_SIZE, TLB_I | TLB_G);
#endif
