Skip to content

Commit 09d3f3f

Browse files
davem330davem330
committed
sparc: Kill PROM console driver.
Many years ago when this driver was written, it had a use, but these days it's nothing but trouble and distributions should not enable it in any situation. Pretty much every console device a sparc machine could see has a bonafide real driver, making the PROM console hack unnecessary. If any new device shows up, we should write a driver instead of depending upon this crutch to save us. We've been able to take care of this even when no chip documentation exists (sunxvr500, sunxvr2500) so there are no excuses. Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 0cb583f commit 09d3f3f

File tree

10 files changed

+1
-640
lines changed

10 files changed

+1
-640
lines changed

‎Documentation/dontdiff

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@ piggy.gz
152152
piggyback
153153
pnmtologo
154154
ppc_defs.h*
155-
promcon_tbl.c
156155
pss_boot.h
157156
qconf
158157
raid6altivec*.c

‎arch/sparc/kernel/setup_32.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,6 @@ void __init setup_arch(char **cmdline_p)
268268

269269
#ifdef CONFIG_DUMMY_CONSOLE
270270
conswitchp = &dummy_con;
271-
#elif defined(CONFIG_PROM_CONSOLE)
272-
conswitchp = &prom_con;
273271
#endif
274272
boot_flags_init(*cmdline_p);
275273

‎arch/sparc/kernel/setup_64.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,6 @@ void __init setup_arch(char **cmdline_p)
295295

296296
#ifdef CONFIG_DUMMY_CONSOLE
297297
conswitchp = &dummy_con;
298-
#elif defined(CONFIG_PROM_CONSOLE)
299-
conswitchp = &prom_con;
300298
#endif
301299

302300
idprom_init();

‎drivers/char/vt.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2948,9 +2948,6 @@ int __init vty_init(const struct file_operations *console_fops)
29482948
panic("Couldn't register console driver\n");
29492949
kbd_init();
29502950
console_map_init();
2951-
#ifdef CONFIG_PROM_CONSOLE
2952-
prom_con_init();
2953-
#endif
29542951
#ifdef CONFIG_MDA_CONSOLE
29552952
mda_console_init();
29562953
#endif

‎drivers/video/console/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎drivers/video/console/Kconfig

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,9 @@ config SGI_NEWPORT_CONSOLE
6767

6868
# bool 'IODC console' CONFIG_IODC_CONSOLE
6969

70-
config PROM_CONSOLE
71-
bool "PROM console"
72-
depends on SPARC
73-
help
74-
Say Y to build a console driver for Sun machines that uses the
75-
terminal emulation built into their console PROMS.
76-
7770
config DUMMY_CONSOLE
7871
bool
79-
depends on PROM_CONSOLE!=y || VGA_CONSOLE!=y || SGI_NEWPORT_CONSOLE!=y
72+
depends on VGA_CONSOLE!=y || SGI_NEWPORT_CONSOLE!=y
8073
default y
8174

8275
config DUMMY_CONSOLE_COLUMNS

‎drivers/video/console/Makefile

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ font-objs += $(font-objs-y)
2222

2323
obj-$(CONFIG_DUMMY_CONSOLE) += dummycon.o
2424
obj-$(CONFIG_SGI_NEWPORT_CONSOLE) += newport_con.o font.o
25-
obj-$(CONFIG_PROM_CONSOLE) += promcon.o promcon_tbl.o
2625
obj-$(CONFIG_STI_CONSOLE) += sticon.o sticore.o font.o
2726
obj-$(CONFIG_VGA_CONSOLE) += vgacon.o
2827
obj-$(CONFIG_MDA_CONSOLE) += mdacon.o
@@ -40,14 +39,3 @@ obj-$(CONFIG_FB_STI) += sticore.o font.o
4039
ifeq ($(CONFIG_USB_SISUSBVGA_CON),y)
4140
obj-$(CONFIG_USB_SISUSBVGA) += font.o
4241
endif
43-
44-
# Targets that kbuild needs to know about
45-
targets := promcon_tbl.c
46-
47-
quiet_cmd_conmakehash = CNMKHSH $@
48-
cmd_conmakehash = scripts/conmakehash $< | \
49-
sed -e '/\#include <[^>]*>/p' -e 's/types/init/' \
50-
-e 's/dfont\(_uni.*\]\)/promfont\1 /' > $@
51-
52-
$(obj)/promcon_tbl.c: $(src)/prom.uni
53-
$(call cmd,conmakehash)

‎drivers/video/console/prom.uni

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)