Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
9649c534
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
9649c534
编写于
12月 05, 2018
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge tag 'video-updates-for-2019.01-rc2' of
git://git.denx.de/u-boot-video
video, bmp and cls command updates
上级
2e2a2a5d
96d82f6c
变更
9
隐藏空白更改
内联
并排
Showing
9 changed file
with
65 addition
and
18 deletion
+65
-18
cmd/Kconfig
cmd/Kconfig
+8
-0
cmd/Makefile
cmd/Makefile
+1
-0
cmd/bmp.c
cmd/bmp.c
+13
-5
cmd/cls.c
cmd/cls.c
+35
-0
common/lcd.c
common/lcd.c
+0
-9
drivers/pci/pci_rom.c
drivers/pci/pci_rom.c
+1
-0
drivers/video/video-uclass.c
drivers/video/video-uclass.c
+3
-1
drivers/video/video_bmp.c
drivers/video/video_bmp.c
+1
-2
include/video.h
include/video.h
+3
-1
未找到文件。
cmd/Kconfig
浏览文件 @
9649c534
...
...
@@ -1380,6 +1380,14 @@ config CMD_CONITRACE
Enable the 'conitrace' command which displays the codes received
from the console input as hexadecimal numbers.
config CMD_CLS
bool "Enable clear screen command 'cls'"
depends on CFB_CONSOLE || DM_VIDEO || LCD || VIDEO
default y if LCD
help
Enable the 'cls' command which clears the screen contents
on video frame buffer.
config CMD_DISPLAY
bool "Enable the 'display' command, for character displays"
help
...
...
cmd/Makefile
浏览文件 @
9649c534
...
...
@@ -32,6 +32,7 @@ obj-$(CONFIG_CMD_BTRFS) += btrfs.o
obj-$(CONFIG_CMD_CACHE)
+=
cache.o
obj-$(CONFIG_CMD_CBFS)
+=
cbfs.o
obj-$(CONFIG_CMD_CLK)
+=
clk.o
obj-$(CONFIG_CMD_CLS)
+=
cls.o
obj-$(CONFIG_CMD_CONFIG)
+=
config.o
obj-$(CONFIG_CMD_CONITRACE)
+=
conitrace.o
obj-$(CONFIG_CMD_CONSOLE)
+=
console.o
...
...
cmd/bmp.c
浏览文件 @
9649c534
...
...
@@ -124,8 +124,14 @@ static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const ar
break
;
case
4
:
addr
=
simple_strtoul
(
argv
[
1
],
NULL
,
16
);
x
=
simple_strtoul
(
argv
[
2
],
NULL
,
10
);
y
=
simple_strtoul
(
argv
[
3
],
NULL
,
10
);
if
(
!
strcmp
(
argv
[
2
],
"m"
))
x
=
BMP_ALIGN_CENTER
;
else
x
=
simple_strtoul
(
argv
[
2
],
NULL
,
10
);
if
(
!
strcmp
(
argv
[
3
],
"m"
))
y
=
BMP_ALIGN_CENTER
;
else
y
=
simple_strtoul
(
argv
[
3
],
NULL
,
10
);
break
;
default:
return
CMD_RET_USAGE
;
...
...
@@ -249,9 +255,11 @@ int bmp_display(ulong addr, int x, int y)
if
(
!
ret
)
{
bool
align
=
false
;
# ifdef CONFIG_SPLASH_SCREEN_ALIGN
align
=
true
;
# endif
/* CONFIG_SPLASH_SCREEN_ALIGN */
if
(
CONFIG_IS_ENABLED
(
SPLASH_SCREEN_ALIGN
)
||
x
==
BMP_ALIGN_CENTER
||
y
==
BMP_ALIGN_CENTER
)
align
=
true
;
ret
=
video_bmp_display
(
dev
,
addr
,
x
,
y
,
align
);
}
#elif defined(CONFIG_LCD)
...
...
cmd/cls.c
0 → 100644
浏览文件 @
9649c534
// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2018
* DENX Software Engineering, Anatolij Gustschin <agust@denx.de>
*
* cls - clear screen command
*/
#include <common.h>
#include <command.h>
#include <dm.h>
#include <lcd.h>
#include <video.h>
static
int
do_video_clear
(
cmd_tbl_t
*
cmdtp
,
int
flag
,
int
argc
,
char
*
const
argv
[])
{
#if defined(CONFIG_DM_VIDEO)
struct
udevice
*
dev
;
if
(
uclass_first_device_err
(
UCLASS_VIDEO
,
&
dev
))
return
CMD_RET_FAILURE
;
if
(
video_clear
(
dev
))
return
CMD_RET_FAILURE
;
#elif defined(CONFIG_CFB_CONSOLE)
video_clear
();
#elif defined(CONFIG_LCD)
lcd_clear
();
#else
return
CMD_RET_FAILURE
;
#endif
return
CMD_RET_SUCCESS
;
}
U_BOOT_CMD
(
cls
,
1
,
1
,
do_video_clear
,
"clear screen"
,
""
);
common/lcd.c
浏览文件 @
9649c534
...
...
@@ -242,14 +242,6 @@ void lcd_clear(void)
lcd_sync
();
}
static
int
do_lcd_clear
(
cmd_tbl_t
*
cmdtp
,
int
flag
,
int
argc
,
char
*
const
argv
[])
{
lcd_clear
();
return
0
;
}
U_BOOT_CMD
(
cls
,
1
,
1
,
do_lcd_clear
,
"clear screen"
,
""
);
static
int
lcd_init
(
void
*
lcdbase
)
{
debug
(
"[LCD] Initializing LCD frambuffer at %p
\n
"
,
lcdbase
);
...
...
@@ -389,7 +381,6 @@ static inline void lcd_logo_plot(int x, int y) {}
#if defined(CONFIG_CMD_BMP) || defined(CONFIG_SPLASH_SCREEN)
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
#define BMP_ALIGN_CENTER 0x7FFF
static
void
splash_align_axis
(
int
*
axis
,
unsigned
long
panel_size
,
unsigned
long
picture_size
)
...
...
drivers/pci/pci_rom.c
浏览文件 @
9649c534
...
...
@@ -331,6 +331,7 @@ int vbe_setup_video_priv(struct vesa_mode_info *vesa,
return
log_msg_ret
(
"No x resolution"
,
-
ENXIO
);
uc_priv
->
xsize
=
vesa
->
x_resolution
;
uc_priv
->
ysize
=
vesa
->
y_resolution
;
uc_priv
->
line_length
=
vesa
->
bytes_per_scanline
;
switch
(
vesa
->
bits_per_pixel
)
{
case
32
:
case
24
:
...
...
drivers/video/video-uclass.c
浏览文件 @
9649c534
...
...
@@ -226,7 +226,9 @@ static int video_post_probe(struct udevice *dev)
/* Set up the line and display size */
priv
->
fb
=
map_sysmem
(
plat
->
base
,
plat
->
size
);
priv
->
line_length
=
priv
->
xsize
*
VNBYTES
(
priv
->
bpix
);
if
(
!
priv
->
line_length
)
priv
->
line_length
=
priv
->
xsize
*
VNBYTES
(
priv
->
bpix
);
priv
->
fb_size
=
priv
->
line_length
*
priv
->
ysize
;
/* Set up colors */
...
...
drivers/video/video_bmp.c
浏览文件 @
9649c534
...
...
@@ -7,6 +7,7 @@
#include <bmp_layout.h>
#include <dm.h>
#include <mapmem.h>
#include <splash.h>
#include <video.h>
#include <watchdog.h>
#include <asm/unaligned.h>
...
...
@@ -140,8 +141,6 @@ __weak void fb_put_word(uchar **fb, uchar **from)
}
#endif
/* CONFIG_BMP_16BPP */
#define BMP_ALIGN_CENTER 0x7fff
/**
* video_splash_align_axis() - Align a single coordinate
*
...
...
include/video.h
浏览文件 @
9649c534
...
...
@@ -61,7 +61,9 @@ enum video_log2_bpp {
* @font_size: Font size in pixels (0 to use a default value)
* @fb: Frame buffer
* @fb_size: Frame buffer size
* @line_length: Length of each frame buffer line, in bytes
* @line_length: Length of each frame buffer line, in bytes. This can be
* set by the driver, but if not, the uclass will set it after
* probing
* @colour_fg: Foreground colour (pixel value)
* @colour_bg: Background colour (pixel value)
* @flush_dcache: true to enable flushing of the data cache after
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录