diff --git a/sys/arch/hpcmips/conf/TX3912 b/sys/arch/hpcmips/conf/TX3912
index 4535343dd2ae..4c57feeb7605 100644
--- a/sys/arch/hpcmips/conf/TX3912
+++ b/sys/arch/hpcmips/conf/TX3912
@@ -2,7 +2,7 @@
 # Distribution kernel (TX3912 based model) kernel config file
 
 #
-#	$NetBSD: TX3912,v 1.12 2000/03/12 15:28:12 uch Exp $
+#	$NetBSD: TX3912,v 1.13 2000/03/13 18:49:15 uch Exp $
 #
 include		"arch/hpcmips/conf/std.hpcmips"
 
@@ -116,8 +116,9 @@ ucbio*		at	ucb?
 ucbioport*	at	ucbio? platform COMPAQ_C_810 id BTN_LIGHT port 5
 
 # WS console uses SUN or VT100 terminal emulation
-fb*		at	tx3912video?
-wsdisplay*	at	fb?
+bivideo*	at	tx3912video?
+hpcfb*		at	bivideo?
+wsdisplay*	at	hpcfb?
 wskbd*		at	skbd? mux 1
 wsmouse*	at	ucbtp? mux 0
 btnmgr0		at	mainbus0
diff --git a/sys/arch/hpcmips/conf/TX3922 b/sys/arch/hpcmips/conf/TX3922
index 7cb08490a1e7..7238292e1a12 100644
--- a/sys/arch/hpcmips/conf/TX3922
+++ b/sys/arch/hpcmips/conf/TX3922
@@ -2,7 +2,7 @@
 # Distribution kernel (TX3922 based model) kernel config file
 
 #
-#	$NetBSD: TX3922,v 1.9 2000/03/12 15:28:12 uch Exp $
+#	$NetBSD: TX3922,v 1.10 2000/03/13 18:49:15 uch Exp $
 #
 include		"arch/hpcmips/conf/std.hpcmips"
 
@@ -110,8 +110,9 @@ plumpcmcia*	at	plum?
 #include	"arch/hpcmips/conf/usb.plum2"
 
 # WS console uses SUN or VT100 terminal emulation
-fb*		at	plumvideo?
-wsdisplay*	at	fb?
+bivideo*	at	plumvideo?
+hpcfb*		at	bivideo?
+wsdisplay*	at	hpcfb?
 wskbd*		at	skbd? mux 1
 btnmgr0		at	mainbus0
 wskbd*		at	btnmgr0 mux 1
diff --git a/sys/arch/hpcmips/dev/bivideo.c b/sys/arch/hpcmips/dev/bivideo.c
index 546ab133694f..68941716f7a3 100644
--- a/sys/arch/hpcmips/dev/bivideo.c
+++ b/sys/arch/hpcmips/dev/bivideo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: bivideo.c,v 1.2 2000/03/12 11:46:44 takemura Exp $	*/
+/*	$NetBSD: bivideo.c,v 1.3 2000/03/13 18:49:17 uch Exp $	*/
 
 /*-
  * Copyright (c) 1999
@@ -37,7 +37,7 @@
 static const char _copyright[] __attribute__ ((unused)) =
     "Copyright (c) 1999 Shin Takemura.  All rights reserved.";
 static const char _rcsid[] __attribute__ ((unused)) =
-    "$Id: bivideo.c,v 1.2 2000/03/12 11:46:44 takemura Exp $";
+    "$Id: bivideo.c,v 1.3 2000/03/13 18:49:17 uch Exp $";
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -102,13 +102,6 @@ bivideomatch(parent, match, aux)
 	if (strcmp(ma->ma_name, match->cf_driver->cd_name))
 		return 0;
 
-	/*
-	 * Platforms which have TX CPU don't need this device.
-	 */
-	if (platid_match(&platid, &platid_mask_CPU_MIPS_VR_41XX) == 0) {
-		return 0;
-	}
-
 	return (1);
 }
 
@@ -121,7 +114,7 @@ bivideoattach(parent, self, aux)
 	struct hpcfb_attach_args ha;
 
 	if (attach_flag) {
-		panic("%s(%d): bivideo attached twice");
+		panic("%s(%d): bivideo attached twice", __FILE__, __LINE__);
 	}
 	attach_flag = 1;
 
diff --git a/sys/arch/hpcmips/dev/plumvideo.c b/sys/arch/hpcmips/dev/plumvideo.c
index e31c49b7eb7b..12c4c7d53d26 100644
--- a/sys/arch/hpcmips/dev/plumvideo.c
+++ b/sys/arch/hpcmips/dev/plumvideo.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: plumvideo.c,v 1.3 2000/02/26 15:16:19 uch Exp $ */
+/*	$NetBSD: plumvideo.c,v 1.4 2000/03/13 18:49:17 uch Exp $ */
 
 /*
  * Copyright (c) 1999, 2000, by UCHIYAMA Yasushi
@@ -27,8 +27,7 @@
  */
 
 #include "opt_tx39_debug.h"
-#include "biconsdev.h"
-#include "fb.h"
+#include "hpcfb.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -47,16 +46,12 @@
 
 #include <machine/bootinfo.h>
 
-#if NBICONSDEV > 0
-#include <hpcmips/dev/biconsvar.h>
-#include <hpcmips/dev/bicons.h>
-#endif
-
-#if NFB > 0
-#include <dev/rcons/raster.h>
-#include <dev/wscons/wsdisplayvar.h>
-#include <arch/hpcmips/dev/fbvar.h>
+#if NHPCFB > 0
+#include <arch/hpcmips/dev/hpcfbvar.h>
+#include <arch/hpcmips/dev/hpcfbio.h>
+#include <arch/hpcmips/dev/bivideovar.h>
 #endif
+#include <machine/autoconf.h> /* XXX */
 
 #ifdef PLUMVIDEODEBUG
 int	plumvideo_debug = 1;
@@ -113,7 +108,7 @@ plumvideo_attach(parent, self, aux)
 {
 	struct plum_attach_args *pa = aux;
 	struct plumvideo_softc *sc = (void*)self;
-	struct fb_attach_args fba;
+	struct mainbus_attach_args ma; /* XXX */
 
 	sc->sc_pc	= pa->pa_pc;
 	sc->sc_regt	= pa->pa_regt;
@@ -170,13 +165,13 @@ plumvideo_attach(parent, self, aux)
 		plumvideo_dump(sc);
 #endif
 
-#if NFB > 0
-	if(!cn_tab && fb_cnattach(0, 0, 0, 0)) {
+#if NHPCFB > 0
+	if(!cn_tab && hpcfb_cnattach(0, 0, 0, 0)) {
 		panic("plumvideo_attach: can't init fb console");
 	}
 	/* Attach frame buffer device */
-	fba.fba_name = "fb";
-	config_found(self, &fba, plumvideo_print);
+	ma.ma_name = "bivideo"; /* XXX */
+	config_found(self, &ma, plumvideo_print);
 #endif
 }
 
@@ -212,11 +207,6 @@ plumvideo_bootinforefil(sc)
 	}
 	
 	bootinfo->fb_addr = (unsigned char *)ioh;
-
-#if NBICONSDEV > 0
-	/* re-install */
-	bicons_init();
-#endif
 }
 
 #ifdef PLUMVIDEODEBUG
diff --git a/sys/arch/hpcmips/tx/tx3912video.c b/sys/arch/hpcmips/tx/tx3912video.c
index 1fd33f73c7ec..3bd2e8c65732 100644
--- a/sys/arch/hpcmips/tx/tx3912video.c
+++ b/sys/arch/hpcmips/tx/tx3912video.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: tx3912video.c,v 1.7 2000/01/07 15:10:50 uch Exp $ */
+/*	$NetBSD: tx3912video.c,v 1.8 2000/03/13 18:49:17 uch Exp $ */
 
 /*
  * Copyright (c) 1999, 2000, by UCHIYAMA Yasushi
@@ -26,7 +26,7 @@
  *
  */
 #include "opt_tx39_debug.h"
-#include "fb.h"
+#include "hpcfb.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -40,11 +40,12 @@
 #include <hpcmips/tx/tx3912videovar.h>
 #include <hpcmips/tx/tx3912videoreg.h>
 
-#if NFB > 0
-#include <dev/rcons/raster.h>
-#include <dev/wscons/wsdisplayvar.h>
-#include <arch/hpcmips/dev/fbvar.h>
+#if NHPCFB > 0
+#include <arch/hpcmips/dev/hpcfbvar.h>
+#include <arch/hpcmips/dev/hpcfbio.h>
+#include <arch/hpcmips/dev/bivideovar.h>
 #endif
+#include <machine/autoconf.h> /* XXX */
 
 #undef TX3912VIDEO_DEBUG
 
@@ -110,7 +111,7 @@ tx3912video_attach(parent, self, aux)
 	struct txsim_attach_args *ta = aux;
 	struct tx3912video_softc *sc = (void*)self;
 	tx_chipset_tag_t tc = ta->ta_tc;
-	struct fb_attach_args fba;
+	struct mainbus_attach_args ma; /* XXX */
 	txreg_t reg;
 
 	sc->sc_chip = &tx3912video_chip;
@@ -136,14 +137,14 @@ tx3912video_attach(parent, self, aux)
 	tx3912video_attach_drawfunc(sc->sc_chip);
 
 	/* Attach frame buffer device */
-#if NFB > 0
+#if NHPCFB > 0
 	if (!(bootinfo->bi_cnuse & BI_CNUSE_SERIAL)) {
-		if (fb_cnattach(0, 0, 0, 0)) {
+		if (hpcfb_cnattach(0, 0, 0, 0)) {
 			panic("tx3912video_attach: can't init fb console");
 		}
 	}
-	fba.fba_name = "fb";
-	config_found(self, &fba, tx3912video_print);
+	ma.ma_name = "bivideo"; /* XXX */
+	config_found(self, &ma, tx3912video_print);
 #endif
 }