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

Commit 667bc389 authored by David S. Miller's avatar David S. Miller
Browse files

[SPARC]: Kill 'prom_palette'. 



The idea of this thing is we could save/restore the firmware's
palette when breaking in and out of the firmware prompt.

Only one driver implemented this (atyfb) and it's value is
questionable.  If you're just debugging you don't really
care that the characters end up being purple or whatever.

And we can provide better debugging and firmware command
facilities with minimal in-kernel console I/O drivers.

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

arch/sparc/kernel/process.c

+0 −6
Original line number Diff line number Diff line
@@ -141,16 +141,12 @@ void cpu_idle(void) 


extern char reboot_command [];



extern void (*prom_palette)(int);



/* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */

void machine_halt(void)

{

	local_irq_enable();

	mdelay(8);

	local_irq_disable();

	if (prom_palette)

		prom_palette (1);

	prom_halt();

	panic("Halt failed!");

}
@@ -165,8 +161,6 @@ void machine_restart(char * cmd) 


	p = strchr (reboot_command, '\n');

	if (p) *p = 0;

	if (prom_palette)

		prom_palette (1);

	if (cmd)

		prom_reboot(cmd);

	if (*reboot_command)

arch/sparc/kernel/setup.c

+0 −3
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ struct screen_info screen_info = { 
 */



extern unsigned long trapbase;

void (*prom_palette)(int);



/* Pretty sick eh? */

void prom_sync_me(void)
@@ -80,8 +79,6 @@ void prom_sync_me(void) 
			     "nop\n\t"

			     "nop\n\t" : : "r" (&trapbase));



	if (prom_palette)

		prom_palette(1);

	prom_printf("PROM SYNC COMMAND...\n");

	show_free_areas();

	if(current->pid != 0) {

arch/sparc/prom/misc.c

+0 −7
Original line number Diff line number Diff line
@@ -45,9 +45,6 @@ prom_feval(char *fstring) 
	spin_unlock_irqrestore(&prom_lock, flags);

}



/* We want to do this more nicely some day. */

extern void (*prom_palette)(int);



/* Drop into the prom, with the chance to continue with the 'go'

 * prom command.

 */
@@ -58,8 +55,6 @@ prom_cmdline(void) 
	extern void install_linux_ticker(void);

	unsigned long flags;



	if (prom_palette)

		prom_palette (1);

	spin_lock_irqsave(&prom_lock, flags);

	install_obp_ticker();

	(*(romvec->pv_abort))();
@@ -69,8 +64,6 @@ prom_cmdline(void) 
#ifdef CONFIG_SUN_AUXIO

	set_auxio(AUXIO_LED, 0);

#endif

	if (prom_palette)

		prom_palette (0);

}



/* Drop into the prom, but completely terminate the program.

arch/sparc64/kernel/process.c

+0 −8
Original line number Diff line number Diff line
@@ -113,13 +113,9 @@ void cpu_idle(void) 


extern char reboot_command [];



extern void (*prom_palette)(int);



void machine_halt(void)

{

	sstate_halt();

	if (prom_palette)

		prom_palette (1);

	prom_halt();

	panic("Halt failed!");

}
@@ -127,8 +123,6 @@ void machine_halt(void) 
void machine_alt_power_off(void)

{

	sstate_poweroff();

	if (prom_palette)

		prom_palette(1);

	prom_halt_power_off();

	panic("Power-off failed!");

}
@@ -140,8 +134,6 @@ void machine_restart(char * cmd) 
	sstate_reboot();

	p = strchr (reboot_command, '\n');

	if (p) *p = 0;

	if (prom_palette)

		prom_palette (1);

	if (cmd)

		prom_reboot(cmd);

	if (*reboot_command)

arch/sparc64/kernel/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -68,8 +68,6 @@ struct screen_info screen_info = { 
	16                      /* orig-video-points */

};



void (*prom_palette)(int);



static void

prom_console_write(struct console *con, const char *s, unsigned n)

{