diff options
author | David S. Miller <davem@davemloft.net> | 2008-02-18 18:28:16 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-02-18 18:28:16 -0500 |
commit | 667bc389c716389795c6cfa145ab5ef6279fbb62 (patch) | |
tree | 53a240acf9e4eef42cec6de3c8324f04cbc0c094 /arch/sparc | |
parent | 30b3cfe1f67550bb6ec6868507a78060ef98269a (diff) |
[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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc')
-rw-r--r-- | arch/sparc/kernel/process.c | 6 | ||||
-rw-r--r-- | arch/sparc/kernel/setup.c | 3 | ||||
-rw-r--r-- | arch/sparc/prom/misc.c | 7 |
3 files changed, 0 insertions, 16 deletions
diff --git a/arch/sparc/kernel/process.c b/arch/sparc/kernel/process.c index 19186ce8850d..0bd69d0b5cd7 100644 --- a/arch/sparc/kernel/process.c +++ b/arch/sparc/kernel/process.c | |||
@@ -141,16 +141,12 @@ void cpu_idle(void) | |||
141 | 141 | ||
142 | extern char reboot_command []; | 142 | extern char reboot_command []; |
143 | 143 | ||
144 | extern void (*prom_palette)(int); | ||
145 | |||
146 | /* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */ | 144 | /* XXX cli/sti -> local_irq_xxx here, check this works once SMP is fixed. */ |
147 | void machine_halt(void) | 145 | void machine_halt(void) |
148 | { | 146 | { |
149 | local_irq_enable(); | 147 | local_irq_enable(); |
150 | mdelay(8); | 148 | mdelay(8); |
151 | local_irq_disable(); | 149 | local_irq_disable(); |
152 | if (prom_palette) | ||
153 | prom_palette (1); | ||
154 | prom_halt(); | 150 | prom_halt(); |
155 | panic("Halt failed!"); | 151 | panic("Halt failed!"); |
156 | } | 152 | } |
@@ -165,8 +161,6 @@ void machine_restart(char * cmd) | |||
165 | 161 | ||
166 | p = strchr (reboot_command, '\n'); | 162 | p = strchr (reboot_command, '\n'); |
167 | if (p) *p = 0; | 163 | if (p) *p = 0; |
168 | if (prom_palette) | ||
169 | prom_palette (1); | ||
170 | if (cmd) | 164 | if (cmd) |
171 | prom_reboot(cmd); | 165 | prom_reboot(cmd); |
172 | if (*reboot_command) | 166 | if (*reboot_command) |
diff --git a/arch/sparc/kernel/setup.c b/arch/sparc/kernel/setup.c index 5f1508eeb84d..3c13137685da 100644 --- a/arch/sparc/kernel/setup.c +++ b/arch/sparc/kernel/setup.c | |||
@@ -65,7 +65,6 @@ struct screen_info screen_info = { | |||
65 | */ | 65 | */ |
66 | 66 | ||
67 | extern unsigned long trapbase; | 67 | extern unsigned long trapbase; |
68 | void (*prom_palette)(int); | ||
69 | 68 | ||
70 | /* Pretty sick eh? */ | 69 | /* Pretty sick eh? */ |
71 | void prom_sync_me(void) | 70 | void prom_sync_me(void) |
@@ -80,8 +79,6 @@ void prom_sync_me(void) | |||
80 | "nop\n\t" | 79 | "nop\n\t" |
81 | "nop\n\t" : : "r" (&trapbase)); | 80 | "nop\n\t" : : "r" (&trapbase)); |
82 | 81 | ||
83 | if (prom_palette) | ||
84 | prom_palette(1); | ||
85 | prom_printf("PROM SYNC COMMAND...\n"); | 82 | prom_printf("PROM SYNC COMMAND...\n"); |
86 | show_free_areas(); | 83 | show_free_areas(); |
87 | if(current->pid != 0) { | 84 | if(current->pid != 0) { |
diff --git a/arch/sparc/prom/misc.c b/arch/sparc/prom/misc.c index 37cff5f54704..d9fb3af41c1f 100644 --- a/arch/sparc/prom/misc.c +++ b/arch/sparc/prom/misc.c | |||
@@ -45,9 +45,6 @@ prom_feval(char *fstring) | |||
45 | spin_unlock_irqrestore(&prom_lock, flags); | 45 | spin_unlock_irqrestore(&prom_lock, flags); |
46 | } | 46 | } |
47 | 47 | ||
48 | /* We want to do this more nicely some day. */ | ||
49 | extern void (*prom_palette)(int); | ||
50 | |||
51 | /* Drop into the prom, with the chance to continue with the 'go' | 48 | /* Drop into the prom, with the chance to continue with the 'go' |
52 | * prom command. | 49 | * prom command. |
53 | */ | 50 | */ |
@@ -58,8 +55,6 @@ prom_cmdline(void) | |||
58 | extern void install_linux_ticker(void); | 55 | extern void install_linux_ticker(void); |
59 | unsigned long flags; | 56 | unsigned long flags; |
60 | 57 | ||
61 | if (prom_palette) | ||
62 | prom_palette (1); | ||
63 | spin_lock_irqsave(&prom_lock, flags); | 58 | spin_lock_irqsave(&prom_lock, flags); |
64 | install_obp_ticker(); | 59 | install_obp_ticker(); |
65 | (*(romvec->pv_abort))(); | 60 | (*(romvec->pv_abort))(); |
@@ -69,8 +64,6 @@ prom_cmdline(void) | |||
69 | #ifdef CONFIG_SUN_AUXIO | 64 | #ifdef CONFIG_SUN_AUXIO |
70 | set_auxio(AUXIO_LED, 0); | 65 | set_auxio(AUXIO_LED, 0); |
71 | #endif | 66 | #endif |
72 | if (prom_palette) | ||
73 | prom_palette (0); | ||
74 | } | 67 | } |
75 | 68 | ||
76 | /* Drop into the prom, but completely terminate the program. | 69 | /* Drop into the prom, but completely terminate the program. |