Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
c956717a
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,发现更多精彩内容 >>
提交
c956717a
编写于
7月 07, 2008
作者:
W
Wolfgang Denk
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of /home/wd/git/u-boot/custodians
上级
3ab4827c
4e0018f1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
30 addition
and
20 deletion
+30
-20
board/atmel/at91cap9adk/at91cap9adk.c
board/atmel/at91cap9adk/at91cap9adk.c
+6
-1
board/atmel/at91sam9260ek/at91sam9260ek.c
board/atmel/at91sam9260ek/at91sam9260ek.c
+4
-4
board/atmel/at91sam9261ek/at91sam9261ek.c
board/atmel/at91sam9261ek/at91sam9261ek.c
+6
-6
board/atmel/at91sam9263ek/at91sam9263ek.c
board/atmel/at91sam9263ek/at91sam9263ek.c
+8
-3
board/atmel/at91sam9rlek/at91sam9rlek.c
board/atmel/at91sam9rlek/at91sam9rlek.c
+6
-6
未找到文件。
board/atmel/at91cap9adk/at91cap9adk.c
浏览文件 @
c956717a
...
...
@@ -196,7 +196,7 @@ static void at91cap9_macb_hw_init(void)
/* Need to reset PHY -> 500ms reset */
at91_sys_write
(
AT91_RSTC_MR
,
AT91_RSTC_KEY
|
AT91_RSTC_ERSTL
|
(
0x0D
<<
8
)
|
(
AT91_RSTC_ERSTL
&
(
0x0D
<<
8
)
)
|
AT91_RSTC_URSTEN
);
at91_sys_write
(
AT91_RSTC_CR
,
AT91_RSTC_KEY
|
AT91_RSTC_EXTRST
);
...
...
@@ -204,6 +204,11 @@ static void at91cap9_macb_hw_init(void)
/* Wait for end hardware reset */
while
(
!
(
at91_sys_read
(
AT91_RSTC_SR
)
&
AT91_RSTC_NRSTL
));
/* Restore NRST value */
at91_sys_write
(
AT91_RSTC_MR
,
AT91_RSTC_KEY
|
(
AT91_RSTC_ERSTL
&
(
0x0
<<
8
))
|
AT91_RSTC_URSTEN
);
/* Re-enable pull-up */
writel
(
pin_to_mask
(
AT91_PIN_PB22
)
|
pin_to_mask
(
AT91_PIN_PB25
)
|
...
...
board/atmel/at91sam9260ek/at91sam9260ek.c
浏览文件 @
c956717a
...
...
@@ -80,8 +80,8 @@ static void at91sam9260ek_nand_hw_init(void)
/* Configure SMC CS3 for NAND/SmartMedia */
at91_sys_write
(
AT91_SMC_SETUP
(
3
),
AT91_SMC_NWESETUP_
(
0
)
|
AT91_SMC_NCS_WRSETUP_
(
0
)
|
AT91_SMC_NRDSETUP_
(
0
)
|
AT91_SMC_NCS_RDSETUP_
(
0
));
AT91_SMC_NWESETUP_
(
1
)
|
AT91_SMC_NCS_WRSETUP_
(
0
)
|
AT91_SMC_NRDSETUP_
(
1
)
|
AT91_SMC_NCS_RDSETUP_
(
0
));
at91_sys_write
(
AT91_SMC_PULSE
(
3
),
AT91_SMC_NWEPULSE_
(
3
)
|
AT91_SMC_NCS_WRPULSE_
(
3
)
|
AT91_SMC_NRDPULSE_
(
3
)
|
AT91_SMC_NCS_RDPULSE_
(
3
));
...
...
@@ -149,7 +149,7 @@ static void at91sam9260ek_macb_hw_init(void)
/* Need to reset PHY -> 500ms reset */
at91_sys_write
(
AT91_RSTC_MR
,
AT91_RSTC_KEY
|
AT91_RSTC_ERSTL
|
(
0x0D
<<
8
)
|
(
AT91_RSTC_ERSTL
&
(
0x0D
<<
8
)
)
|
AT91_RSTC_URSTEN
);
at91_sys_write
(
AT91_RSTC_CR
,
AT91_RSTC_KEY
|
AT91_RSTC_EXTRST
);
...
...
@@ -159,7 +159,7 @@ static void at91sam9260ek_macb_hw_init(void)
/* Restore NRST value */
at91_sys_write
(
AT91_RSTC_MR
,
AT91_RSTC_KEY
|
AT91_RSTC_ERSTL
|
(
0x0
<<
8
)
|
(
AT91_RSTC_ERSTL
&
(
0x0
<<
8
)
)
|
AT91_RSTC_URSTEN
);
/* Re-enable pull-up */
...
...
board/atmel/at91sam9261ek/at91sam9261ek.c
浏览文件 @
c956717a
...
...
@@ -82,13 +82,13 @@ static void at91sam9261ek_nand_hw_init(void)
/* Configure SMC CS3 for NAND/SmartMedia */
at91_sys_write
(
AT91_SMC_SETUP
(
3
),
AT91_SMC_NWESETUP_
(
0
)
|
AT91_SMC_NCS_WRSETUP_
(
0
)
|
AT91_SMC_NRDSETUP_
(
0
)
|
AT91_SMC_NCS_RDSETUP_
(
0
));
AT91_SMC_NWESETUP_
(
1
)
|
AT91_SMC_NCS_WRSETUP_
(
0
)
|
AT91_SMC_NRDSETUP_
(
1
)
|
AT91_SMC_NCS_RDSETUP_
(
0
));
at91_sys_write
(
AT91_SMC_PULSE
(
3
),
AT91_SMC_NWEPULSE_
(
2
)
|
AT91_SMC_NCS_WRPULSE_
(
5
)
|
AT91_SMC_NRDPULSE_
(
2
)
|
AT91_SMC_NCS_RDPULSE_
(
5
));
AT91_SMC_NWEPULSE_
(
3
)
|
AT91_SMC_NCS_WRPULSE_
(
3
)
|
AT91_SMC_NRDPULSE_
(
3
)
|
AT91_SMC_NCS_RDPULSE_
(
3
));
at91_sys_write
(
AT91_SMC_CYCLE
(
3
),
AT91_SMC_NWECYCLE_
(
7
)
|
AT91_SMC_NRDCYCLE_
(
7
));
AT91_SMC_NWECYCLE_
(
5
)
|
AT91_SMC_NRDCYCLE_
(
5
));
at91_sys_write
(
AT91_SMC_MODE
(
3
),
AT91_SMC_READMODE
|
AT91_SMC_WRITEMODE
|
AT91_SMC_EXNWMODE_DISABLE
|
...
...
@@ -97,7 +97,7 @@ static void at91sam9261ek_nand_hw_init(void)
#else
/* CFG_NAND_DBW_8 */
AT91_SMC_DBW_8
|
#endif
AT91_SMC_TDF_
(
1
));
AT91_SMC_TDF_
(
2
));
at91_sys_write
(
AT91_PMC_PCER
,
1
<<
AT91SAM9261_ID_PIOC
);
...
...
board/atmel/at91sam9263ek/at91sam9263ek.c
浏览文件 @
c956717a
...
...
@@ -83,8 +83,8 @@ static void at91sam9263ek_nand_hw_init(void)
/* Configure SMC CS3 for NAND/SmartMedia */
at91_sys_write
(
AT91_SMC_SETUP
(
3
),
AT91_SMC_NWESETUP_
(
0
)
|
AT91_SMC_NCS_WRSETUP_
(
0
)
|
AT91_SMC_NRDSETUP_
(
0
)
|
AT91_SMC_NCS_RDSETUP_
(
0
));
AT91_SMC_NWESETUP_
(
1
)
|
AT91_SMC_NCS_WRSETUP_
(
0
)
|
AT91_SMC_NRDSETUP_
(
1
)
|
AT91_SMC_NCS_RDSETUP_
(
0
));
at91_sys_write
(
AT91_SMC_PULSE
(
3
),
AT91_SMC_NWEPULSE_
(
3
)
|
AT91_SMC_NCS_WRPULSE_
(
3
)
|
AT91_SMC_NRDPULSE_
(
3
)
|
AT91_SMC_NCS_RDPULSE_
(
3
));
...
...
@@ -147,7 +147,7 @@ static void at91sam9263ek_macb_hw_init(void)
/* Need to reset PHY -> 500ms reset */
at91_sys_write
(
AT91_RSTC_MR
,
AT91_RSTC_KEY
|
AT91_RSTC_ERSTL
|
(
0x0D
<<
8
)
|
(
AT91_RSTC_ERSTL
&
(
0x0D
<<
8
)
)
|
AT91_RSTC_URSTEN
);
at91_sys_write
(
AT91_RSTC_CR
,
AT91_RSTC_KEY
|
AT91_RSTC_EXTRST
);
...
...
@@ -155,6 +155,11 @@ static void at91sam9263ek_macb_hw_init(void)
/* Wait for end hardware reset */
while
(
!
(
at91_sys_read
(
AT91_RSTC_SR
)
&
AT91_RSTC_NRSTL
));
/* Restore NRST value */
at91_sys_write
(
AT91_RSTC_MR
,
AT91_RSTC_KEY
|
(
AT91_RSTC_ERSTL
&
(
0x0
<<
8
))
|
AT91_RSTC_URSTEN
);
/* Re-enable pull-up */
writel
(
pin_to_mask
(
AT91_PIN_PC25
),
pin_to_controller
(
AT91_PIN_PC0
)
+
PIO_PUER
);
...
...
board/atmel/at91sam9rlek/at91sam9rlek.c
浏览文件 @
c956717a
...
...
@@ -82,13 +82,13 @@ static void at91sam9rlek_nand_hw_init(void)
/* Configure SMC CS3 for NAND/SmartMedia */
at91_sys_write
(
AT91_SMC_SETUP
(
3
),
AT91_SMC_NWESETUP_
(
0
)
|
AT91_SMC_NCS_WRSETUP_
(
0
)
|
AT91_SMC_NRDSETUP_
(
0
)
|
AT91_SMC_NCS_RDSETUP_
(
0
));
AT91_SMC_NWESETUP_
(
1
)
|
AT91_SMC_NCS_WRSETUP_
(
0
)
|
AT91_SMC_NRDSETUP_
(
1
)
|
AT91_SMC_NCS_RDSETUP_
(
0
));
at91_sys_write
(
AT91_SMC_PULSE
(
3
),
AT91_SMC_NWEPULSE_
(
2
)
|
AT91_SMC_NCS_WRPULSE_
(
5
)
|
AT91_SMC_NRDPULSE_
(
2
)
|
AT91_SMC_NCS_RDPULSE_
(
5
));
AT91_SMC_NWEPULSE_
(
3
)
|
AT91_SMC_NCS_WRPULSE_
(
3
)
|
AT91_SMC_NRDPULSE_
(
3
)
|
AT91_SMC_NCS_RDPULSE_
(
3
));
at91_sys_write
(
AT91_SMC_CYCLE
(
3
),
AT91_SMC_NWECYCLE_
(
7
)
|
AT91_SMC_NRDCYCLE_
(
7
));
AT91_SMC_NWECYCLE_
(
5
)
|
AT91_SMC_NRDCYCLE_
(
5
));
at91_sys_write
(
AT91_SMC_MODE
(
3
),
AT91_SMC_READMODE
|
AT91_SMC_WRITEMODE
|
AT91_SMC_EXNWMODE_DISABLE
|
...
...
@@ -97,7 +97,7 @@ static void at91sam9rlek_nand_hw_init(void)
#else
/* CFG_NAND_DBW_8 */
AT91_SMC_DBW_8
|
#endif
AT91_SMC_TDF_
(
1
));
AT91_SMC_TDF_
(
2
));
at91_sys_write
(
AT91_PMC_PCER
,
1
<<
AT91SAM9RL_ID_PIOD
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录