mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-06-13 15:03:58 +03:00
Merge branch 'master' of git://www.denx.de/git/u-boot-video
This commit is contained in:
@@ -54,7 +54,7 @@ struct edid_detailed_timing {
|
||||
(_x).vertical_blanking)
|
||||
unsigned char hsync_offset;
|
||||
unsigned char hsync_pulse_width;
|
||||
unsigned char sync_offset_pulse_width;
|
||||
unsigned char vsync_offset_pulse_width;
|
||||
unsigned char hsync_vsync_offset_pulse_width_hi;
|
||||
#define EDID_DETAILED_TIMING_HSYNC_OFFSET(_x) \
|
||||
((GET_BITS((_x).hsync_vsync_offset_pulse_width_hi, 7, 6) << 8) + \
|
||||
|
||||
@@ -8,9 +8,10 @@
|
||||
#ifndef _VIDEO_FONT_
|
||||
#define _VIDEO_FONT_
|
||||
|
||||
#define VIDEO_FONT_CHARS 256
|
||||
#define VIDEO_FONT_WIDTH 8
|
||||
#define VIDEO_FONT_HEIGHT 16
|
||||
#define VIDEO_FONT_SIZE (VIDEO_FONT_CHARS * VIDEO_FONT_HEIGHT)
|
||||
#ifdef CONFIG_VIDEO_FONT_4X6
|
||||
#include <video_font_4x6.h>
|
||||
#else
|
||||
#include <video_font_data.h>
|
||||
#endif
|
||||
|
||||
#endif /* _VIDEO_FONT_ */
|
||||
|
||||
2154
include/video_font_4x6.h
Normal file
2154
include/video_font_4x6.h
Normal file
File diff suppressed because it is too large
Load Diff
@@ -8,7 +8,12 @@
|
||||
#ifndef _VIDEO_FONT_DATA_
|
||||
#define _VIDEO_FONT_DATA_
|
||||
|
||||
static unsigned char video_fontdata[VIDEO_FONT_SIZE] = {
|
||||
#define VIDEO_FONT_CHARS 256
|
||||
#define VIDEO_FONT_WIDTH 8
|
||||
#define VIDEO_FONT_HEIGHT 16
|
||||
#define VIDEO_FONT_SIZE (VIDEO_FONT_CHARS * VIDEO_FONT_HEIGHT)
|
||||
|
||||
static unsigned char __maybe_unused video_fontdata[VIDEO_FONT_SIZE] = {
|
||||
|
||||
/* 0 0x00 '^@' */
|
||||
0x00, /* 00000000 */
|
||||
|
||||
Reference in New Issue
Block a user