diff options
| -rw-r--r-- | drivers/char/Makefile | 33 | ||||
| -rw-r--r-- | drivers/tty/Makefile | 2 | ||||
| -rw-r--r-- | drivers/tty/vt/Makefile | 34 | ||||
| -rw-r--r-- | drivers/tty/vt/consolemap.c (renamed from drivers/char/consolemap.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/vt/cp437.uni (renamed from drivers/char/cp437.uni) | 0 | ||||
| -rw-r--r-- | drivers/tty/vt/defkeymap.c_shipped (renamed from drivers/char/defkeymap.c_shipped) | 0 | ||||
| -rw-r--r-- | drivers/tty/vt/defkeymap.map (renamed from drivers/char/defkeymap.map) | 0 | ||||
| -rw-r--r-- | drivers/tty/vt/keyboard.c (renamed from drivers/char/keyboard.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/vt/selection.c (renamed from drivers/char/selection.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/vt/vc_screen.c (renamed from drivers/char/vc_screen.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/vt/vt.c (renamed from drivers/char/vt.c) | 0 | ||||
| -rw-r--r-- | drivers/tty/vt/vt_ioctl.c (renamed from drivers/char/vt_ioctl.c) | 0 |
12 files changed, 36 insertions, 33 deletions
diff --git a/drivers/char/Makefile b/drivers/char/Makefile index f308494..ba53ec9 100644 --- a/drivers/char/Makefile +++ b/drivers/char/Makefile @@ -2,18 +2,10 @@ # Makefile for the kernel character device drivers. # -# -# This file contains the font map for the default (hardware) font -# -FONTMAPFILE = cp437.uni - obj-y += mem.o random.o obj-$(CONFIG_TTY_PRINTK) += ttyprintk.o obj-y += misc.o -obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o selection.o keyboard.o obj-$(CONFIG_BFIN_JTAG_COMM) += bfin_jtag_comm.o -obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o -obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o obj-$(CONFIG_MVME147_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_MVME162_SCC) += generic_serial.o vme_scc.o obj-$(CONFIG_BVME6000_SCC) += generic_serial.o vme_scc.o @@ -106,28 +98,3 @@ obj-$(CONFIG_RAMOOPS) += ramoops.o obj-$(CONFIG_JS_RTC) += js-rtc.o js-rtc-y = rtc.o - -# Files generated that shall be removed upon make clean -clean-files := consolemap_deftbl.c defkeymap.c - -quiet_cmd_conmk = CONMK $@ - cmd_conmk = scripts/conmakehash $< > $@ - -$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) - $(call cmd,conmk) - -$(obj)/defkeymap.o: $(obj)/defkeymap.c - -# Uncomment if you're changing the keymap and have an appropriate -# loadkeys version for the map. By default, we'll use the shipped -# versions. -# GENERATE_KEYMAP := 1 - -ifdef GENERATE_KEYMAP - -$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map - loadkeys --mktable $< > $@.tmp - sed -e 's/^static *//' $@.tmp > $@ - rm $@.tmp - -endif diff --git a/drivers/tty/Makefile b/drivers/tty/Makefile index 7f63b33..c43ef48 100644 --- a/drivers/tty/Makefile +++ b/drivers/tty/Makefile @@ -7,3 +7,5 @@ obj-$(CONFIG_MAGIC_SYSRQ) += sysrq.o obj-$(CONFIG_N_HDLC) += n_hdlc.o obj-$(CONFIG_N_GSM) += n_gsm.o obj-$(CONFIG_R3964) += n_r3964.o + +obj-y += vt/ diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile new file mode 100644 index 0000000..14a51c9 --- /dev/null +++ b/drivers/tty/vt/Makefile @@ -0,0 +1,34 @@ +# +# This file contains the font map for the default (hardware) font +# +FONTMAPFILE = cp437.uni + +obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o \ + selection.o keyboard.o +obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o +obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o + +# Files generated that shall be removed upon make clean +clean-files := consolemap_deftbl.c defkeymap.c + +quiet_cmd_conmk = CONMK $@ + cmd_conmk = scripts/conmakehash $< > $@ + +$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) + $(call cmd,conmk) + +$(obj)/defkeymap.o: $(obj)/defkeymap.c + +# Uncomment if you're changing the keymap and have an appropriate +# loadkeys version for the map. By default, we'll use the shipped +# versions. +# GENERATE_KEYMAP := 1 + +ifdef GENERATE_KEYMAP + +$(obj)/defkeymap.c: $(obj)/%.c: $(src)/%.map + loadkeys --mktable $< > $@.tmp + sed -e 's/^static *//' $@.tmp > $@ + rm $@.tmp + +endif diff --git a/drivers/char/consolemap.c b/drivers/tty/vt/consolemap.c index 45d3e80..45d3e80 100644 --- a/drivers/char/consolemap.c +++ b/drivers/tty/vt/consolemap.c diff --git a/drivers/char/cp437.uni b/drivers/tty/vt/cp437.uni index bc61634..bc61634 100644 --- a/drivers/char/cp437.uni +++ b/drivers/tty/vt/cp437.uni diff --git a/drivers/char/defkeymap.c_shipped b/drivers/tty/vt/defkeymap.c_shipped index d2208dfe..d2208dfe 100644 --- a/drivers/char/defkeymap.c_shipped +++ b/drivers/tty/vt/defkeymap.c_shipped diff --git a/drivers/char/defkeymap.map b/drivers/tty/vt/defkeymap.map index 50b30ca..50b30ca 100644 --- a/drivers/char/defkeymap.map +++ b/drivers/tty/vt/defkeymap.map diff --git a/drivers/char/keyboard.c b/drivers/tty/vt/keyboard.c index e95d787..e95d787 100644 --- a/drivers/char/keyboard.c +++ b/drivers/tty/vt/keyboard.c diff --git a/drivers/char/selection.c b/drivers/tty/vt/selection.c index ebae344..ebae344 100644 --- a/drivers/char/selection.c +++ b/drivers/tty/vt/selection.c diff --git a/drivers/char/vc_screen.c b/drivers/tty/vt/vc_screen.c index 273ab44..273ab44 100644 --- a/drivers/char/vc_screen.c +++ b/drivers/tty/vt/vc_screen.c diff --git a/drivers/char/vt.c b/drivers/tty/vt/vt.c index a8ec48e..a8ec48e 100644 --- a/drivers/char/vt.c +++ b/drivers/tty/vt/vt.c diff --git a/drivers/char/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c index 6b68a0f..6b68a0f 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/tty/vt/vt_ioctl.c |
