Skip to content

Commit

Permalink
tty: vt: move conmakehash to drivers/tty/vt/ from scripts/
Browse files Browse the repository at this point in the history
scripts/conmakehash is only used for generating
drivers/tty/vt/consolemap_deftbl.c

Move it to the related directory.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20191217110633.8796-1-masahiroy@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
masahir0y authored and gregkh committed Dec 17, 2019
1 parent f1d3174 commit 4484aa8
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 6 deletions.
1 change: 1 addition & 0 deletions drivers/tty/vt/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
conmakehash
consolemap_deftbl.c
defkeymap.c
6 changes: 4 additions & 2 deletions drivers/tty/vt/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@ obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o
# Files generated that shall be removed upon make clean
clean-files := consolemap_deftbl.c defkeymap.c

hostprogs-y += conmakehash

quiet_cmd_conmk = CONMK $@
cmd_conmk = scripts/conmakehash $< > $@
cmd_conmk = $(obj)/conmakehash $< > $@

$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE)
$(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash
$(call cmd,conmk)

$(obj)/defkeymap.o: $(obj)/defkeymap.c
Expand Down
File renamed without changes.
1 change: 0 additions & 1 deletion scripts/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# Generated files
#
bin2c
conmakehash
kallsyms
unifdef
recordmcount
Expand Down
3 changes: 0 additions & 3 deletions scripts/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,11 @@
# the kernel for the build process.
# ---------------------------------------------------------------------------
# kallsyms: Find all symbols in vmlinux
# conmakehash: Create chartable
# conmakehash: Create arrays for initializing the kernel console tables

HOST_EXTRACFLAGS += -I$(srctree)/tools/include

hostprogs-$(CONFIG_BUILD_BIN2C) += bin2c
hostprogs-$(CONFIG_KALLSYMS) += kallsyms
hostprogs-$(CONFIG_VT) += conmakehash
hostprogs-$(BUILD_C_RECORDMCOUNT) += recordmcount
hostprogs-$(CONFIG_BUILDTIME_EXTABLE_SORT) += sortextable
hostprogs-$(CONFIG_ASN1) += asn1_compiler
Expand Down

0 comments on commit 4484aa8

Please sign in to comment.