Index: kernel/arch/sparc64/src/console.c
===================================================================
--- kernel/arch/sparc64/src/console.c	(revision da747470c430a8c8b5e0ad34a1485ec2d5f3e0cb)
+++ kernel/arch/sparc64/src/console.c	(revision 287920fbf506e950a6b1035b8520eeaf673338bf)
@@ -38,6 +38,13 @@
 #include <genarch/fb/fb.h>
 #include <arch/drivers/fb.h>
-#include <arch/drivers/i8042.h>
-#include <genarch/i8042/i8042.h>
+
+#include <arch/drivers/kbd.h>
+#ifdef CONFIG_Z8530
+#include <genarch/kbd/z8530.h>
+#endif
+#ifdef CONFIG_16550A
+#include <genarch/kbd/16550a.h>
+#endif
+
 #include <console/chardev.h>
 #include <console/console.h>
@@ -72,5 +79,10 @@
 		
 	while (1) {
-		i8042_poll();		
+#ifdef CONFIG_Z8530
+		z8530_poll();
+#endif
+#ifdef CONFIG_16550A
+		16550a_poll();
+#endif
 		thread_usleep(KEYBOARD_POLL_PAUSE);
 	}
Index: kernel/arch/sparc64/src/drivers/kbd.c
===================================================================
--- kernel/arch/sparc64/src/drivers/kbd.c	(revision da747470c430a8c8b5e0ad34a1485ec2d5f3e0cb)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision 287920fbf506e950a6b1035b8520eeaf673338bf)
@@ -33,4 +33,5 @@
  */
 
+#include <arch/drivers/kbd.h>
 #ifdef CONFIG_Z8530
 #include <genarch/kbd/z8530.h>
@@ -39,8 +40,10 @@
 #include <genarch/kbd/16650a.h>
 #endif
+
 #include <arch/boot/boot.h>
 #include <arch/mm/page.h>
 #include <arch/types.h>
 #include <typedefs.h>
+#include <align.h>
 
 volatile uint8_t *kbd_virt_address = NULL;
@@ -50,4 +53,7 @@
 	size_t offset;
 	uintptr_t aligned_addr;
+
+	/* FIXME: supply value read from OpenFirmware */
+	bootinfo.keyboard.size = 8;
 
 	/*
Index: kernel/arch/sparc64/src/mm/tlb.c
===================================================================
--- kernel/arch/sparc64/src/mm/tlb.c	(revision da747470c430a8c8b5e0ad34a1485ec2d5f3e0cb)
+++ kernel/arch/sparc64/src/mm/tlb.c	(revision 287920fbf506e950a6b1035b8520eeaf673338bf)
@@ -48,7 +48,4 @@
 #include <symtab.h>
 
-#include <arch/drivers/fb.h>
-#include <arch/drivers/i8042.h>
-
 char *context_encoding[] = {
 	"Primary",
@@ -61,6 +58,5 @@
 {
 	/*
-	 * TLBs are actually initialized by
-	 * take_over_tlb_and_tt() early
+	 * TLBs are actually initialized early
 	 * in start.S.
 	 */