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

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

2 files changed, 7 insertions, 8 deletions

diff --git a/arch/sparc64/kernel/prom.c b/arch/sparc64/kernel/prom.c
index a246e962e5a7..68964ddcde1e 100644
--- 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 5964d8653ade..ebad74bd88bb 100644
--- 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)