powerpc: Simplify and clean up the xmon terminal I/O

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / setup_32.c

diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index b45eedbb4b3a53ec439698ca3f7b115ad2ae87be..0fbc73f7f8280bb48fd02740f960d5a2c5cdd671 100644 (file)
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -286,6 +286,7 @@ void __init setup_arch(char **cmdline_p)
        loops_per_jiffy = 500000000 / HZ;
 
        unflatten_device_tree();
+       check_for_initrd();
        finish_device_tree();
 
        smp_setup_cpu_maps();
@@ -302,14 +303,9 @@ void __init setup_arch(char **cmdline_p)
                pmac_feature_init();    /* New cool way */
 #endif
 
-#ifdef CONFIG_XMON
-       xmon_map_scc();
-       if (strstr(cmd_line, "xmon")) {
-               xmon_init(1);
-               debugger(NULL);
-       }
-#endif /* CONFIG_XMON */
-       if ( ppc_md.progress ) ppc_md.progress("setup_arch: enter", 0x3eab);
+#ifdef CONFIG_XMON_DEFAULT
+       xmon_init(1);
+#endif
 
 #if defined(CONFIG_KGDB)
        if (ppc_md.kgdb_map_scc)