Skip to content

Commit

Permalink
sparc: Kill PROM console driver.
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
davem330 committed Sep 16, 2009
1 parent 0cb583f commit 09d3f3f
Show file tree
Hide file tree
Showing 10 changed files with 1 addition and 640 deletions.
1 change: 0 additions & 1 deletion Documentation/dontdiff
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ piggy.gz
piggyback
pnmtologo
ppc_defs.h*
promcon_tbl.c
pss_boot.h
qconf
raid6altivec*.c
Expand Down
2 changes: 0 additions & 2 deletions arch/sparc/kernel/setup_32.c
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,6 @@ void __init setup_arch(char **cmdline_p)

#ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con;
#elif defined(CONFIG_PROM_CONSOLE)
conswitchp = &prom_con;
#endif
boot_flags_init(*cmdline_p);

Expand Down
2 changes: 0 additions & 2 deletions arch/sparc/kernel/setup_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -295,8 +295,6 @@ void __init setup_arch(char **cmdline_p)

#ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con;
#elif defined(CONFIG_PROM_CONSOLE)
conswitchp = &prom_con;
#endif

idprom_init();
Expand Down
3 changes: 0 additions & 3 deletions drivers/char/vt.c
Original file line number Diff line number Diff line change
Expand Up @@ -2948,9 +2948,6 @@ int __init vty_init(const struct file_operations *console_fops)
panic("Couldn't register console driver\n");
kbd_init();
console_map_init();
#ifdef CONFIG_PROM_CONSOLE
prom_con_init();
#endif
#ifdef CONFIG_MDA_CONSOLE
mda_console_init();
#endif
Expand Down
2 changes: 0 additions & 2 deletions drivers/video/console/.gitignore

This file was deleted.

9 changes: 1 addition & 8 deletions drivers/video/console/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -67,16 +67,9 @@ config SGI_NEWPORT_CONSOLE

# bool 'IODC console' CONFIG_IODC_CONSOLE

config PROM_CONSOLE
bool "PROM console"
depends on SPARC
help
Say Y to build a console driver for Sun machines that uses the
terminal emulation built into their console PROMS.

config DUMMY_CONSOLE
bool
depends on PROM_CONSOLE!=y || VGA_CONSOLE!=y || SGI_NEWPORT_CONSOLE!=y
depends on VGA_CONSOLE!=y || SGI_NEWPORT_CONSOLE!=y
default y

config DUMMY_CONSOLE_COLUMNS
Expand Down
12 changes: 0 additions & 12 deletions drivers/video/console/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ font-objs += $(font-objs-y)

obj-$(CONFIG_DUMMY_CONSOLE) += dummycon.o
obj-$(CONFIG_SGI_NEWPORT_CONSOLE) += newport_con.o font.o
obj-$(CONFIG_PROM_CONSOLE) += promcon.o promcon_tbl.o
obj-$(CONFIG_STI_CONSOLE) += sticon.o sticore.o font.o
obj-$(CONFIG_VGA_CONSOLE) += vgacon.o
obj-$(CONFIG_MDA_CONSOLE) += mdacon.o
Expand All @@ -40,14 +39,3 @@ obj-$(CONFIG_FB_STI) += sticore.o font.o
ifeq ($(CONFIG_USB_SISUSBVGA_CON),y)
obj-$(CONFIG_USB_SISUSBVGA) += font.o
endif

# Targets that kbuild needs to know about
targets := promcon_tbl.c

quiet_cmd_conmakehash = CNMKHSH $@
cmd_conmakehash = scripts/conmakehash $< | \
sed -e '/\#include <[^>]*>/p' -e 's/types/init/' \
-e 's/dfont\(_uni.*\]\)/promfont\1 /' > $@

$(obj)/promcon_tbl.c: $(src)/prom.uni
$(call cmd,conmakehash)
11 changes: 0 additions & 11 deletions drivers/video/console/prom.uni

This file was deleted.

Loading

0 comments on commit 09d3f3f

Please sign in to comment.