Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
008e61f5
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,发现更多精彩内容 >>
提交
008e61f5
编写于
2月 02, 2016
作者:
T
Tom Rini
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of
git://git.denx.de/u-boot-fsl-qoriq
上级
73c5c399
7711cc0a
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
76 addition
and
5 deletion
+76
-5
arch/arm/cpu/armv8/start.S
arch/arm/cpu/armv8/start.S
+19
-0
arch/arm/dts/fsl-ls1043a-qds.dtsi
arch/arm/dts/fsl-ls1043a-qds.dtsi
+46
-0
arch/arm/include/asm/arch-fsl-layerscape/config.h
arch/arm/include/asm/arch-fsl-layerscape/config.h
+6
-0
drivers/net/fsl-mc/mc.c
drivers/net/fsl-mc/mc.c
+2
-1
include/configs/ls1021aqds.h
include/configs/ls1021aqds.h
+1
-0
include/configs/ls1021atwr.h
include/configs/ls1021atwr.h
+1
-0
include/configs/ls2080a_common.h
include/configs/ls2080a_common.h
+0
-3
include/configs/ls2080aqds.h
include/configs/ls2080aqds.h
+1
-1
未找到文件。
arch/arm/cpu/armv8/start.S
浏览文件 @
008e61f5
...
...
@@ -168,6 +168,25 @@ apply_a57_core_errata:
msr
S3_1_c15_c2_0
,
x0
/*
cpuactlr_el1
*/
#endif
#ifdef CONFIG_ARM_ERRATA_833471
mrs
x0
,
S3_1_c15_c2_0
/*
cpuactlr_el1
*/
/
*
FPSCR
write
flush
.
*
Note
that
in
some
cases
where
a
flush
is
unnecessary
this
could
impact
performance
.
*/
orr
x0
,
x0
,
#
1
<<
38
msr
S3_1_c15_c2_0
,
x0
/*
cpuactlr_el1
*/
#endif
#ifdef CONFIG_ARM_ERRATA_829520
mrs
x0
,
S3_1_c15_c2_0
/*
cpuactlr_el1
*/
/
*
Disable
Indirect
Predictor
bit
will
prevent
this
erratum
from
occurring
*
Note
that
in
some
cases
where
a
flush
is
unnecessary
this
could
impact
performance
.
*/
orr
x0
,
x0
,
#
1
<<
4
msr
S3_1_c15_c2_0
,
x0
/*
cpuactlr_el1
*/
#endif
#ifdef CONFIG_ARM_ERRATA_833069
mrs
x0
,
S3_1_c15_c2_0
/*
cpuactlr_el1
*/
/
*
Disable
Enable
Invalidates
of
BTB
bit
*/
...
...
arch/arm/dts/fsl-ls1043a-qds.dtsi
浏览文件 @
008e61f5
...
...
@@ -14,6 +14,52 @@
/
{
model
=
"LS1043A QDS Board"
;
aliases
{
spi0
=
&
qspi
;
spi1
=
&
dspi0
;
};
};
&
dspi0
{
bus
-
num
=
<
0
>;
status
=
"okay"
;
dflash0
:
n25q128a
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
1
>;
compatible
=
"spi-flash"
;
reg
=
<
0
>;
spi
-
max
-
frequency
=
<
1000000
>;
/*
input
clock
*/
};
dflash1
:
sst25wf040b
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
1
>;
compatible
=
"spi-flash"
;
spi
-
max
-
frequency
=
<
3500000
>;
reg
=
<
1
>;
};
dflash2
:
en25s64
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
1
>;
compatible
=
"spi-flash"
;
spi
-
max
-
frequency
=
<
3500000
>;
reg
=
<
2
>;
};
};
&
qspi
{
bus
-
num
=
<
0
>;
status
=
"okay"
;
qflash0
:
s25fl128s
@
0
{
#
address
-
cells
=
<
1
>;
#
size
-
cells
=
<
1
>;
compatible
=
"spi-flash"
;
spi
-
max
-
frequency
=
<
20000000
>;
reg
=
<
0
>;
};
};
&
i2c0
{
...
...
arch/arm/include/asm/arch-fsl-layerscape/config.h
浏览文件 @
008e61f5
...
...
@@ -121,6 +121,12 @@
#define CONFIG_SYS_FSL_ERRATUM_A009663
#define CONFIG_SYS_FSL_ERRATUM_A009942
/* ARM A57 CORE ERRATA */
#define CONFIG_ARM_ERRATA_826974
#define CONFIG_ARM_ERRATA_828024
#define CONFIG_ARM_ERRATA_829520
#define CONFIG_ARM_ERRATA_833471
#elif defined(CONFIG_LS1043A)
#define CONFIG_MAX_CPUS 4
#define CONFIG_SYS_CACHELINE_SIZE 64
...
...
drivers/net/fsl-mc/mc.c
浏览文件 @
008e61f5
...
...
@@ -818,6 +818,7 @@ static int dprc_init(void)
goto
err_root_open
;
}
memset
(
&
cfg
,
0
,
sizeof
(
struct
dprc_cfg
));
cfg
.
options
=
DPRC_CFG_OPT_TOPOLOGY_CHANGES_ALLOWED
|
DPRC_CFG_OPT_OBJ_CREATE_ALLOWED
|
DPRC_CFG_OPT_ALLOC_ALLOWED
;
...
...
@@ -1160,7 +1161,7 @@ int fsl_mc_ldpaa_exit(bd_t *bd)
err
=
dpbp_exit
();
if
(
err
<
0
)
{
printf
(
"dp
ni
_exit() failed: %d
\n
"
,
err
);
printf
(
"dp
bp
_exit() failed: %d
\n
"
,
err
);
goto
err
;
}
...
...
include/configs/ls1021aqds.h
浏览文件 @
008e61f5
...
...
@@ -665,5 +665,6 @@ unsigned long get_board_ddr_clk(void);
#endif
#include <asm/fsl_secure_boot.h>
#define CONFIG_SYS_BOOTM_LEN (64 << 20)
/* Increase max gunzip size */
#endif
include/configs/ls1021atwr.h
浏览文件 @
008e61f5
...
...
@@ -523,5 +523,6 @@
#endif
#include <asm/fsl_secure_boot.h>
#define CONFIG_SYS_BOOTM_LEN (64 << 20)
/* Increase max gunzip size */
#endif
include/configs/ls2080a_common.h
浏览文件 @
008e61f5
...
...
@@ -15,9 +15,6 @@
#define CONFIG_GICV3
#define CONFIG_FSL_TZPC_BP147
/* Errata fixes */
#define CONFIG_ARM_ERRATA_828024
#define CONFIG_ARM_ERRATA_826974
#include <asm/arch/ls2080a_stream_id.h>
#include <asm/arch/config.h>
...
...
include/configs/ls2080aqds.h
浏览文件 @
008e61f5
...
...
@@ -346,7 +346,7 @@ unsigned long get_board_ddr_clk(void);
"initrd_high=0xffffffffffffffff\0" \
"kernel_start=0x581100000\0" \
"kernel_load=0xa0000000\0" \
"kernel_size=0x2800000
0
\0"
"kernel_size=0x2800000\0"
#ifdef CONFIG_FSL_MC_ENET
#define CONFIG_FSL_MEMAC
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录