Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
efc284e3
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,发现更多精彩内容 >>
提交
efc284e3
编写于
7月 12, 2013
作者:
A
Albert ARIBAUD
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
上级
d035fcf9
a3f170cd
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
35 addition
and
13 deletion
+35
-13
drivers/net/fec_mxc.c
drivers/net/fec_mxc.c
+22
-1
include/configs/m28evk.h
include/configs/m28evk.h
+1
-0
include/configs/mx51evk.h
include/configs/mx51evk.h
+2
-2
include/configs/mx53ard.h
include/configs/mx53ard.h
+2
-2
include/configs/mx53loco.h
include/configs/mx53loco.h
+2
-2
include/configs/mx6qsabrelite.h
include/configs/mx6qsabrelite.h
+2
-2
include/configs/mx6slevk.h
include/configs/mx6slevk.h
+2
-2
include/configs/wandboard.h
include/configs/wandboard.h
+2
-2
未找到文件。
drivers/net/fec_mxc.c
浏览文件 @
efc284e3
...
...
@@ -560,7 +560,6 @@ static int fec_init(struct eth_device *dev, bd_t* bd)
}
memset
(
fec
->
tbd_base
,
0
,
size
);
fec_tbd_init
(
fec
);
flush_dcache_range
((
unsigned
)
fec
->
tbd_base
,
size
);
}
/*
...
...
@@ -737,6 +736,28 @@ static int fec_send(struct eth_device *dev, void *packet, int length)
addr
=
(
uint32_t
)
fec
->
tbd_base
;
flush_dcache_range
(
addr
,
addr
+
size
);
/*
* Below we read the DMA descriptor's last four bytes back from the
* DRAM. This is important in order to make sure that all WRITE
* operations on the bus that were triggered by previous cache FLUSH
* have completed.
*
* Otherwise, on MX28, it is possible to observe a corruption of the
* DMA descriptors. Please refer to schematic "Figure 1-2" in MX28RM
* for the bus structure of MX28. The scenario is as follows:
*
* 1) ARM core triggers a series of WRITEs on the AHB_ARB2 bus going
* to DRAM due to flush_dcache_range()
* 2) ARM core writes the FEC registers via AHB_ARB2
* 3) FEC DMA starts reading/writing from/to DRAM via AHB_ARB3
*
* Note that 2) does sometimes finish before 1) due to reordering of
* WRITE accesses on the AHB bus, therefore triggering 3) before the
* DMA descriptor is fully written into DRAM. This results in occasional
* corruption of the DMA descriptor.
*/
readl
(
addr
+
size
-
4
);
/*
* Enable SmartDMA transmit task
*/
...
...
include/configs/m28evk.h
浏览文件 @
efc284e3
...
...
@@ -70,6 +70,7 @@
#define CONFIG_CMD_MII
#define CONFIG_CMD_MMC
#define CONFIG_CMD_NAND
#define CONFIG_CMD_NAND_TRIMFFS
#define CONFIG_CMD_NET
#define CONFIG_CMD_NFS
#define CONFIG_CMD_PING
...
...
include/configs/mx51evk.h
浏览文件 @
efc284e3
...
...
@@ -162,8 +162,8 @@
"boot_fdt=try\0" \
"ip_dyn=yes\0" \
"mmcdev=0\0" \
"mmcpart=
2
\0" \
"mmcroot=/dev/mmcblk0p
3
rootwait rw\0" \
"mmcpart=
1
\0" \
"mmcroot=/dev/mmcblk0p
2
rootwait rw\0" \
"mmcargs=setenv bootargs console=ttymxc0,${baudrate} " \
"root=${mmcroot}\0" \
"loadbootscript=" \
...
...
include/configs/mx53ard.h
浏览文件 @
efc284e3
...
...
@@ -118,8 +118,8 @@
"boot_fdt=try\0" \
"ip_dyn=yes\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=
2
\0" \
"mmcroot=/dev/mmcblk0p
3
rootwait rw\0" \
"mmcpart=
1
\0" \
"mmcroot=/dev/mmcblk0p
2
rootwait rw\0" \
"update_sd_firmware_filename=u-boot.imx\0" \
"update_sd_firmware=" \
"if test ${ip_dyn} = yes; then " \
...
...
include/configs/mx53loco.h
浏览文件 @
efc284e3
...
...
@@ -124,8 +124,8 @@
"boot_fdt=try\0" \
"ip_dyn=yes\0" \
"mmcdev=0\0" \
"mmcpart=
2
\0" \
"mmcroot=/dev/mmcblk0p
3
rw rootwait\0" \
"mmcpart=
1
\0" \
"mmcroot=/dev/mmcblk0p
2
rw rootwait\0" \
"mmcargs=setenv bootargs console=ttymxc0,${baudrate} root=${mmcroot}\0" \
"loadbootscript=" \
"fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
...
...
include/configs/mx6qsabrelite.h
浏览文件 @
efc284e3
...
...
@@ -170,8 +170,8 @@
"boot_fdt=try\0" \
"ip_dyn=yes\0" \
"mmcdev=0\0" \
"mmcpart=
2
\0" \
"mmcroot=/dev/mmcblk0p
3
rootwait rw\0" \
"mmcpart=
1
\0" \
"mmcroot=/dev/mmcblk0p
2
rootwait rw\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
"loadbootscript=" \
...
...
include/configs/mx6slevk.h
浏览文件 @
efc284e3
...
...
@@ -73,8 +73,8 @@
"boot_fdt=try\0" \
"ip_dyn=yes\0" \
"mmcdev=0\0" \
"mmcpart=
2
\0" \
"mmcroot=/dev/mmcblk0p
3
rootwait rw\0" \
"mmcpart=
1
\0" \
"mmcroot=/dev/mmcblk0p
2
rootwait rw\0" \
"mmcargs=setenv bootargs console=${console},${baudrate} " \
"root=${mmcroot}\0" \
"loadbootscript=" \
...
...
include/configs/wandboard.h
浏览文件 @
efc284e3
...
...
@@ -120,8 +120,8 @@
"boot_fdt=try\0" \
"ip_dyn=yes\0" \
"mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
"mmcpart=
2
\0" \
"mmcroot=/dev/mmcblk0p
3
rootwait rw\0" \
"mmcpart=
1
\0" \
"mmcroot=/dev/mmcblk0p
2
rootwait rw\0" \
"update_sd_firmware_filename=u-boot.imx\0" \
"update_sd_firmware=" \
"if test ${ip_dyn} = yes; then " \
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录