Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
358b8bc2
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,发现更多精彩内容 >>
提交
358b8bc2
编写于
1月 31, 2015
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'patman' of
git://git.denx.de/u-boot-x86
上级
6a608f20
3d4de986
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
45 addition
and
26 deletion
+45
-26
arch/sandbox/cpu/start.c
arch/sandbox/cpu/start.c
+20
-0
arch/sandbox/dts/sandbox.dts
arch/sandbox/dts/sandbox.dts
+2
-4
board/sandbox/README.sandbox
board/sandbox/README.sandbox
+2
-2
tools/patman/README
tools/patman/README
+8
-5
tools/patman/gitutil.py
tools/patman/gitutil.py
+2
-1
tools/patman/patchstream.py
tools/patman/patchstream.py
+3
-1
tools/patman/series.py
tools/patman/series.py
+8
-13
未找到文件。
arch/sandbox/cpu/start.c
浏览文件 @
358b8bc2
...
...
@@ -6,6 +6,7 @@
#include <common.h>
#include <os.h>
#include <cli.h>
#include <malloc.h>
#include <asm/getopt.h>
#include <asm/io.h>
#include <asm/sections.h>
...
...
@@ -102,6 +103,25 @@ static int sandbox_cmdline_cb_fdt(struct sandbox_state *state, const char *arg)
}
SANDBOX_CMDLINE_OPT_SHORT
(
fdt
,
'd'
,
1
,
"Specify U-Boot's control FDT"
);
static
int
sandbox_cmdline_cb_default_fdt
(
struct
sandbox_state
*
state
,
const
char
*
arg
)
{
const
char
*
fmt
=
"%s.dtb"
;
char
*
fname
;
int
len
;
len
=
strlen
(
state
->
argv
[
0
])
+
strlen
(
fmt
)
+
1
;
fname
=
os_malloc
(
len
);
if
(
!
fname
)
return
-
ENOMEM
;
snprintf
(
fname
,
len
,
fmt
,
state
->
argv
[
0
]);
state
->
fdt_fname
=
fname
;
return
0
;
}
SANDBOX_CMDLINE_OPT_SHORT
(
default_fdt
,
'D'
,
0
,
"Use the default u-boot.dtb control FDT in U-Boot directory"
);
static
int
sandbox_cmdline_cb_interactive
(
struct
sandbox_state
*
state
,
const
char
*
arg
)
{
...
...
arch/sandbox/dts/sandbox.dts
浏览文件 @
358b8bc2
...
...
@@ -74,10 +74,8 @@
cros-ec-keyb {
compatible = "google,cros-ec-keyb";
google,key-rows = <8>;
google,key-columns = <13>;
google,repeat-delay-ms = <240>;
google,repeat-rate-ms = <30>;
keypad,num-rows = <8>;
keypad,num-columns = <13>;
google,ghost-filter;
/*
* Keymap entries take the form of 0xRRCCKKKK where
...
...
board/sandbox/README.sandbox
浏览文件 @
358b8bc2
...
...
@@ -18,8 +18,8 @@ create unit tests which we can run to test this upper level code.
CONFIG_SANDBOX is defined when building a native board.
The
chosen vendor and board names are also 'sandbox', so there is a single
board in board/sandbox.
The
board name is 'sandbox' but the vendor name is unset, so there is a
single
board in board/sandbox.
CONFIG_SANDBOX_BIG_ENDIAN should be defined when running on big-endian
machines.
...
...
tools/patman/README
浏览文件 @
358b8bc2
...
...
@@ -52,12 +52,15 @@ will get a consistent result each time.
How to configure it
===================
For most cases of using patman for U-Boot development, patman will
locate and use the file 'doc/git-mailrc' in your U-Boot directory.
This contains most of the aliases you will need.
For most cases of using patman for U-Boot development, patman can use the
file 'doc/git-mailrc' in your U-Boot directory to supply the email aliases
you need. To make this work, tell git where to find the file by typing
this once:
For Linux the 'scripts/get_maintainer.pl' handles figuring out where
to send patches pretty well.
git config sendemail.aliasesfile doc/git-mailrc
For both Linux and U-Boot the 'scripts/get_maintainer.pl' handles figuring
out where to send patches pretty well.
During the first run patman creates a config file for you by taking the default
user name and email address from the global .gitconfig file.
...
...
tools/patman/gitutil.py
浏览文件 @
358b8bc2
...
...
@@ -392,7 +392,8 @@ def EmailPatches(series, cover_fname, args, dry_run, raise_on_error, cc_fname,
"Or do something like this
\n
"
"git config sendemail.to u-boot@lists.denx.de"
)
return
cc
=
BuildEmailList
(
series
.
get
(
'cc'
),
'--cc'
,
alias
,
raise_on_error
)
cc
=
BuildEmailList
(
list
(
set
(
series
.
get
(
'cc'
))
-
set
(
series
.
get
(
'to'
))),
'--cc'
,
alias
,
raise_on_error
)
if
self_only
:
to
=
BuildEmailList
([
os
.
getenv
(
'USER'
)],
'--to'
,
alias
,
raise_on_error
)
cc
=
[]
...
...
tools/patman/patchstream.py
浏览文件 @
358b8bc2
...
...
@@ -139,6 +139,9 @@ class PatchStream:
# Initially we have no output. Prepare the input line string
out
=
[]
line
=
line
.
rstrip
(
'
\n
'
)
commit_match
=
re_commit
.
match
(
line
)
if
self
.
is_log
else
None
if
self
.
is_log
:
if
line
[:
4
]
==
' '
:
line
=
line
[
4
:]
...
...
@@ -146,7 +149,6 @@ class PatchStream:
# Handle state transition and skipping blank lines
series_tag_match
=
re_series_tag
.
match
(
line
)
commit_tag_match
=
re_commit_tag
.
match
(
line
)
commit_match
=
re_commit
.
match
(
line
)
if
self
.
is_log
else
None
cover_cc_match
=
re_cover_cc
.
match
(
line
)
signoff_match
=
re_signoff
.
match
(
line
)
tag_match
=
None
...
...
tools/patman/series.py
浏览文件 @
358b8bc2
...
...
@@ -94,6 +94,9 @@ class Series(dict):
cmd: The git command we would have run
process_tags: Process tags as if they were aliases
"""
to_set
=
set
(
gitutil
.
BuildEmailList
(
self
.
to
));
cc_set
=
set
(
gitutil
.
BuildEmailList
(
self
.
cc
));
col
=
terminal
.
Color
()
print
'Dry run, so not doing much. But I would do this:'
print
...
...
@@ -106,24 +109,16 @@ class Series(dict):
commit
=
self
.
commits
[
upto
]
print
col
.
Color
(
col
.
GREEN
,
' %s'
%
args
[
upto
])
cc_list
=
list
(
self
.
_generated_cc
[
commit
.
patch
])
# Skip items in To list
if
'to'
in
self
:
try
:
map
(
cc_list
.
remove
,
gitutil
.
BuildEmailList
(
self
.
to
))
except
ValueError
:
pass
for
email
in
cc_list
:
for
email
in
set
(
cc_list
)
-
to_set
-
cc_set
:
if
email
==
None
:
email
=
col
.
Color
(
col
.
YELLOW
,
"<alias '%s' not found>"
%
tag
)
if
email
:
print
' Cc: '
,
email
print
for
item
in
gitutil
.
BuildEmailList
(
self
.
get
(
'to'
,
'<none>'
))
:
for
item
in
to_set
:
print
'To:
\t
'
,
item
for
item
in
gitutil
.
BuildEmailList
(
self
.
cc
)
:
for
item
in
cc_set
-
to_set
:
print
'Cc:
\t
'
,
item
print
'Version: '
,
self
.
get
(
'version'
)
print
'Prefix:
\t
'
,
self
.
get
(
'prefix'
)
...
...
@@ -131,7 +126,7 @@ class Series(dict):
print
'Cover: %d lines'
%
len
(
self
.
cover
)
cover_cc
=
gitutil
.
BuildEmailList
(
self
.
get
(
'cover_cc'
,
''
))
all_ccs
=
itertools
.
chain
(
cover_cc
,
*
self
.
_generated_cc
.
values
())
for
email
in
set
(
all_ccs
):
for
email
in
set
(
all_ccs
)
-
to_set
-
cc_set
:
print
' Cc: '
,
email
if
cmd
:
print
'Git command: %s'
%
cmd
...
...
@@ -230,7 +225,7 @@ class Series(dict):
if
add_maintainers
:
list
+=
get_maintainer
.
GetMaintainer
(
commit
.
patch
)
all_ccs
+=
list
print
>>
fd
,
commit
.
patch
,
', '
.
join
(
list
)
print
>>
fd
,
commit
.
patch
,
', '
.
join
(
set
(
list
)
)
self
.
_generated_cc
[
commit
.
patch
]
=
list
if
cover_fname
:
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录