Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
287be329
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,发现更多精彩内容 >>
提交
287be329
编写于
6月 15, 2020
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch '2020-06-15-misc-bugfixes'
- Assorted bug fixes
上级
bb1ff137
35c2683f
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
8 addition
and
25 deletion
+8
-25
Kconfig
Kconfig
+1
-1
board/freescale/p1010rdb/README.P1010RDB-PA
board/freescale/p1010rdb/README.P1010RDB-PA
+1
-1
cmd/mmc.c
cmd/mmc.c
+1
-1
env/Kconfig
env/Kconfig
+1
-1
lib/optee/optee.c
lib/optee/optee.c
+3
-4
lib/strto.c
lib/strto.c
+1
-17
未找到文件。
Kconfig
浏览文件 @
287be329
...
...
@@ -146,7 +146,7 @@ config SYS_MALLOC_F_LEN
default 0x2000 if (ARCH_IMX8 || ARCH_IMX8M || ARCH_MX7 || \
ARCH_MX7ULP || ARCH_MX6 || ARCH_MX5 || \
ARCH_LS1012A || ARCH_LS1021A || ARCH_LS1043A || \
ARCH_LS1046A)
ARCH_LS1046A
|| ARCH_QEMU
)
default 0x400
help
Before relocation, memory is very limited on many platforms. Still,
...
...
board/freescale/p1010rdb/README.P1010RDB-PA
浏览文件 @
287be329
...
...
@@ -88,7 +88,7 @@ Note: 1 stands for 'on', 0 stands for 'off'
Setting of hwconfig
===================
If FlexCAN or TDM is needed, please set "fsl_p1010mux:tdm_can=can" or
"fsl_p1010mux:tdm_can=tdm" explicitly in u-boo
o
t prompt as below for example:
"fsl_p1010mux:tdm_can=tdm" explicitly in u-boot prompt as below for example:
setenv hwconfig "fsl_p1010mux:tdm_can=tdm;usb1:dr_mode=host,phy_type=utmi"
By default, don't set fsl_p1010mux:tdm_can, in this case, spi chip selection
is set to spi-flash instead of to SLIC/TDM/DAC and tdm_can_sel is set to TDM
...
...
cmd/mmc.c
浏览文件 @
287be329
...
...
@@ -1004,7 +1004,7 @@ U_BOOT_CMD(
"mmc part - lists available partition on current mmc device
\n
"
"mmc dev [dev] [part] - show or set current mmc device [partition]
\n
"
"mmc list - lists available devices
\n
"
"mmc wp - power on write protect boo
o
t partitions
\n
"
"mmc wp - power on write protect boot partitions
\n
"
#if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING)
"mmc hwpartition [args...] - does hardware partitioning
\n
"
" arguments (sizes in 512-byte blocks):
\n
"
...
...
env/Kconfig
浏览文件 @
287be329
...
...
@@ -562,7 +562,7 @@ config ENV_UBI_VID_OFFSET
UBI VID offset for environment. If 0, no custom VID offset is used.
config SYS_RELOC_GD_ENV_ADDR
bool "Relocate gd->en_addr"
bool "Relocate gd->en
v
_addr"
help
Relocate the early env_addr pointer so we know it is not inside
the binary. Some systems need this and for the rest, it doesn't hurt.
...
...
lib/optee/optee.c
浏览文件 @
287be329
...
...
@@ -156,8 +156,9 @@ int optee_copy_fdt_nodes(const void *old_blob, void *new_blob)
/* optee inserts its memory regions as reserved-memory nodes */
nodeoffset
=
fdt_subnode_offset
(
old_blob
,
0
,
"reserved-memory"
);
if
(
nodeoffset
>=
0
)
{
subnode
=
fdt_first_subnode
(
old_blob
,
nodeoffset
);
while
(
subnode
>=
0
)
{
for
(
subnode
=
fdt_first_subnode
(
old_blob
,
nodeoffset
);
subnode
>=
0
;
subnode
=
fdt_next_subnode
(
old_blob
,
subnode
))
{
const
char
*
name
=
fdt_get_name
(
old_blob
,
subnode
,
NULL
);
if
(
!
name
)
...
...
@@ -197,8 +198,6 @@ int optee_copy_fdt_nodes(const void *old_blob, void *new_blob)
if
(
ret
<
0
)
return
ret
;
}
subnode
=
fdt_next_subnode
(
old_blob
,
subnode
);
}
}
...
...
lib/strto.c
浏览文件 @
287be329
...
...
@@ -22,25 +22,9 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base)
*
base
=
16
;
else
*
base
=
8
;
}
else
{
int
i
=
0
;
char
var
;
}
else
*
base
=
10
;
do
{
var
=
tolower
(
s
[
i
++
]);
if
(
var
>=
'a'
&&
var
<=
'f'
)
{
*
base
=
16
;
break
;
}
if
(
!
(
var
>=
'0'
&&
var
<=
'9'
))
break
;
}
while
(
var
);
}
}
if
(
*
base
==
16
&&
s
[
0
]
==
'0'
&&
tolower
(
s
[
1
])
==
'x'
)
s
+=
2
;
return
s
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录