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>
This commit is contained in:
Родитель
399fe2bdd3
Коммит
0458060c1c
|
@ -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. */
|
||||
|
|
|
@ -241,10 +241,6 @@ static void __init pSeries_setup_arch(void)
|
|||
find_and_init_phbs();
|
||||
eeh_init();
|
||||
|
||||
#ifdef CONFIG_DUMMY_CONSOLE
|
||||
conswitchp = &dummy_con;
|
||||
#endif
|
||||
|
||||
pSeries_nvram_init();
|
||||
|
||||
/* Choose an idle loop */
|
||||
|
|
Загрузка…
Ссылка в новой задаче