Commit 4484aa80 authored by Masahiro Yamada's avatar Masahiro Yamada Committed by Greg Kroah-Hartman
Browse files

tty: vt: move conmakehash to drivers/tty/vt/ from scripts/ 



scripts/conmakehash is only used for generating
drivers/tty/vt/consolemap_deftbl.c

Move it to the related directory.

Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Link: https://lore.kernel.org/r/20191217110633.8796-1-masahiroy@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f1d31743

drivers/tty/vt/.gitignore

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

conmakehash

consolemap_deftbl.c

defkeymap.c

drivers/tty/vt/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -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

scripts/conmakehash.c→drivers/tty/vt/conmakehash.c

+0 −0

File moved.

View file

scripts/.gitignore

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
# Generated files

#

bin2c

conmakehash

kallsyms

unifdef

recordmcount

scripts/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE