Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c62a2d3 authored by David S. Miller's avatar David S. Miller
Browse files

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



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6095a51

arch/sparc64/kernel/prom.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -1716,7 +1716,6 @@ static void __init of_console_init(void) 




	of_console_device = dp;

	of_console_device = dp;





	prom_printf(msg, of_console_path);

	printk(msg, of_console_path);

	printk(msg, of_console_path);

}

}

arch/sparc64/kernel/setup.c

+7 −7
Original line number Original line Diff line number Diff line
@@ -83,10 +83,10 @@ unsigned int boot_flags = 0; 
/* Exported for mm/init.c:paging_init. */

/* Exported for mm/init.c:paging_init. */

unsigned long cmdline_memory_size = 0;

unsigned long cmdline_memory_size = 0;





static struct console prom_debug_console = {

static struct console prom_early_console = {

	.name =		"debug",

	.name =		"earlyprom",

	.write =	prom_console_write,

	.write =	prom_console_write,

	.flags =	CON_PRINTBUFFER,

	.flags =	CON_PRINTBUFFER | CON_BOOT,

	.index =	-1,

	.index =	-1,

};

};
@@ -112,8 +112,7 @@ static void __init process_switch(char c) 
		prom_halt();

		prom_halt();

		break;

		break;

	case 'p':

	case 'p':

		/* Use PROM debug console. */

		/* Just ignore, this behavior is now the default.  */

		register_console(&prom_debug_console);

		break;

		break;

	case 'P':

	case 'P':

		/* Force UltraSPARC-III P-Cache on. */

		/* Force UltraSPARC-III P-Cache on. */
@@ -296,6 +295,9 @@ void __init setup_arch(char **cmdline_p) 
	*cmdline_p = prom_getbootargs();

	*cmdline_p = prom_getbootargs();

	strcpy(boot_command_line, *cmdline_p);

	strcpy(boot_command_line, *cmdline_p);





	boot_flags_init(*cmdline_p);

	register_console(&prom_early_console);



	if (tlb_type == hypervisor)

	if (tlb_type == hypervisor)

		printk("ARCH: SUN4V\n");

		printk("ARCH: SUN4V\n");

	else

	else
@@ -307,8 +309,6 @@ void __init setup_arch(char **cmdline_p) 
	conswitchp = &prom_con;

	conswitchp = &prom_con;

#endif

#endif





	boot_flags_init(*cmdline_p);



	idprom_init();

	idprom_init();





	if (!root_flags)

	if (!root_flags)

arch/sparc64/mm/init.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -618,9 +618,9 @@ static void __init inherit_prom_mappings(void) 
	read_obp_translations();

	read_obp_translations();





	/* Now fixup OBP's idea about where we really are mapped. */

	/* Now fixup OBP's idea about where we really are mapped. */

	prom_printf("Remapping the kernel... ");

	printk("Remapping the kernel... ");

	remap_kernel();

	remap_kernel();

	prom_printf("done.\n");

	printk("done.\n");

}

}





void prom_world(int enter)

void prom_world(int enter)
@@ -1414,7 +1414,7 @@ void __init paging_init(void) 
				    zholes_size);

				    zholes_size);

	}

	}





	prom_printf("Booting Linux...\n");

	printk("Booting Linux...\n");





	central_probe();

	central_probe();

	cpu_probe();

	cpu_probe();