[SPARC64]: Always register a PROM based early console.

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index a246e962e5a73591d546d8d6c7ac2f950ad075d4..68964ddcde1e53bd5ce77207815cfe0bbc2068f3 100644 (file)
--- a/arch/sparc64/kernel/prom.c
+++ b/arch/sparc64/kernel/prom.c
@@ -1716,7 +1716,6 @@ static void __init of_console_init(void)
 
        of_console_device = dp;
 
-       prom_printf(msg, of_console_path);
        printk(msg, of_console_path);
 }
 

diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 5964d8653ade61bba45ebd492c02bf2b664502a9..ebad74bd88bb4fa7ed15f390f1dc73ce1a82a5dd 100644 (file)
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -83,10 +83,10 @@ unsigned int boot_flags = 0;
 /* Exported for mm/init.c:paging_init. */
 unsigned long cmdline_memory_size = 0;
 
-static struct console prom_debug_console = {
-       .name =         "debug",
+static struct console prom_early_console = {
+       .name =         "earlyprom",
        .write =        prom_console_write,
-       .flags =        CON_PRINTBUFFER,
+       .flags =        CON_PRINTBUFFER | CON_BOOT,
        .index =        -1,
 };
 
@@ -112,8 +112,7 @@ static void __init process_switch(char c)
                prom_halt();
                break;
        case 'p':
-               /* Use PROM debug console. */
-               register_console(&prom_debug_console);
+               /* Just ignore, this behavior is now the default.  */
                break;
        case 'P':
                /* Force UltraSPARC-III P-Cache on. */
@@ -296,6 +295,9 @@ void __init setup_arch(char **cmdline_p)
        *cmdline_p = prom_getbootargs();
        strcpy(boot_command_line, *cmdline_p);
 
+       boot_flags_init(*cmdline_p);
+       register_console(&prom_early_console);
+
        if (tlb_type == hypervisor)
                printk("ARCH: SUN4V\n");
        else
@@ -307,8 +309,6 @@ void __init setup_arch(char **cmdline_p)
        conswitchp = &prom_con;
 #endif
 
-       boot_flags_init(*cmdline_p);
-
        idprom_init();
 
        if (!root_flags)

diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 035c73243adcdcac78bfcc5b9fbaa32cc8045527..9e6bca266d88338df73baf4dd1079a5c17672b69 100644 (file)
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -618,9 +618,9 @@ static void __init inherit_prom_mappings(void)
        read_obp_translations();
 
        /* Now fixup OBP's idea about where we really are mapped. */
-       prom_printf("Remapping the kernel... ");
+       printk("Remapping the kernel... ");
        remap_kernel();
-       prom_printf("done.\n");
+       printk("done.\n");
 }
 
 void prom_world(int enter)
@@ -1414,7 +1414,7 @@ void __init paging_init(void)
                                    zholes_size);
        }
 
-       prom_printf("Booting Linux...\n");
+       printk("Booting Linux...\n");
 
        central_probe();
        cpu_probe();