Index: kernel/arch/mips32/src/cpu/cpu.c
===================================================================
--- kernel/arch/mips32/src/cpu/cpu.c	(revision 965dc18d04fb8a15431d34485959f4aa8e6ec4b5)
+++ kernel/arch/mips32/src/cpu/cpu.c	(revision 6e71a9d850aa09eec22b6f079fae6deae5f8cd51)
@@ -49,5 +49,5 @@
 	{ "MIPS", "R3000" },		/* 0x02 */
 	{ "MIPS", "R6000" },		/* 0x03 */
-	{ "MIPS", " R4000/R4400" }, 	/* 0x04 */
+	{ "MIPS", "R4000/R4400" }, 	/* 0x04 */
 	{ "LSI Logic", "R3000" },	/* 0x05 */
 	{ "MIPS", "R6000A" },		/* 0x06 */
@@ -124,7 +124,7 @@
 	}
 
-	printf("cpu%d: %s %s (rev=%d.%d, imp=%d)\n",
+	printf("cpu%u: %s %s (rev=%d.%d, imp=%d)\n",
 		m->id, data->vendor, data->model, m->arch.rev_num >> 4, 
-		m->arch.rev_num & 0xf, m->arch.imp_num);
+		m->arch.rev_num & 0x0f, m->arch.imp_num);
 }
 
Index: kernel/arch/mips32/src/debugger.c
===================================================================
--- kernel/arch/mips32/src/debugger.c	(revision 965dc18d04fb8a15431d34485959f4aa8e6ec4b5)
+++ kernel/arch/mips32/src/debugger.c	(revision 6e71a9d850aa09eec22b6f079fae6deae5f8cd51)
@@ -47,4 +47,6 @@
 bpinfo_t breakpoints[BKPOINTS_MAX];
 SPINLOCK_INITIALIZE(bkpoint_lock);
+
+#ifdef CONFIG_KCONSOLE
 
 static int cmd_print_breakpoints(cmd_arg_t *argv);
@@ -124,8 +126,10 @@
 };
 
+
 /** Test, if the given instruction is a jump or branch instruction
  *
  * @param instr Instruction code
  * @return true - it is jump instruction, false otherwise
+ *
  */
 static bool is_jump(unative_t instr)
@@ -268,4 +272,6 @@
 }
 
+#endif
+
 /** Initialize debugger */
 void debugger_init()
@@ -275,20 +281,22 @@
 	for (i = 0; i < BKPOINTS_MAX; i++)
 		breakpoints[i].address = NULL;
-	
+
+#ifdef CONFIG_KCONSOLE
 	cmd_initialize(&bkpts_info);
 	if (!cmd_register(&bkpts_info))
-		panic("could not register command %s\n", bkpts_info.name);
+		printf("Cannot register command %s\n", bkpts_info.name);
 
 	cmd_initialize(&delbkpt_info);
 	if (!cmd_register(&delbkpt_info))
-		panic("could not register command %s\n", delbkpt_info.name);
+		printf("Cannot register command %s\n", delbkpt_info.name);
 
 	cmd_initialize(&addbkpt_info);
 	if (!cmd_register(&addbkpt_info))
-		panic("could not register command %s\n", addbkpt_info.name);
+		printf("Cannot register command %s\n", addbkpt_info.name);
 
 	cmd_initialize(&addbkpte_info);
 	if (!cmd_register(&addbkpte_info))
-		panic("could not register command %s\n", addbkpte_info.name);
+		printf("Cannot register command %s\n", addbkpte_info.name);
+#endif
 }
 
@@ -368,5 +376,5 @@
 			cur->bkfunc(cur, istate);
 	} else {
-		printf("***Type 'exit' to exit kconsole.\n");
+#ifdef CONFIG_KCONSOLE
 		/* This disables all other processors - we are not SMP,
 		 * actually this gets us to cpu_halt, if scheduler() is run
@@ -374,11 +382,12 @@
 		 *   so this is a good idea
 		 */	
-		atomic_set(&haltstate,1);
+		atomic_set(&haltstate, 1);
 		spinlock_unlock(&bkpoint_lock);
-
-		kconsole("debug");
-
+		
+		kconsole("debug", "Debug console ready (type 'exit' to continue)\n", false);
+		
 		spinlock_lock(&bkpoint_lock);
-		atomic_set(&haltstate,0);
+		atomic_set(&haltstate, 0);
+#endif
 	}
 	if (cur && cur->address == fireaddr && (cur->flags & BKPOINT_INPROG)) {
Index: kernel/arch/mips32/src/exception.c
===================================================================
--- kernel/arch/mips32/src/exception.c	(revision 965dc18d04fb8a15431d34485959f4aa8e6ec4b5)
+++ kernel/arch/mips32/src/exception.c	(revision 6e71a9d850aa09eec22b6f079fae6deae5f8cd51)
@@ -46,5 +46,4 @@
 #include <interrupt.h>
 #include <func.h>
-#include <console/kconsole.h>
 #include <ddi/irq.h>
 #include <arch/debugger.h>