Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
0dec2030
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,发现更多精彩内容 >>
提交
0dec2030
编写于
8月 09, 2021
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge tag 'dm-pull-8aug21' of
https://source.denx.de/u-boot/custodians/u-boot-dm
Use log subsystem for dm_warn() Various minor bug fixes
上级
3823315c
e679f39f
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
36 addition
and
16 deletion
+36
-16
drivers/core/uclass.c
drivers/core/uclass.c
+3
-0
drivers/core/util.c
drivers/core/util.c
+0
-11
include/dm/uclass.h
include/dm/uclass.h
+2
-1
include/dm/util.h
include/dm/util.h
+1
-1
test/dm/core.c
test/dm/core.c
+1
-0
tools/dtoc/test_fdt.py
tools/dtoc/test_fdt.py
+1
-1
tools/patman/func_test.py
tools/patman/func_test.py
+22
-1
tools/patman/patchstream.py
tools/patman/patchstream.py
+6
-1
未找到文件。
drivers/core/uclass.c
浏览文件 @
0dec2030
...
...
@@ -146,6 +146,9 @@ int uclass_get(enum uclass_id id, struct uclass **ucp)
{
struct
uclass
*
uc
;
/* Immediately fail if driver model is not set up */
if
(
!
gd
->
uclass_root
)
return
-
EDEADLK
;
*
ucp
=
NULL
;
uc
=
uclass_find
(
id
);
if
(
!
uc
)
{
...
...
drivers/core/util.c
浏览文件 @
0dec2030
...
...
@@ -11,17 +11,6 @@
#include <linux/libfdt.h>
#include <vsprintf.h>
#if CONFIG_IS_ENABLED(DM_WARN)
void
dm_warn
(
const
char
*
fmt
,
...)
{
va_list
args
;
va_start
(
args
,
fmt
);
vprintf
(
fmt
,
args
);
va_end
(
args
);
}
#endif
int
list_count_items
(
struct
list_head
*
head
)
{
struct
list_head
*
node
;
...
...
include/dm/uclass.h
浏览文件 @
0dec2030
...
...
@@ -159,7 +159,8 @@ void *uclass_get_priv(const struct uclass *uc);
*
* @key: ID to look up
* @ucp: Returns pointer to uclass (there is only one per ID)
* @return 0 if OK, -ve on error
* @return 0 if OK, -EDEADLK if driver model is not yet inited, other -ve on
* other error
*/
int
uclass_get
(
enum
uclass_id
key
,
struct
uclass
**
ucp
);
...
...
include/dm/util.h
浏览文件 @
0dec2030
...
...
@@ -7,7 +7,7 @@
#define __DM_UTIL_H
#if CONFIG_IS_ENABLED(DM_WARN)
void
dm_warn
(
const
char
*
fmt
,
...);
#define dm_warn(fmt...) log(LOGC_DM, LOGL_WARNING, ##fmt)
#else
static
inline
void
dm_warn
(
const
char
*
fmt
,
...)
{
...
...
test/dm/core.c
浏览文件 @
0dec2030
...
...
@@ -994,6 +994,7 @@ static int dm_test_uclass_before_ready(struct unit_test_state *uts)
memset
(
&
gd
->
uclass_root
,
'\0'
,
sizeof
(
gd
->
uclass_root
));
ut_asserteq_ptr
(
NULL
,
uclass_find
(
UCLASS_TEST
));
ut_asserteq
(
-
EDEADLK
,
uclass_get
(
UCLASS_TEST
,
&
uc
));
return
0
;
}
...
...
tools/dtoc/test_fdt.py
浏览文件 @
0dec2030
...
...
@@ -425,7 +425,7 @@ class TestProp(unittest.TestCase):
# Widen an array of ints with an int (should do nothing)
prop
=
self
.
node
.
props
[
'intarray'
]
prop2
=
node2
.
props
[
'int
array
'
]
prop2
=
node2
.
props
[
'int
val
'
]
self
.
assertEqual
(
Type
.
INT
,
prop
.
type
)
self
.
assertEqual
(
3
,
len
(
prop
.
value
))
prop
.
Widen
(
prop2
)
...
...
tools/patman/func_test.py
浏览文件 @
0dec2030
...
...
@@ -136,7 +136,7 @@ class TestFunctional(unittest.TestCase):
Commit-changes: 2
- Changes only for this commit
Cover-changes: 4
'
Cover-changes: 4
- Some notes for the cover letter
Cover-letter:
...
...
@@ -1293,3 +1293,24 @@ Reviewed-by: %s
self
.
assertEqual
(
terminal
.
PrintLine
(
'4 new responses available in patchwork (use -d to write them to a new branch)'
,
None
),
next
(
lines
))
def
testInsertTags
(
self
):
"""Test inserting of review tags"""
msg
=
'''first line
second line.'''
tags
=
[
'Reviewed-by: Bin Meng <bmeng.cn@gmail.com>'
,
'Tested-by: Bin Meng <bmeng.cn@gmail.com>'
]
signoff
=
'Signed-off-by: Simon Glass <sjg@chromium.com>'
tag_str
=
'
\n
'
.
join
(
tags
)
new_msg
=
patchstream
.
insert_tags
(
msg
,
tags
)
self
.
assertEqual
(
msg
+
'
\n\n
'
+
tag_str
,
new_msg
)
new_msg
=
patchstream
.
insert_tags
(
msg
+
'
\n
'
,
tags
)
self
.
assertEqual
(
msg
+
'
\n\n
'
+
tag_str
,
new_msg
)
msg
+=
'
\n\n
'
+
signoff
new_msg
=
patchstream
.
insert_tags
(
msg
,
tags
)
self
.
assertEqual
(
msg
+
'
\n
'
+
tag_str
,
new_msg
)
tools/patman/patchstream.py
浏览文件 @
0dec2030
...
...
@@ -662,6 +662,7 @@ def insert_tags(msg, tags_to_emit):
out
=
[]
done
=
False
emit_tags
=
False
emit_blank
=
False
for
line
in
msg
.
splitlines
():
if
not
done
:
signoff_match
=
RE_SIGNOFF
.
match
(
line
)
...
...
@@ -672,9 +673,13 @@ def insert_tags(msg, tags_to_emit):
out
+=
tags_to_emit
emit_tags
=
False
done
=
True
emit_blank
=
not
(
signoff_match
or
tag_match
)
else
:
emit_blank
=
line
out
.
append
(
line
)
if
not
done
:
out
.
append
(
''
)
if
emit_blank
:
out
.
append
(
''
)
out
+=
tags_to_emit
return
'
\n
'
.
join
(
out
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录