Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee89bd6b authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

lib: Move fonts from drivers/video/console/ to lib/fonts/ 



Several drivers need font support independent of CONFIG_VT, cfr. commit
9cbce8d7e1dae0744ca4f68d62aa7de18196b6f4, "console/font: Refactor font
support code selection logic").
Hence move the fonts and their support logic from drivers/video/console/ to
its own library directory lib/fonts/.
This also allows to limit processing of drivers/video/console/Makefile to
CONFIG_VT=y again.

[Kevin Hilman <khilman@linaro.org>: Update arch/arm/boot/compressed/Makefile]
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent d1e183c8

Documentation/DocBook/device-drivers.tmpl

+2 −2
Original line number Diff line number Diff line
@@ -297,10 +297,10 @@ KAO --> 
     </sect1>

     <sect1><title>Frame Buffer Fonts</title>

        <para>

           Refer to the file drivers/video/console/fonts.c for more information.

           Refer to the file lib/fonts/fonts.c for more information.

        </para>

<!-- FIXME: Removed for now since no structured comments in source

X!Idrivers/video/console/fonts.c

X!Ilib/fonts/fonts.c

-->

     </sect1>

  </chapter>

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ OBJS += misc.o decompress.o 
ifeq ($(CONFIG_DEBUG_UNCOMPRESS),y)

OBJS	+= debug.o

endif

FONTC	= $(srctree)/drivers/video/console/font_acorn_8x8.c

FONTC	= $(srctree)/lib/fonts/font_acorn_8x8.c



# string library code (-Os is enforced to keep it much smaller)

OBJS		+= string.o

arch/m68k/kernel/asm-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ int main(void) 
	DEFINE(BIR_SIZE, offsetof(struct bi_record, size));

	DEFINE(BIR_DATA, offsetof(struct bi_record, data));



	/* offsets into font_desc (drivers/video/console/font.h) */

	/* offsets into the font_desc struct */

	DEFINE(FONT_DESC_IDX, offsetof(struct font_desc, idx));

	DEFINE(FONT_DESC_NAME, offsetof(struct font_desc, name));

	DEFINE(FONT_DESC_WIDTH, offsetof(struct font_desc, width));

arch/unicore32/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ OBJS := misc.o 


# font.c and font.o

CFLAGS_font.o	:= -Dstatic=

$(obj)/font.c: $(srctree)/drivers/video/console/font_8x8.c

$(obj)/font.c: $(srctree)/lib/fonts/font_8x8.c

	$(call cmd,shipped)



# piggy.S and piggy.o

drivers/video/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ fb-y := fbmem.o fbmon.o fbcmap.o fbsysfs.o \ 
                                     modedb.o fbcvt.o

fb-objs                           := $(fb-y)



obj-y				  += console/

obj-$(CONFIG_VT)		  += console/

obj-$(CONFIG_LOGO)		  += logo/

obj-y				  += backlight/