Index: kernel/kernel.config
===================================================================
--- kernel/kernel.config	(revision 2b17f47a12be0ade0b8cfd4a26a738c33c7d2336)
+++ kernel/kernel.config	(revision 1f0d2ee9eb86b0f6395841b771d76d9444ffb9be)
@@ -85,11 +85,6 @@
 ! [ARCH=mips32] MACHINE (choice)
 
-# Machine type
-@ "gxemul_testarm" GXEmul testarm
-! [ARCH=arm32] MACHINE (choice)
-
-
 # Framebuffer support
-! [(ARCH=mips32&MACHINE=lgxemul)|(ARCH=mips32&MACHINE=bgxemul)|(ARCH=ia32)|(ARCH=amd64)|(ARCH=arm32&MACHINE=gxemul_testarm)] CONFIG_FB (y/n)
+! [(ARCH=mips32&MACHINE=lgxemul)|(ARCH=mips32&MACHINE=bgxemul)|(ARCH=ia32)|(ARCH=amd64)|(ARCH=arm32)] CONFIG_FB (y/n)
 
 # Framebuffer width
@@ -157,4 +152,7 @@
 ! CONFIG_DEBUG (y/n)
 
+# Extensive debugging output
+! [CONFIG_DEBUG=y] CONFIG_EDEBUG (n/y)
+
 # Deadlock detection support for spinlocks
 ! [CONFIG_DEBUG=y&CONFIG_SMP=y] CONFIG_DEBUG_SPINLOCK (y/n)