[src/trunk]: src/sys/arch/evbppc Map framebuffer to virtual space when fb(4) ...

[rin <rin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/64fda39b2738
branches:  trunk
changeset: 953298:64fda39b2738
user:      rin <rin%NetBSD.org@localhost>
date:      Fri Mar 05 06:40:15 2021 +0000

description:
Map framebuffer to virtual space when fb(4) is present,
even if it is not console.

diffstat:

 sys/arch/evbppc/conf/files.explora |  4 ++--
 sys/arch/evbppc/explora/machdep.c  |  8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diffs (47 lines):

diff -r 3cabba9a62b6 -r 64fda39b2738 sys/arch/evbppc/conf/files.explora
--- a/sys/arch/evbppc/conf/files.explora        Fri Mar 05 06:30:45 2021 +0000
+++ b/sys/arch/evbppc/conf/files.explora        Fri Mar 05 06:40:15 2021 +0000
@@ -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 @@
 
 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
diff -r 3cabba9a62b6 -r 64fda39b2738 sys/arch/evbppc/explora/machdep.c
--- a/sys/arch/evbppc/explora/machdep.c Fri Mar 05 06:30:45 2021 +0000
+++ b/sys/arch/evbppc/explora/machdep.c Fri Mar 05 06:40:15 2021 +0000
@@ -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 @@
        /* 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