Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity
u-boot/include/video_font.h

42 lines
906 B
C
Raw Normal View History

SPDX: Convert all of our single license tags to Linux Kernel style When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini <trini@konsulko.com>
2018-05-06 21:58:06 +00:00
/* SPDX-License-Identifier: GPL-2.0+ */
Initial revision
2000-10-25 11:24:22 +00:00
/*
* (C) Copyright 2000
* Paolo Scaffardi, AIRVENT SAM s.p.a - RIMINI(ITALY), arsenio@tin.it
*/
#ifndef _VIDEO_FONT_
#define _VIDEO_FONT_
video console: implement multiple fonts configuration This needed for unit testing different fonts. Configured fonts are placed in an array of fonts. First font is selected by default upon console probe. Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> [agust: fixed build error when bmp logo disabled] Signed-off-by: Anatolij Gustschin <agust@denx.de>
2023-03-07 10:21:14 +00:00
#include <video_font_data.h>
#if defined(CONFIG_VIDEO_FONT_4X6)
video: Add small 4x6 font from Linux This font is based on Linux drivers/video/console/font_mini_4x6.c as of commit: commit bcfbeecea11c15e243f076d37d637c2598aff4fe Author: Bjarni Ingi Gislason <bjarniig@rhi.hi.is> Date: Sun Aug 12 15:05:10 2012 +0000 drivers: console: font_: Change a glyph from "broken bar" to "vertical line" I removed these lines as they are useless in U-Boot: #include <linux/font.h> #define FONTDATAMAX 1536 Whole "const struct font_desc font_mini_4x6" block This patch also adds a new configuration option to select this smaller font, CONFIG_VIDEO_FONT_4X6 , but this is disabled by default. The default setting is the regular "large" font. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Anatolij Gustschin <agust@denx.de>
2013-07-30 21:37:58 +00:00
#include <video_font_4x6.h>
video console: implement multiple fonts configuration This needed for unit testing different fonts. Configured fonts are placed in an array of fonts. First font is selected by default upon console probe. Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> [agust: fixed build error when bmp logo disabled] Signed-off-by: Anatolij Gustschin <agust@denx.de>
2023-03-07 10:21:14 +00:00
#endif
#if defined(CONFIG_VIDEO_FONT_8X16)
video console: move 8x16 font data in named header Consistent font data header names needed to add new fonts. Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-03-07 10:21:13 +00:00
#include <video_font_8x16.h>
video: Add small 4x6 font from Linux This font is based on Linux drivers/video/console/font_mini_4x6.c as of commit: commit bcfbeecea11c15e243f076d37d637c2598aff4fe Author: Bjarni Ingi Gislason <bjarniig@rhi.hi.is> Date: Sun Aug 12 15:05:10 2012 +0000 drivers: console: font_: Change a glyph from "broken bar" to "vertical line" I removed these lines as they are useless in U-Boot: #include <linux/font.h> #define FONTDATAMAX 1536 Whole "const struct font_desc font_mini_4x6" block This patch also adds a new configuration option to select this smaller font, CONFIG_VIDEO_FONT_4X6 , but this is disabled by default. The default setting is the regular "large" font. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Anatolij Gustschin <agust@denx.de>
2013-07-30 21:37:58 +00:00
#endif
video console: add 12x22 Sun font from linux Modern mobile phones typically have high pixel density. Bootmenu is hardly readable on those with 8x16 font. Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-02-27 17:37:07 +00:00
#if defined(CONFIG_VIDEO_FONT_SUN12X22)
#include <video_font_sun12x22.h>
#endif
video console: add 16x32 Terminus font from linux Modern mobile phones typically have high pixel density. Bootmenu is hardly readable on those with 8x16 font. Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-02-27 17:37:08 +00:00
#if defined(CONFIG_VIDEO_FONT_16X32)
#include <video_font_ter16x32.h>
#endif
Initial revision
2000-10-25 11:24:22 +00:00
video console: implement multiple fonts configuration This needed for unit testing different fonts. Configured fonts are placed in an array of fonts. First font is selected by default upon console probe. Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> [agust: fixed build error when bmp logo disabled] Signed-off-by: Anatolij Gustschin <agust@denx.de>
2023-03-07 10:21:14 +00:00
static struct video_fontdata __maybe_unused fonts[] = {
#if defined(CONFIG_VIDEO_FONT_8X16)
FONT_ENTRY(8, 16, 8x16),
#endif
#if defined(CONFIG_VIDEO_FONT_4X6)
FONT_ENTRY(4, 6, 4x6),
video console: add 12x22 Sun font from linux Modern mobile phones typically have high pixel density. Bootmenu is hardly readable on those with 8x16 font. Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-02-27 17:37:07 +00:00
#endif
#if defined(CONFIG_VIDEO_FONT_SUN12X22)
FONT_ENTRY(12, 22, 12x22),
video console: add 16x32 Terminus font from linux Modern mobile phones typically have high pixel density. Bootmenu is hardly readable on those with 8x16 font. Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
2023-02-27 17:37:08 +00:00
#endif
#if defined(CONFIG_VIDEO_FONT_16X32)
FONT_ENTRY(16, 32, 16x32),
video console: implement multiple fonts configuration This needed for unit testing different fonts. Configured fonts are placed in an array of fonts. First font is selected by default upon console probe. Signed-off-by: Dzmitry Sankouski <dsankouski@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> [agust: fixed build error when bmp logo disabled] Signed-off-by: Anatolij Gustschin <agust@denx.de>
2023-03-07 10:21:14 +00:00
#endif
{/* list terminator */}
};
font: split font data from video_font.h While video_font.h is useful even without referencing the font data, it is not possible to be included multiple times because it defines font data array right in the header. This patch splits the font data array into video_font_data.h and so now video_font.h can be included multiple times. This at least solves the code duplication in board/mcc200/lcd.c. Signed-off-by: Che-Liang Chiou <clchiou@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
2011-10-21 09:04:21 +00:00
#endif /* _VIDEO_FONT_ */
Reference in a new issue Copy permalink