Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
8054d80b
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,发现更多精彩内容 >>
提交
8054d80b
编写于
5月 14, 2021
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge
https://source.denx.de/u-boot/custodians/u-boot-sh
上级
666afca0
8f76c9d7
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
82 addition
and
16 deletion
+82
-16
arch/arm/mach-rmobile/Kconfig
arch/arm/mach-rmobile/Kconfig
+1
-0
board/beacon/beacon-rzg2m/Makefile
board/beacon/beacon-rzg2m/Makefile
+1
-1
board/beacon/beacon-rzg2m/beacon-rzg2m.c
board/beacon/beacon-rzg2m/beacon-rzg2m.c
+0
-15
board/renesas/rcar-common/common.c
board/renesas/rcar-common/common.c
+80
-0
未找到文件。
arch/arm/mach-rmobile/Kconfig
浏览文件 @
8054d80b
...
...
@@ -13,6 +13,7 @@ config RCAR_GEN3
select ARM64
select PHY
select CMD_CACHE
select OF_BOARD_SETUP
select PINCTRL
select PINCONF
select PINCTRL_PFC
...
...
board/beacon/beacon-rzg2m/Makefile
浏览文件 @
8054d80b
...
...
@@ -6,4 +6,4 @@
# SPDX-License-Identifier: GPL-2.0+
#
obj-y
:=
beacon-rzg2m.o
obj-y
:=
beacon-rzg2m.o
../../renesas/rcar-common/common.o
board/beacon/beacon-rzg2m/beacon-rzg2m.c
浏览文件 @
8054d80b
...
...
@@ -28,21 +28,6 @@ int board_init(void)
return
0
;
}
int
dram_init
(
void
)
{
if
(
fdtdec_setup_mem_size_base
()
!=
0
)
return
-
EINVAL
;
return
0
;
}
int
dram_init_banksize
(
void
)
{
fdtdec_setup_memory_banksize
();
return
0
;
}
#define RST_BASE 0xE6160000
#define RST_CA57RESCNT (RST_BASE + 0x40)
#define RST_CODE 0xA5A5000F
...
...
board/renesas/rcar-common/common.c
浏览文件 @
8054d80b
...
...
@@ -43,4 +43,84 @@ int dram_init_banksize(void)
return
0
;
}
#if defined(CONFIG_OF_BOARD_SETUP)
static
int
is_mem_overlap
(
void
*
blob
,
int
first_mem_node
,
int
curr_mem_node
)
{
struct
fdt_resource
first_mem_res
,
curr_mem_res
;
int
curr_mem_reg
,
first_mem_reg
=
0
;
int
ret
;
for
(;;)
{
ret
=
fdt_get_resource
(
blob
,
first_mem_node
,
"reg"
,
first_mem_reg
++
,
&
first_mem_res
);
if
(
ret
)
/* No more entries, no overlap found */
return
0
;
curr_mem_reg
=
0
;
for
(;;)
{
ret
=
fdt_get_resource
(
blob
,
curr_mem_node
,
"reg"
,
curr_mem_reg
++
,
&
curr_mem_res
);
if
(
ret
)
/* No more entries, check next tuple */
break
;
if
(
curr_mem_res
.
end
<
first_mem_res
.
start
)
continue
;
if
(
curr_mem_res
.
start
>=
first_mem_res
.
end
)
continue
;
printf
(
"Overlap found: 0x%llx..0x%llx / 0x%llx..0x%llx
\n
"
,
first_mem_res
.
start
,
first_mem_res
.
end
,
curr_mem_res
.
start
,
curr_mem_res
.
end
);
return
1
;
}
}
return
0
;
}
int
ft_board_setup
(
void
*
blob
,
struct
bd_info
*
bd
)
{
/*
* Scrub duplicate /memory@* node entries here. Some R-Car DTs might
* contain multiple /memory@* nodes, however fdt_fixup_memory_banks()
* either generates single /memory node or updates the first /memory
* node. Any remaining memory nodes are thus potential duplicates.
*
* However, it is not possible to delete all the memory nodes right
* away, since some of those might not be DRAM memory nodes, but some
* sort of other memory. Thus, delete only the memory nodes which are
* in the R-Car3 DBSC ranges.
*/
int
mem
=
0
,
first_mem_node
=
0
;
for
(;;)
{
mem
=
fdt_node_offset_by_prop_value
(
blob
,
mem
,
"device_type"
,
"memory"
,
7
);
if
(
mem
<
0
)
break
;
if
(
!
fdtdec_get_is_enabled
(
blob
,
mem
))
continue
;
/* First memory node, patched by U-Boot */
if
(
!
first_mem_node
)
{
first_mem_node
=
mem
;
continue
;
}
/* Check the remaining nodes and delete duplicates */
if
(
!
is_mem_overlap
(
blob
,
first_mem_node
,
mem
))
continue
;
/* Delete duplicate node, start again */
fdt_del_node
(
blob
,
mem
);
first_mem_node
=
0
;
mem
=
0
;
}
return
0
;
}
#endif
#endif
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录