ppc64: Move init_boot_text call and conswitchp init into setup_arch

This way they get done in one place for all platforms, and it is
more consistent with what ppc32 does.

Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 8 insertions, 0 deletions

diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 97ffdcf09c03..0312422881ae 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -586,6 +586,10 @@ void __init setup_system(void)
          */
         finish_device_tree();
 
+#ifdef CONFIG_BOOTX_TEXT
+        init_boot_display();
+#endif
+
         /*
          * Initialize xmon
          */
@@ -1039,6 +1043,10 @@ void __init setup_arch(char **cmdline_p)
         /* initialize the syscall map in systemcfg */
         setup_syscall_map();
 
+#ifdef CONFIG_DUMMY_CONSOLE
+        conswitchp = &dummy_con;
+#endif
+
         ppc_md.setup_arch();
 
         /* Use the default idle loop if the platform hasn't provided one. */