Module Name: src
Committed By: rin
Date: Sun Mar 7 09:43:57 UTC 2021
Modified Files:
src/sys/arch/evbppc/conf: files.explora
src/sys/arch/evbppc/explora: machdep.c
Log Message:
Revert this commit:
http://www.nerv.org/netbsd/?q=id:20210305T064016Z.410b0e33273c3a62110d09e8bb27939f6a8bab38
> Map framebuffer to virtual space when fb(4) is present,
> even if it is not console.
Direct mapping for framebuffer is required only if fb(4) is console.
XXX
It would be nice if we can remove reserved TLB entries after
fb(4) is properly attached.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbppc/conf/files.explora
cvs rdiff -u -r1.45 -r1.46 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.12 src/sys/arch/evbppc/conf/files.explora:1.13
--- src/sys/arch/evbppc/conf/files.explora:1.12 Fri Mar 5 06:40:15 2021
+++ src/sys/arch/evbppc/conf/files.explora Sun Mar 7 09:43:56 2021
@@ -1,4 +1,4 @@
-# $NetBSD: files.explora,v 1.12 2021/03/05 06:40:15 rin Exp $
+# $NetBSD: files.explora,v 1.13 2021/03/07 09:43:56 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 needs-flag
+file arch/evbppc/explora/dev/fb_elb.c fb_elb
Index: src/sys/arch/evbppc/explora/machdep.c
diff -u src/sys/arch/evbppc/explora/machdep.c:1.45 src/sys/arch/evbppc/explora/machdep.c:1.46
--- src/sys/arch/evbppc/explora/machdep.c:1.45 Fri Mar 5 07:06:15 2021
+++ src/sys/arch/evbppc/explora/machdep.c Sun Mar 7 09:43:56 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.45 2021/03/05 07:06:15 rin Exp $ */
+/* $NetBSD: machdep.c,v 1.46 2021/03/07 09:43:56 rin Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,12 +30,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2021/03/05 07:06:15 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.46 2021/03/07 09:43:56 rin Exp $");
#include "opt_explora.h"
#include "opt_modular.h"
-#include "fb_elb.h"
#include "ksyms.h"
#include <sys/param.h>
@@ -121,7 +120,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);
-#if NFB_ELB > 0
+#ifndef COM_IS_CONSOLE
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
